X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=modules%2FApplication%2Fsrc%2FApplication%2FBootstrap.php;h=e46649f879ed912212237f24cebb85a099d8d69f;hb=25f44b51e55863f37d225614c5d725a6a437d368;hp=fed8b364c07efd1fbb05ed6fb8f28728bf3d0d35;hpb=f8a26075e9ee566a933125f76e73208fffd775a2;p=zf2.biz%2Fgalerie.git

diff --git a/modules/Application/src/Application/Bootstrap.php b/modules/Application/src/Application/Bootstrap.php
index fed8b36..e46649f 100644
--- a/modules/Application/src/Application/Bootstrap.php
+++ b/modules/Application/src/Application/Bootstrap.php
@@ -2,9 +2,8 @@
 namespace Application;
 
 use Zend\Config\Config,
-    Zend\Di\Configuration,
-    Zend\Di\Definition,
-    Zend\Di\DependencyInjector,
+    Zend\Di\Configuration as DiConfiguration,
+    Zend\Di\Di,
     Zend\EventManager\StaticEventManager,
     Zend\Module\Manager as ModuleManager,
     Zend\Mvc\Application;
@@ -29,13 +28,10 @@ class Bootstrap
 
     protected function setupLocator(Application $app)
     {
-        $definition = new Definition\AggregateDefinition;
-        $definition->addDefinition(new Definition\RuntimeDefinition);
+        $di = new Di;
+        $di->instanceManager()->addTypePreference('Zend\Di\Locator', $di);
 
-        $di = new DependencyInjector;
-        $di->setDefinition($definition);
-
-        $config = new Configuration($this->config->di);
+        $config = new DiConfiguration($this->config->di);
         $config->configure($di);
 
         $app->setLocator($di);
@@ -44,12 +40,7 @@ class Bootstrap
     protected function setupRoutes(Application $app)
     {
         $router = $app->getLocator()->get('Zend\Mvc\Router\SimpleRouteStack');
-        foreach ($this->config->routes as $name => $config) {
-            $class   = $config->type;
-            $options = $config->options;
-            $route   = new $class($options);
-            $router->addRoute($name, $route);
-        }
+        $router->addRoutes($this->config->routes->toArray());
         $app->setRouter($router);
     }