From 4e86aaa3691ef3e38dc2dcbcc8429ab57cb3bf7d Mon Sep 17 00:00:00 2001
From: Evan Coury <me@evancoury.com>
Date: Mon, 10 Oct 2011 10:25:51 -0700
Subject: [PATCH] Update zf2 submoudle and Di configuration

- Per updates to zf2 master, no need to explicitly disable annotations in the
runtime configuration for DI
---
 library/ZendFramework                             |    2 +-
 modules/Application/configs/module.config.php     |   10 +++++-----
 modules/Application/src/Application/Bootstrap.php |    8 +++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/library/ZendFramework b/library/ZendFramework
index 31831f1..b3fac72 160000
--- a/library/ZendFramework
+++ b/library/ZendFramework
@@ -1 +1 @@
-Subproject commit 31831f1865398750695fae11a919b396add4ae5d
+Subproject commit b3fac727842db9a839fee9199c8cf61ccbc43ce8
diff --git a/modules/Application/configs/module.config.php b/modules/Application/configs/module.config.php
index 8b9a28d..1d13323 100644
--- a/modules/Application/configs/module.config.php
+++ b/modules/Application/configs/module.config.php
@@ -26,12 +26,12 @@ return array(
 
             'Zend\View\PhpRenderer' => array(
                 'parameters' => array(
-                        'resolver' => 'Zend\View\TemplatePathStack',
-                        'options'  => array(
-                            'script_paths' => array(
-                                'application' => __DIR__ . '/../views',
-                            ),
+                    'resolver' => 'Zend\View\TemplatePathStack',
+                    'options'  => array(
+                        'script_paths' => array(
+                            'application' => __DIR__ . '/../views',
                         ),
+                    ),
                     'broker' => 'Zend\View\HelperBroker',
                 ),
             ),
diff --git a/modules/Application/src/Application/Bootstrap.php b/modules/Application/src/Application/Bootstrap.php
index 722919a..3880ade 100644
--- a/modules/Application/src/Application/Bootstrap.php
+++ b/modules/Application/src/Application/Bootstrap.php
@@ -30,10 +30,12 @@ class Bootstrap
 
     protected function setupLocator(Application $app)
     {
-        $definition = new Definition\RuntimeDefinition;
-        $definition->getIntrospectionStrategy()->setUseAnnotations(false);
-        $di = new Di(new DefinitionList($definition), null, new Configuration($this->config->di));
+        $di = new Di;
         $di->instanceManager()->addTypePreference('Zend\Di\Locator', $di);
+
+        $config = new Configuration($this->config->di);
+        $config->configure($di);
+
         $app->setLocator($di);
     }
 
-- 
1.7.10.4