Fix zendframework#45

ezimuel · Aug 6, 2019 · 4ebc5b2 · 4ebc5b2
1 parent 956c753
commit 4ebc5b2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/src/Rbac.php b/src/Rbac.php
@@ -53,6 +53,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
@@ -196,6 +196,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())
@@ -303,4 +307,19 @@ public function testEmptyRoles()
     {
         $this->assertEquals([], $this->rbac->getRoles());
     }
+
+    /**
+     * @see https://github.com/zendframework/zend-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'));
+    }
 }