Merge remote-tracking branch 'weierophinney/feature/permissions'

zendframework · Jul 24, 2012 · ab2f663 · ab2f663
2 parents a27ca10 + efbfeab
commit ab2f663
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Page/AbstractPage.php b/src/Page/AbstractPage.php
@@ -11,9 +11,9 @@
 namespace Zend\Navigation\Page;
 
 use Traversable;
-use Zend\Acl\Resource\ResourceInterface as AclResource;
 use Zend\Navigation\AbstractContainer;
 use Zend\Navigation\Exception;
+use Zend\Permissions\Acl\Resource\ResourceInterface as AclResource;
 use Zend\Stdlib\ArrayUtils;
 
 /**

diff --git a/test/Page/PageTest.php b/test/Page/PageTest.php
@@ -458,7 +458,7 @@ public function testSetResourceInterface()
             'label'    => 'hello'
         ));
 
-        $resource = new \Zend\Acl\Resource\GenericResource('bar');
+        $resource = new \Zend\Permissions\Acl\Resource\GenericResource('bar');
 
         $page->setResource($resource);
         $this->assertEquals($resource, $page->getResource());