X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=module%2FApplication%2Fconfig%2Fmodule.config.php;h=dd2f0d7122b07fa13b1efad39ad81623b4a17620;hb=9f7663fccceeeb7d3b00f6ee32cc5da70d7190c0;hp=02a706168b1acde4ca0387ac2a66a24a005205ce;hpb=a181bb77ea92727d8343cc956acb0c1e517a0d9d;p=zf2.biz%2Fgalerie.git

diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index 02a7061..dd2f0d7 100644
--- 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(
-                '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(
-            '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.
@@ -35,6 +27,19 @@ return array(
             ),
 
             // Setup the View layer
+            'Zend\View\Resolver\AggregateResolver' => array(
+                'injections' => array(
+                    'Zend\View\Resolver\TemplateMapResolver',
+                    'Zend\View\Resolver\TemplatePathStack',
+                ),
+            ),
+            'Zend\View\Resolver\TemplateMapResolver' => array(
+                'parameters' => array(
+                    'map'  => array(
+                        'layout/layout' => __DIR__ . '/../view/layout/layout.phtml',
+                    ),
+                ),
+            ),
             'Zend\View\Resolver\TemplatePathStack' => array(
                 'parameters' => array(
                     'paths'  => array(
@@ -44,7 +49,7 @@ return array(
             ),
             'Zend\View\Renderer\PhpRenderer' => array(
                 'parameters' => array(
-                    'resolver' => 'Zend\View\Resolver\TemplatePathStack',
+                    'resolver' => 'Zend\View\Resolver\AggregateResolver',
                 ),
             ),
             'Zend\Mvc\View\DefaultRenderingStrategy' => array(
@@ -61,6 +66,7 @@ return array(
             'Zend\Mvc\View\RouteNotFoundStrategy' => array(
                 'parameters' => array(
                     'notFoundTemplate' => 'error/404',
+                    'displayNotFoundReason' => true,
                 ),
             ),
 
@@ -77,7 +83,7 @@ return array(
                                     'action'     => '[a-zA-Z][a-zA-Z0-9_-]*',
                                 ),
                                 'defaults' => array(
-                                    'controller' => 'index',
+                                    'controller' => 'Application\Controller\IndexController',
                                     'action'     => 'index',
                                 ),
                             ),
@@ -87,7 +93,7 @@ return array(
                             'options' => array(
                                 'route'    => '/',
                                 'defaults' => array(
-                                    'controller' => 'index',
+                                    'controller' => 'Application\Controller\IndexController',
                                     'action'     => 'index',
                                 ),
                             ),