diff --git a/src/Router/Http/TreeRouteStack.php b/src/Router/Http/TreeRouteStack.php index 36d716eb1..373953c4d 100644 --- a/src/Router/Http/TreeRouteStack.php +++ b/src/Router/Http/TreeRouteStack.php @@ -61,7 +61,7 @@ public static function factory($options = []) if ($options instanceof Traversable) { $options = ArrayUtils::iteratorToArray($options); } - + if (! is_array($options)) { throw new Exception\InvalidArgumentException(__METHOD__ . ' expects an array or Traversable set of options'); } diff --git a/src/Router/SimpleRouteStack.php b/src/Router/SimpleRouteStack.php index f3d55ad04..911d906ab 100644 --- a/src/Router/SimpleRouteStack.php +++ b/src/Router/SimpleRouteStack.php @@ -263,7 +263,7 @@ protected function routeFromArray($specs) if ($specs instanceof Traversable) { $specs = ArrayUtils::iteratorToArray($specs); } - + if (! is_array($specs)) { throw new Exception\InvalidArgumentException('Route definition must be an array or Traversable object'); } @@ -271,7 +271,7 @@ protected function routeFromArray($specs) if (! isset($specs['type'])) { throw new Exception\InvalidArgumentException('Missing "type" option'); } - + if (! isset($specs['options'])) { $specs['options'] = []; } diff --git a/src/Service/ServiceManagerConfig.php b/src/Service/ServiceManagerConfig.php index 614f23095..ee223200b 100644 --- a/src/Service/ServiceManagerConfig.php +++ b/src/Service/ServiceManagerConfig.php @@ -18,7 +18,6 @@ use Zend\ModuleManager\Listener\ServiceListener; use Zend\ModuleManager\ModuleManager; use Zend\ServiceManager\Config; -use Zend\ServiceManager\Factory\InvokableFactory; use Zend\ServiceManager\ServiceLocatorAwareInterface; use Zend\ServiceManager\ServiceManager; use Zend\ServiceManager\ServiceManagerAwareInterface; diff --git a/src/Service/ViewHelperManagerFactory.php b/src/Service/ViewHelperManagerFactory.php index 8939cf3d5..7515f6177 100644 --- a/src/Service/ViewHelperManagerFactory.php +++ b/src/Service/ViewHelperManagerFactory.php @@ -14,7 +14,6 @@ use Zend\Mvc\Router\RouteMatch; use Zend\ServiceManager\ConfigInterface; use Zend\ServiceManager\Exception\ServiceNotCreatedException; -use Zend\Stdlib\ArrayUtils; use Zend\View\Helper as ViewHelper; use Zend\View\HelperPluginManager; diff --git a/test/View/Console/ViewManagerTest.php b/test/View/Console/ViewManagerTest.php index 1bc3d1901..64ec9b658 100644 --- a/test/View/Console/ViewManagerTest.php +++ b/test/View/Console/ViewManagerTest.php @@ -23,7 +23,6 @@ use Zend\Mvc\Service\ServiceManagerConfig; use Zend\Mvc\View\Console\ViewManager; use Zend\ServiceManager\ServiceManager; -use Zend\Stdlib\ArrayUtils; /** * Tests for {@see \Zend\Mvc\View\Console\ViewManager}