Update zf2 submoudle and Di configuration

[zf2.biz/galerie.git] / modules / Application / src / Application / Bootstrap.php

diff --git a/modules/Application/src/Application/Bootstrap.php b/modules/Application/src/Application/Bootstrap.php
index 722919a..3880ade 100644 (file)
--- 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);
     }