Merge pull request zendframework/zendframework#1 from wryck7/ZendHydr…

…ator

CS fixes

composer.json

@@ -17,8 +17,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
         }
     },
     "autoload-dev": {

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/AssertionInterface.php

@@ -14,7 +14,7 @@ interface AssertionInterface
     /**
      * Assertion method - must return a boolean.
      *
-     * @param  Rbac    $bac
+     * @param  Rbac    $rbac
      * @return boolean
      */
     public function assert(Rbac $rbac);

src/Rbac.php

@@ -43,8 +43,9 @@ public function getCreateMissingRoles()
     /**
      * Add a child.
      *
-     * @param  string|RoleInterface                $child
-     * @return RoleInterface
+     * @param  string|RoleInterface               $child
+     * @param  array|RoleInterface|null           $parents
+     * @return self
      * @throws Exception\InvalidArgumentException
      */
     public function addRole($child, $parents = null)
@@ -123,8 +124,10 @@ public function getRole($objectOrName)
     /**
      * Determines if access is granted by checking the role and child roles for permission.
      *
-     * @param string                                                  $permission
-     * @param \Zend\Permissions\Rbac\AssertionInterface|Callable|null $assert
+     * @param  RoleInterface|string             $role
+     * @param  string                           $permission
+     * @param  AssertionInterface|Callable|null $assert
+     * @return bool
      */
     public function isGranted($role, $permission, $assert = 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'));
+    }
 }