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

zendframework · Jul 24, 2012 · fd429e8 · fd429e8
2 parents 187ea79 + 1fb0425
commit fd429e8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/src/Helper/Navigation/AbstractHelper.php b/src/Helper/Navigation/AbstractHelper.php
@@ -11,11 +11,11 @@
 namespace Zend\View\Helper\Navigation;
 
 use RecursiveIteratorIterator;
-use Zend\Acl;
 use Zend\I18n\Translator\Translator;
 use Zend\I18n\Translator\TranslatorAwareInterface;
 use Zend\Navigation;
 use Zend\Navigation\Page\AbstractPage;
+use Zend\Permissions\Acl;
 use Zend\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\View;

diff --git a/src/Helper/Navigation/HelperInterface.php b/src/Helper/Navigation/HelperInterface.php
@@ -10,9 +10,9 @@
 
 namespace Zend\View\Helper\Navigation;
 
-use Zend\Acl;
 use Zend\I18n\Translator\Translator;
 use Zend\Navigation;
+use Zend\Permissions\Acl;
 use Zend\View\Helper\HelperInterface as BaseHelperInterface;
 
 /**

diff --git a/test/Helper/Navigation/AbstractTest.php b/test/Helper/Navigation/AbstractTest.php
@@ -11,12 +11,12 @@
 namespace ZendTest\View\Helper\Navigation;
 
 use Zend\Navigation\Navigation;
-use Zend\Acl\Acl;
-use Zend\Acl\Role\GenericRole;
-use Zend\Acl\Resource\GenericResource;
 use Zend\Config\Factory as ConfigFactory;
 use Zend\Mvc\Router\RouteMatch;
 use Zend\Mvc\Service\ServiceManagerConfig;
+use Zend\Permissions\Acl\Acl;
+use Zend\Permissions\Acl\Role\GenericRole;
+use Zend\Permissions\Acl\Resource\GenericResource;
 use Zend\ServiceManager\ServiceManager;
 use Zend\I18n\Translator\Translator;
 use Zend\View\Renderer\PhpRenderer;

diff --git a/test/Helper/Navigation/LinksTest.php b/test/Helper/Navigation/LinksTest.php
@@ -10,12 +10,12 @@
 
 namespace ZendTest\View\Helper\Navigation;
 
+use Zend\Config;
 use Zend\Navigation\Page\AbstractPage;
 use Zend\Navigation\Page\Uri as UriPage;
-use Zend\Config;
-use Zend\Acl;
-use Zend\Acl\Role;
-use Zend\Acl\Resource;
+use Zend\Permissions\Acl;
+use Zend\Permissions\Acl\Role;
+use Zend\Permissions\Acl\Resource;
 use Zend\View;
 use Zend\View\Helper\Navigation;
 

diff --git a/test/Helper/Navigation/MenuTest.php b/test/Helper/Navigation/MenuTest.php
@@ -161,7 +161,7 @@ public function testUseConstructedAclRolesNotFromAclObject()
     {
         $acl = $this->_getAcl();
         $this->_helper->setAcl($acl['acl']);
-        $this->_helper->setRole(new \Zend\Acl\Role\GenericRole('member'));
+        $this->_helper->setRole(new \Zend\Permissions\Acl\Role\GenericRole('member'));
 
         $expected = $this->_getExpected('menu/acl_role_interface.html');
         $this->assertEquals($expected, $this->_helper->render());

diff --git a/test/Helper/Navigation/NavigationTest.php b/test/Helper/Navigation/NavigationTest.php
@@ -10,10 +10,10 @@
 
 namespace ZendTest\View\Helper\Navigation;
 
-use Zend\Acl;
-use Zend\View\Helper\Navigation;
-use Zend\Acl\Role;
+use Zend\Permissions\Acl;
+use Zend\Permissions\Acl\Role;
 use Zend\View;
+use Zend\View\Helper\Navigation;
 
 /**
  * Tests Zend_View_Helper_Navigation