Merge pull request #5973 in master

zendframework · Mar 21, 2014 · 2127acd · 2127acd
2 parents 2977bc9 + b5c9939
commit 2127acd
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 6 deletions.
diff --git a/library/Zend/Permissions/Rbac/AbstractIterator.php b/library/Zend/Permissions/Rbac/AbstractIterator.php
@@ -13,7 +13,13 @@
 
 abstract class AbstractIterator implements RecursiveIterator
 {
+    /**
+     * @var int
+     */
     protected $index    = 0;
+    /**
+     * @var array
+     */
     protected $children = array();
 
     /**
@@ -42,7 +48,7 @@ public function next()
      * (PHP 5 &gt;= 5.0.0)<br/>
      * Return the key of the current element
      * @link http://php.net/manual/en/iterator.key.php
-     * @return scalar scalar on success, or null on failure.
+     * @return int|null scalar on success, or null on failure.
      */
     public function key()
     {

diff --git a/library/Zend/Permissions/Rbac/Rbac.php b/library/Zend/Permissions/Rbac/Rbac.php
@@ -108,10 +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) || $leaf == $objectOrName) {
+            /** @var RoleInterface $leaf */
+            if ($leaf->getName() == $requiredRole) {
                 return $leaf;
             }
         }

diff --git a/tests/ZendTest/Permissions/Rbac/RbacTest.php b/tests/ZendTest/Permissions/Rbac/RbacTest.php
@@ -82,16 +82,30 @@ public function testIsGrantedChildRoles()
         $this->assertEquals(false, $this->rbac->isGranted('bar', 'can.baz'));
     }
 
+    /**
+     * @covers Zend\Permissions\Rbac\Rbac::hasRole()
+     */
     public function testHasRole()
     {
         $foo = new Rbac\Role('foo');
+        $snafu = new TestAsset\RoleTest('snafu');
 
         $this->rbac->addRole('bar');
         $this->rbac->addRole($foo);
+        $this->rbac->addRole('snafu');
+
+        // check that the container has the same object $foo
+        $this->assertTrue($this->rbac->hasRole($foo));
+
+        // check that the container has the same string "bar"
+        $this->assertTrue($this->rbac->hasRole('bar'));
+
+        // check that the container do not have the string "baz"
+        $this->assertFalse($this->rbac->hasRole('baz'));
 
-        $this->assertEquals(true, $this->rbac->hasRole($foo));
-        $this->assertEquals(true, $this->rbac->hasRole('bar'));
-        $this->assertEquals(false, $this->rbac->hasRole('baz'));
+        // check that we can compare two different objects with same name
+        $this->assertNotEquals($this->rbac->getRole('snafu'), $snafu);
+        $this->assertTrue($this->rbac->hasRole($snafu));
     }
 
     public function testAddRoleFromString()

diff --git a/tests/ZendTest/Permissions/Rbac/TestAsset/RoleTest.php b/tests/ZendTest/Permissions/Rbac/TestAsset/RoleTest.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Permissions\Rbac\TestAsset;
+
+use Zend\Permissions\Rbac\AbstractRole;
+
+class RoleTest extends AbstractRole
+{
+    /**
+     * @param string $name
+     */
+    public function __construct($name)
+    {
+        $this->name = $name;
+    }
+}