Merge branch 'hotfix/route-factory-prototypes' of https://github.com/…

…weierophinney/zf2 into pull/4622
HolgerW1 · Jun 11, 2013 · 6efbd82 · 6efbd82
2 parents bb5ec1d + 32333f8
commit 6efbd82
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/library/Zend/Mvc/Router/SimpleRouteStack.php b/library/Zend/Mvc/Router/SimpleRouteStack.php
@@ -73,12 +73,13 @@ public static function factory($options = array())
             throw new Exception\InvalidArgumentException(__METHOD__ . ' expects an array or Traversable set of options');
         }
 
-        $instance = new static();
-
+        $routePluginManager = null;
         if (isset($options['route_plugins'])) {
-            $instance->setRoutePluginManager($options['route_plugins']);
+            $routePluginManager = $options['route_plugins'];
         }
 
+        $instance = new static($routePluginManager);
+
         if (isset($options['routes'])) {
             $instance->addRoutes($options['routes']);
         }

diff --git a/library/Zend/Mvc/Service/RouterFactory.php b/library/Zend/Mvc/Service/RouterFactory.php
@@ -32,38 +32,33 @@ class RouterFactory implements FactoryInterface
     public function createService(ServiceLocatorInterface $serviceLocator, $cName = null, $rName = null)
     {
         $config             = $serviceLocator->get('Config');
+        $routerConfig       = array();
         $routePluginManager = $serviceLocator->get('RoutePluginManager');
 
-        if (
-            $rName === 'ConsoleRouter' ||                   // force console router
-            ($cName === 'router' && Console::isConsole())       // auto detect console
+        if ($rName === 'ConsoleRouter'                       // force console router
+            || ($cName === 'router' && Console::isConsole()) // auto detect console
         ) {
             // We are in a console, use console router.
             if (isset($config['console']) && isset($config['console']['router'])) {
                 $routerConfig = $config['console']['router'];
-            } else {
-                $routerConfig = array();
             }
 
-            $router = new ConsoleRouter($routePluginManager);
-        } else {
-            // This is an HTTP request, so use HTTP router
-            $router       = new HttpRouter($routePluginManager);
-            $routerConfig = isset($config['router']) ? $config['router'] : array();
-        }
+            if (!isset($routerConfig['route_plugins'])) {
+                $routerConfig['route_plugins'] = $routePluginManager;
+            }
 
-        if (isset($routerConfig['route_plugins'])) {
-            $router->setRoutePluginManager($routerConfig['route_plugins']);
+            return ConsoleRouter::factory($routerConfig);
         }
 
-        if (isset($routerConfig['routes'])) {
-            $router->addRoutes($routerConfig['routes']);
+        // This is an HTTP request, so use HTTP router
+        if (isset($config['router'])) {
+            $routerConfig = $config['router'];
         }
 
-        if (isset($routerConfig['default_params'])) {
-            $router->setDefaultParams($routerConfig['default_params']);
+        if (!isset($routerConfig['route_plugins'])) {
+            $routerConfig['route_plugins'] = $routePluginManager;
         }
 
-        return $router;
+        return HttpRouter::factory($routerConfig);
     }
 }