Merge remote-tracking branch 'spiffyjr/pr/navigation-throws-exception…

…-on-acl'
zendframework · Jan 27, 2012 · d50c975 · d50c975
4 parents 4e62a6d + a9d9490 + aed9f65 + 874d8c5
commit d50c975
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/Helper/Navigation/AbstractHelper.php b/src/Helper/Navigation/AbstractHelper.php
@@ -754,7 +754,7 @@ protected function _acceptAcl(AbstractPage $page)
 
         if ($resource || $privilege) {
             // determine using helper role and page resource/privilege
-            return $acl->isAllowed($role, $resource, $privilege);
+            return $acl->hasResource($resource) && $acl->isAllowed($role, $resource, $privilege);
         }
 
         return true;

diff --git a/test/Helper/Navigation/NavigationTest.php b/test/Helper/Navigation/NavigationTest.php
@@ -68,6 +68,24 @@ public function testHelperEntryPointWithContainerParam()
         $this->assertEquals($this->_helper, $returned);
         $this->assertEquals($this->_nav2, $returned->getContainer());
     }
+
+    public function testAcceptAclShouldReturnGracefullyWithUnknownResource()
+    {
+        // setup
+        $acl = $this->_getAcl();
+        $this->_helper->setAcl($acl['acl']);
+        $this->_helper->setRole($acl['role']);
+
+        $accepted = $this->_helper->accept(
+            new \Zend\Navigation\Page\Uri(array(
+                'resource'  => 'unknownresource',
+                'privilege' => 'someprivilege' 
+            ),
+            false)
+        );
+
+        $this->assertEquals($accepted, false);
+    }
 
     public function testShouldProxyToMenuHelperByDeafult()
     {