Merge branch 'hotfix/3827' into develop

Forward port zendframework/zendframework#3827
zendframework · Mar 5, 2013 · 256605f · 256605f
commit 256605f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/AssertionInterface.php b/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);

diff --git a/src/Rbac.php b/src/Rbac.php
@@ -43,7 +43,8 @@ public function getCreateMissingRoles()
     /**
      * Add a child.
      *
-     * @param  string|RoleInterface                $child
+     * @param  string|RoleInterface               $child
+     * @param  array|RoleInterface|null           $parents
      * @return RoleInterface
      * @throws Exception\InvalidArgumentException
      */
@@ -123,8 +124,9 @@ 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)