jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix removing single permissions from event (#1661)

Browse Source
This commit is contained in:
Kevin Papst
2020-04-24 19:02:21 +02:00
committed by GitHub
parent 0debc70ead
commit cbd7124cec
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Event/PermissionsEvent.php
View File

@@ -36,8 +36,8 @@ final class PermissionsEvent extends Event
public function removePermission(string $section, string $permission): PermissionsEvent public function removePermission(string $section, string $permission): PermissionsEvent
{ {
if (\array_key_exists($section, $this->sections)) { if (\array_key_exists($section, $this->sections)) {
if (\array_key_exists($permission, $this->sections[$section])) { if (($key = array_search($permission, $this->sections[$section])) !== false) {
unset($this->sections[$section][$permission]); unset($this->sections[$section][$key]);
} }
} }

19
tests/Event/PermissionsEventTest.php
View File

@@ -36,15 +36,22 @@ class PermissionsEventTest extends TestCase
self::assertFalse($sut->hasSection('foo')); self::assertFalse($sut->hasSection('foo'));
self::assertNull($sut->getSection('foo')); self::assertNull($sut->getSection('foo'));
$sut->addPermissions('bar', ['foo' => 123, 'hello' => 'world', 'test' => false]); $sut->addPermissions('bar', ['foo', 'hello', 'world', 'test']);
self::assertEquals(['bar' => ['foo' => 123, 'hello' => 'world', 'test' => false]], $sut->getPermissions()); self::assertEquals(['bar' => ['foo', 'hello', 'world', 'test']], $sut->getPermissions());
self::assertInstanceOf(PermissionsEvent::class, $sut->removePermission('bar', 'xxx')); self::assertInstanceOf(PermissionsEvent::class, $sut->removePermission('bar', 'xxx'));
self::assertEquals(['bar' => ['foo' => 123, 'hello' => 'world', 'test' => false]], $sut->getPermissions()); self::assertEquals(['foo', 'hello', 'world', 'test'], array_values($sut->getSection('bar')));
self::assertInstanceOf(PermissionsEvent::class, $sut->removePermission('bar', 'foo')); self::assertInstanceOf(PermissionsEvent::class, $sut->removePermission('bar', 'foo'));
self::assertEquals(['bar' => ['hello' => 'world', 'test' => false]], $sut->getPermissions()); self::assertEquals(['hello', 'world', 'test'], array_values($sut->getSection('bar')));
self::assertInstanceOf(PermissionsEvent::class, $sut->removePermission('bar', 'test')); self::assertInstanceOf(PermissionsEvent::class, $sut->removePermission('bar', 'test'));
self::assertEquals(['bar' => ['hello' => 'world']], $sut->getPermissions()); self::assertEquals(['hello', 'world'], array_values($sut->getSection('bar')));
self::assertInstanceOf(PermissionsEvent::class, $sut->removePermission('bar', 'hello')); self::assertInstanceOf(PermissionsEvent::class, $sut->removePermission('bar', 'hello'));
self::assertEquals(['bar' => []], $sut->getPermissions()); self::assertEquals(['world'], array_values($sut->getSection('bar')));
self::assertInstanceOf(PermissionsEvent::class, $sut->removePermission('bar', 'world'));
self::assertEquals([], array_values($sut->getSection('bar')));
} }
} }