RBAC addChild fix

Closes issue laminas#3. Original fix by @ezimuel Signed-off-by: Gennadiy Litvinyuk <[email protected]>
gennadiylitvinyuk · Apr 3, 2021 · f07f461 · f07f461
1 parent 1c6a932
commit f07f461
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/Rbac.php b/src/Rbac.php
@@ -54,6 +54,12 @@ public function addRole($role, $parents = null) : void
             );
         }
 
+        if ($this->createMissingRoles) {
+            foreach ($role->getChildren() as $child) {
+                $this->addRole($child);
+            }
+        }
+
         if ($parents) {
             $parents = is_array($parents) ? $parents : [$parents];
             foreach ($parents as $parent) {

diff --git a/test/RbacTest.php b/test/RbacTest.php
@@ -197,6 +197,10 @@ public function testAddCustomChildRole()
     {
         $role = $this->getMockForAbstractClass(Rbac\RoleInterface::class);
         $this->rbac->setCreateMissingRoles(true);
+        $role->expects($this->any())
+            ->method('getChildren')
+            ->will($this->returnValue([]));
+
         $this->rbac->addRole($role, 'parent');
 
         $role->expects($this->any())
@@ -304,4 +308,20 @@ public function testEmptyRoles()
     {
         $this->assertEquals([], $this->rbac->getRoles());
     }
+
+
+    /**
+     * @see https://github.com/laminas/laminas-permissions-rbac/issues/45
+     */
+    public function testHasRoleWithChildrenRoles()
+    {
+        $foo = new Rbac\Role('foo');
+        $bar = new Rbac\Role('bar');
+
+        $this->rbac->setCreateMissingRoles(true);
+        $foo->addChild($bar);
+        $this->rbac->addRole($foo);
+
+        $this->assertTrue($this->rbac->hasRole('bar'));
+    }
 }