X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=modules%2FApplication%2Fsrc%2FApplication%2FBootstrap.php;h=3880adedd7a8f4805af490c69d0ec03903a32048;hb=4e86aaa3691ef3e38dc2dcbcc8429ab57cb3bf7d;hp=722919ae9742f95031496d1946ae433b31716795;hpb=e5ebb1f4a4affc00c746ddec566ccc257d1f5b6d;p=zf2.biz%2Fgalerie.git 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); }