Rbac::getRole() : check if required role is an object before loop.

james481 · Mar 20, 2014 · ae35ff1 · ae35ff1
1 parent 39a1eb9
commit ae35ff1
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/library/Zend/Permissions/Rbac/Rbac.php b/library/Zend/Permissions/Rbac/Rbac.php
@@ -108,12 +108,16 @@ public function getRole($objectOrName)
             );
         }
 
+        if (is_object($objectOrName)) {
+            $requiredRole = $objectOrName->getName();
+        } else {
+            $requiredRole = $objectOrName;
+        }
+
         $it = new RecursiveIteratorIterator($this, RecursiveIteratorIterator::CHILD_FIRST);
         foreach ($it as $leaf) {
             /** @var RoleInterface $leaf */
-            if ((is_string($objectOrName) && $leaf->getName() == $objectOrName)
-                || (is_object($objectOrName) && $leaf->getName() == $objectOrName->getName())
-            ) {
+            if ($leaf->getName() == $requiredRole) {
                 return $leaf;
             }
         }