From 132c918857c79a998fb100cb9447a18d1f36ff7b Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Tue, 14 Feb 2012 11:15:14 -0600
Subject: [PATCH] Fixes for helper loader/broker configuration

- Removed unneeded aliases
- Removed obsolete classmap entries
- Updated ZF2 library to latest feature/view-layer
---
 module/Application/autoload_classmap.php    |    3 +--
 module/Application/config/module.config.php |   22 ++--------------------
 vendor/ZendFramework                        |    2 +-
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/module/Application/autoload_classmap.php b/module/Application/autoload_classmap.php
index a30d090..acf5238 100644
--- a/module/Application/autoload_classmap.php
+++ b/module/Application/autoload_classmap.php
@@ -1,7 +1,6 @@
 <?php
 return array(
-    'Application\View\Listener'              => __DIR__ . '/src/Application/View/Listener.php',
     'Application\Controller\IndexController' => __DIR__ . '/src/Application/Controller/IndexController.php',
     'Application\Controller\ErrorController' => __DIR__ . '/src/Application/Controller/ErrorController.php',
     'Application\Module'                     => __DIR__ . '/Module.php',
-);
\ No newline at end of file
+);
diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index 02a7061..c41595f 100644
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -1,25 +1,7 @@
 <?php
 return array(
     'di' => array(
-        'definition' => array(
-            'class' => array(
-                'Zend\View\Renderer\PhpRenderer' => array(
-                    'setResolver' => array(
-                        'resolver' => array(
-                            'required' => false,
-                            'type'     => 'Zend\View\Resolver',
-                        ),
-                    ),
-                ),
-            ),
-        ),
         '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.
@@ -77,7 +59,7 @@ return array(
                                     'action'     => '[a-zA-Z][a-zA-Z0-9_-]*',
                                 ),
                                 'defaults' => array(
-                                    'controller' => 'index',
+                                    'controller' => 'Application\Controller\IndexController',
                                     'action'     => 'index',
                                 ),
                             ),
@@ -87,7 +69,7 @@ return array(
                             'options' => array(
                                 'route'    => '/',
                                 'defaults' => array(
-                                    'controller' => 'index',
+                                    'controller' => 'Application\Controller\IndexController',
                                     'action'     => 'index',
                                 ),
                             ),
diff --git a/vendor/ZendFramework b/vendor/ZendFramework
index 99cdf5c..e0176af 160000
--- a/vendor/ZendFramework
+++ b/vendor/ZendFramework
@@ -1 +1 @@
-Subproject commit 99cdf5ceca4792e08bac0104a7e9a93528181e8a
+Subproject commit e0176af9226868138b1a8d28d135384591327fbd
-- 
1.7.10.4