From 0a995deccf91a47ffd321984b6b2b70f03e8cd28 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 3 Feb 2012 01:25:43 +0100 Subject: [PATCH] Fixing configuration according with changes done to router initializationThis change just moves router configuration to instance configuration of the router itself. The change is necessary to allow the router to be injected into other instances of the DiC and to eventually switch the router type to a custom one with own dependencies and eventually completely unaware of the default Zend\Mvc\Router\Http\TreeRouteStack. These changes are related to https://github.com/Ocramius/zf2/compare/zendframework%3Amaster...mvc-router-from-locator --- module/Application/config/module.config.php | 54 ++++++++++++++------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php index 6561e26..cab10d7 100644 --- a/module/Application/config/module.config.php +++ b/module/Application/config/module.config.php @@ -9,7 +9,7 @@ return array( 'error' => 'Application\Controller\ErrorController', 'view' => 'Zend\View\PhpRenderer', ), - + // Inject the plugin broker for controller plugins into // the action controller for use by all controllers that // extend it. @@ -35,30 +35,34 @@ return array( ), ), ), - ), - ), - 'routes' => array( - 'default' => array( - 'type' => 'Zend\Mvc\Router\Http\Segment', - 'options' => array( - 'route' => '/[:controller[/:action]]', - 'constraints' => array( - 'controller' => '[a-zA-Z][a-zA-Z0-9_-]*', - 'action' => '[a-zA-Z][a-zA-Z0-9_-]*', - ), - 'defaults' => array( - 'controller' => 'index', - 'action' => 'index', - ), - ), - ), - 'home' => array( - 'type' => 'Zend\Mvc\Router\Http\Literal', - 'options' => array( - 'route' => '/', - 'defaults' => array( - 'controller' => 'index', - 'action' => 'index', + 'Zend\Mvc\Router\RouteStack' => array( + 'parameters' => array( + 'routes' => array( + 'default' => array( + 'type' => 'Zend\Mvc\Router\Http\Segment', + 'options' => array( + 'route' => '/[:controller[/:action]]', + 'constraints' => array( + 'controller' => '[a-zA-Z][a-zA-Z0-9_-]*', + 'action' => '[a-zA-Z][a-zA-Z0-9_-]*', + ), + 'defaults' => array( + 'controller' => 'index', + 'action' => 'index', + ), + ), + ), + 'home' => array( + 'type' => 'Zend\Mvc\Router\Http\Literal', + 'options' => array( + 'route' => '/', + 'defaults' => array( + 'controller' => 'index', + 'action' => 'index', + ), + ), + ), + ), ), ), ), -- 1.7.10.4