Merge branch 'master' of git://github.com/zendframework/zf2

src/AbstractIterator.php

@@ -80,7 +80,11 @@ public function rewind()
      */
     public function hasChildren()
     {
-        return count($this->children) > 0;
+        if ($this->valid() && ($this->current() instanceof RecursiveIterator)) {
+            return true;
+        }
+
+        return false;
     }
 
     /**

src/Rbac.php

@@ -45,7 +45,7 @@ public function getCreateMissingRoles()
      *
      * @param  string|RoleInterface               $child
      * @param  array|RoleInterface|null           $parents
-     * @return RoleInterface
+     * @return self
      * @throws Exception\InvalidArgumentException
      */
     public function addRole($child, $parents = null)

test/RbacTest.php

@@ -141,4 +141,24 @@ public function testAddRoleWithAutomaticParentsUsingRbac()
         $this->assertEquals($bar->getParent(), $foo);
         $this->assertEquals(1, count($foo->getChildren()));
     }
+
+    /**
+     * @tesdox Test adding custom child roles works
+     */
+    public function testAddCustomChildRole()
+    {
+        $role = $this->getMockForAbstractClass('Zend\Permissions\Rbac\RoleInterface');
+        $this->rbac->setCreateMissingRoles(true)->addRole($role, array('parent'));
+
+        $role->expects($this->any())
+            ->method('getName')
+            ->will($this->returnValue('customchild'));
+
+        $role->expects($this->once())
+            ->method('hasPermission')
+            ->with('test')
+            ->will($this->returnValue(true));
+
+        $this->assertTrue($this->rbac->isGranted('parent', 'test'));
+    }
 }