[#1] Added AggregateResolver

- Updated ZF2 to rev db6a6e3
- Modified configuration to use AggregateResolver

diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index c41595f..8b7ba54 100644 (file)
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -17,6 +17,11 @@ return array(
             ),
 
             // Setup the View layer
+            'Zend\View\Resolver\AggregateResolver' => array(
+                'injections' => array(
+                    'Zend\View\Resolver\TemplatePathStack',
+                ),
+            ),
             'Zend\View\Resolver\TemplatePathStack' => array(
                 'parameters' => array(
                     'paths'  => array(
@@ -26,7 +31,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(

diff --git a/vendor/ZendFramework b/vendor/ZendFramework
index 878cb78..db6a6e3 160000 (submodule)
--- a/vendor/ZendFramework
+++ b/vendor/ZendFramework
@@ -1 +1 @@
-Subproject commit 878cb780ca5dc4e7119d6630563125b74bea429a
+Subproject commit db6a6e3a7d031cecd32d906e3781c517b2ce8730