Merge pull request zendframework/zendframework#5972

zendframework · Mar 14, 2014 · 5e876f2 · 5e876f2
2 parents 9c10c4b + 92aaaab
commit 5e876f2
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/Rbac.php b/src/Rbac.php
@@ -110,6 +110,7 @@ public function getRole($objectOrName)
 
         $it = new RecursiveIteratorIterator($this, RecursiveIteratorIterator::CHILD_FIRST);
         foreach ($it as $leaf) {
+            /* @var RoleInterface $leaf */
             if ((is_string($objectOrName) && $leaf->getName() == $objectOrName) || $leaf == $objectOrName) {
                 return $leaf;
             }
@@ -127,6 +128,7 @@ public function getRole($objectOrName)
      * @param  RoleInterface|string             $role
      * @param  string                           $permission
      * @param  AssertionInterface|Callable|null $assert
+     * @throws Exception\InvalidArgumentException
      * @return bool
      */
     public function isGranted($role, $permission, $assert = null)