Merge branch '#ZF2-151' of github.com:robertboloc/zf2 into #ZF2-151

zendframework · Oct 9, 2012 · e5c1ff6 · e5c1ff6
commit e5c1ff6
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 4 deletions.
diff --git a/src/AbstractContainer.php b/src/AbstractContainer.php
@@ -14,7 +14,6 @@
 use RecursiveIterator;
 use RecursiveIteratorIterator;
 use Traversable;
-use Zend\Stdlib\ArrayUtils;
 use Zend\Stdlib\ErrorHandler;
 
 /**

diff --git a/src/Page/AbstractPage.php b/src/Page/AbstractPage.php
@@ -767,7 +767,7 @@ public function setVisible($visible = true)
         if (is_string($visible) && 'false' == strtolower($visible)) {
             $visible = false;
         }
-        $this->visible = (bool)$visible;
+        $this->visible = (bool) $visible;
         return $this;
     }
 

diff --git a/src/Page/Mvc.php b/src/Page/Mvc.php
@@ -14,7 +14,6 @@
 use Zend\Mvc\Router\RouteStackInterface;
 use Zend\Navigation\Exception;
 use Zend\Mvc\ModuleRouteListener;
-use Zend\View\Helper\Url as UrlHelper;
 
 /**
  * Represents a page that is defined using controller, action, route

diff --git a/src/Service/AbstractNavigationFactory.php b/src/Service/AbstractNavigationFactory.php
@@ -15,7 +15,6 @@
 use Zend\Mvc\Router\RouteStackInterface as Router;
 use Zend\Navigation\Exception;
 use Zend\Navigation\Navigation;
-use Zend\Navigation\Page\Mvc as MvcPage;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;