From 52f94fcc7087bb4b4134a0400ddedeba8c75175f Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Mon, 14 May 2012 12:31:13 -0500
Subject: [PATCH] Cleanup in preparation for PR

- Updated vendor/ZendFramework to a6f4d09 of
  weierophinney/feature/mvc-sm-viewmanager
- Updated configuration to introduce "router" as base key for router
  configuration
- Removed unnecessary artifacts from Application\Module
---
 .gitmodules                                 |    2 +-
 config/application.config.php               |    6 ++--
 module/Application/Module.php               |   20 +----------
 module/Application/config/module.config.php |   52 ++++++++++++++-------------
 vendor/ZendFramework                        |    2 +-
 5 files changed, 33 insertions(+), 49 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 8f630ff..a974f87 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "vendor/ZendFramework"]
 	path = vendor/ZendFramework
-	url = git://github.com/zendframework/zf2.git
+	url = git://github.com/weierophinney/zf2.git
diff --git a/config/application.config.php b/config/application.config.php
index 4c27d23..e8868a3 100644
--- a/config/application.config.php
+++ b/config/application.config.php
@@ -13,7 +13,7 @@ return array(
     ),
     'service_manager' => array(
         'use_defaults' => true,
-        'factories' => array(
-        )
-    )
+        'factories'    => array(
+        ),
+    ),
 );
diff --git a/module/Application/Module.php b/module/Application/Module.php
index 5f93426..6ab203c 100644
--- a/module/Application/Module.php
+++ b/module/Application/Module.php
@@ -2,19 +2,10 @@
 
 namespace Application;
 
-use Zend\Module\Manager,
-    Zend\EventManager\StaticEventManager,
-    Zend\Module\Consumer\AutoloaderProvider;
+use Zend\Module\Consumer\AutoloaderProvider;
 
 class Module implements AutoloaderProvider
 {
-    public function init(Manager $moduleManager)
-    {
-        $events       = $moduleManager->events();
-        $sharedEvents = $events->getSharedManager();
-        $sharedEvents->attach('bootstrap', 'bootstrap', array($this, 'initializeView'), 100);
-    }
-
     public function getAutoloaderConfig()
     {
         return array(
@@ -33,13 +24,4 @@ class Module implements AutoloaderProvider
     {
         return include __DIR__ . '/config/module.config.php';
     }
-    
-    public function initializeView($e)
-    {
-        $app          = $e->getParam('application');
-        $basePath     = $app->getRequest()->getBasePath();
-        $locator      = $app->getLocator();
-        $renderer     = $locator->get('Zend\View\Renderer\PhpRenderer');
-        $renderer->plugin('basePath')->setBasePath($basePath);
-    }
 }
diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index 275f8b3..dc3bd81 100644
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -1,27 +1,29 @@
 <?php
 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' => 'IndexController',
-                    'action'     => 'index',
+    'router' => 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' => 'IndexController',
+                        'action'     => 'index',
+                    ),
                 ),
             ),
-        ),
-        'home' => array(
-            'type' => 'Zend\Mvc\Router\Http\Literal',
-            'options' => array(
-                'route'    => '/',
-                'defaults' => array(
-                    'controller' => 'IndexController',
-                    'action'     => 'index',
+            'home' => array(
+                'type' => 'Zend\Mvc\Router\Http\Literal',
+                'options' => array(
+                    'route'    => '/',
+                    'defaults' => array(
+                        'controller' => 'IndexController',
+                        'action'     => 'index',
+                    ),
                 ),
             ),
         ),
@@ -29,11 +31,11 @@ return array(
     'controllers' => array(
         'IndexController' => 'Application\Controller\IndexController'
     ),
-    'view' => array(
+    'view_manager' => array(
         'display_not_found_reason' => true,
-        'display_exceptions' => true,
-        'not_found_template' => 'error/404',
-        'exception_template' => 'error/index',
+        'display_exceptions'       => true,
+        'not_found_template'       => 'error/404',
+        'exception_template'       => 'error/index',
         'template_map' => array(
             'layout/layout' => __DIR__ . '/../view/layout/layout.phtml',
             'index/index'   => __DIR__ . '/../view/index/index.phtml',
@@ -48,4 +50,4 @@ return array(
         'driver' => 'Pdo-Sqlite',
         'dbname' => 'path/to/data/database.sqlite'
     )
-);
\ No newline at end of file
+);
diff --git a/vendor/ZendFramework b/vendor/ZendFramework
index 50ca25b..a6f4d09 160000
--- a/vendor/ZendFramework
+++ b/vendor/ZendFramework
@@ -1 +1 @@
-Subproject commit 50ca25bbcf742a6bf0014798cfdf8c8d8c344faa
+Subproject commit a6f4d09d2f6ce33cf29da5c661a96057b819b8c4
-- 
1.7.10.4