projects
/
zf2.biz
/
galerie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved the RouteStack di class definition into the module config.
[zf2.biz/galerie.git]
/
module
/
Application
/
config
/
module.config.php
diff --git
a/module/Application/config/module.config.php
b/module/Application/config/module.config.php
index
6b06ceb
..
2ae21f0
100644
(file)
--- a/
module/Application/config/module.config.php
+++ b/
module/Application/config/module.config.php
@@
-3,23
+3,15
@@
return array(
'di' => array(
'definition' => array(
'class' => array(
'di' => array(
'definition' => array(
'class' => array(
- 'Zend\View\Renderer\PhpRenderer' => array(
- 'setResolver' => array(
- 'resolver' => array(
- 'required' => false,
- 'type' => 'Zend\View\Resolver',
- ),
+ 'Zend\Mvc\Router\RouteStack' => array(
+ 'instantiator' => array(
+ 'Zend\Mvc\Router\Http\TreeRouteStack',
+ 'factory'
),
),
),
),
'instance' => array(
),
),
),
),
'instance' => array(
- 'alias' => array(
- 'index' => 'Application\Controller\IndexController',
- 'error' => 'Application\Controller\ErrorController',
- 'view' => 'Zend\View\Renderer\PhpRenderer',
- ),
-
// Inject the plugin broker for controller plugins into
// the action controller for use by all controllers that
// extend it.
// Inject the plugin broker for controller plugins into
// the action controller for use by all controllers that
// extend it.
@@
-35,34
+27,37
@@
return array(
),
// Setup the View layer
),
// Setup the View layer
+ 'Zend\View\Resolver\AggregateResolver' => array(
+ 'injections' => array(
+ 'Zend\View\Resolver\TemplatePathStack',
+ ),
+ ),
'Zend\View\Resolver\TemplatePathStack' => array(
'parameters' => array(
'Zend\View\Resolver\TemplatePathStack' => array(
'parameters' => array(
- 'options' => array(
- 'script_paths' => array(
- 'application' => __DIR__ . '/../view',
- ),
+ 'paths' => array(
+ 'application' => __DIR__ . '/../view',
),
),
),
'Zend\View\Renderer\PhpRenderer' => array(
'parameters' => array(
),
),
),
'Zend\View\Renderer\PhpRenderer' => array(
'parameters' => array(
- 'resolver' => 'Zend\View\Resolver\TemplatePathStack',
+ 'resolver' => 'Zend\View\Resolver\AggregateResolver',
),
),
'Zend\Mvc\View\DefaultRenderingStrategy' => array(
'parameters' => array(
),
),
'Zend\Mvc\View\DefaultRenderingStrategy' => array(
'parameters' => array(
- 'baseTemplate' => 'layout/layout.phtml',
+ 'baseTemplate' => 'layout/layout',
),
),
'Zend\Mvc\View\ExceptionStrategy' => array(
'parameters' => array(
'displayExceptions' => true,
),
),
'Zend\Mvc\View\ExceptionStrategy' => array(
'parameters' => array(
'displayExceptions' => true,
- 'errorTemplate' => 'error/index.phtml',
+ 'template' => 'error/index',
),
),
'Zend\Mvc\View\RouteNotFoundStrategy' => array(
'parameters' => array(
),
),
'Zend\Mvc\View\RouteNotFoundStrategy' => array(
'parameters' => array(
- 'notFoundTemplate' => 'error/404.phtml',
+ 'notFoundTemplate' => 'error/404',
),
),
),
),
@@
-79,7
+74,7
@@
return array(
'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
),
'defaults' => array(
'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
),
'defaults' => array(
- 'controller' => 'index',
+ 'controller' => 'Application\Controller\IndexController',
'action' => 'index',
),
),
'action' => 'index',
),
),
@@
-89,7
+84,7
@@
return array(
'options' => array(
'route' => '/',
'defaults' => array(
'options' => array(
'route' => '/',
'defaults' => array(
- 'controller' => 'index',
+ 'controller' => 'Application\Controller\IndexController',
'action' => 'index',
),
),
'action' => 'index',
),
),