Merge branch 'hotfix/4652'

Close #4652
zendframework · Jun 13, 2013 · 597a631 · 597a631
2 parents ef6148c + f6b0369
commit 597a631
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/library/Zend/Mvc/Service/RouterFactory.php b/library/Zend/Mvc/Service/RouterFactory.php
@@ -41,12 +41,9 @@ public function createService(ServiceLocatorInterface $serviceLocator, $cName =
         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'];
-            }
-
+            // We are in a console, use console router defaults.
             $routerClass = 'Zend\Mvc\Router\Console\SimpleRouteStack';
+            $routerConfig = isset($config['console']['router']) ? $config['console']['router'] : array();
         }
 
         // Obtain the configured router class, if any

diff --git a/tests/ZendTest/Mvc/Service/RouterFactoryTest.php b/tests/ZendTest/Mvc/Service/RouterFactoryTest.php
@@ -41,4 +41,16 @@ public function testFactoryCanCreateRouterBasedOnConfiguredName()
         $router = $this->factory->createService($this->services, 'router', 'Router');
         $this->assertInstanceOf('ZendTest\Mvc\Service\TestAsset\Router', $router);
     }
+
+    public function testFactoryCanCreateRouterWhenOnlyHttpRouterConfigPresent()
+    {
+        $this->services->setService('Config', array(
+            'router' => array(
+                'router_class' => 'ZendTest\Mvc\Service\TestAsset\Router',
+            ),
+        ));
+
+        $router = $this->factory->createService($this->services, 'router', 'Router');
+        $this->assertInstanceOf('Zend\Mvc\Router\Console\SimpleRouteStack', $router);
+    }
 }