Merge branch 'hotfix/3513' into develop

Forward port zendframework/zendframework#3513
zendframework · Jan 22, 2013 · 16f6088 · 16f6088
2 parents 78a9131 + d2df3f2
commit 16f6088
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Acl.php b/src/Acl.php
@@ -566,9 +566,11 @@ public function setRule($operation, $type, $roles = null, $resources = null,
         $resources = array();
         foreach ($resourcesTemp as $resource) {
             if (null !== $resource) {
-                $children = $this->getChildResources($this->getResource($resource));
+                $resourceObj = $this->getResource($resource);
+                $resourceId = $resourceObj->getResourceId();
+                $children = $this->getChildResources($resourceObj);
                 $resources = array_merge($resources, $children);
-                $resources[$resource] = $this->getResource($resource);
+                $resources[$resourceId] = $resourceObj;
             } else {
                 $resources[] = null;
             }

diff --git a/test/AclTest.php b/test/AclTest.php
@@ -1328,4 +1328,15 @@ public function testAclResourcePermissionsAreInheritedWithMultilevelResourcesAnd
         $this->assertFalse($this->_acl->isAllowed('guest', 'post_1', 'comment'));
         $this->assertFalse($this->_acl->isAllowed('guest', 'post_2', 'comment'));
     }
+
+    public function testSetRuleWorksWithResourceInterface()
+    {
+        $roleGuest = new Role\GenericRole('guest');
+        $this->_acl->addRole($roleGuest);
+
+        $resourceFoo = new Resource\GenericResource('foo');
+        $this->_acl->addResource($resourceFoo);
+
+        $this->_acl->setRule(Acl\Acl::OP_ADD, Acl\Acl::TYPE_ALLOW, $roleGuest, $resourceFoo);
+    }
 }