Remove all container set

pennyphp · Oct 2, 2015 · b1b5eed · b1b5eed
1 parent d1f4a1c
commit b1b5eed
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/App.php b/src/App.php
@@ -44,13 +44,10 @@ class App
     public function __construct(ContainerInterface $container = null)
     {
         $this->container = $container ?: Container\PHPDiFactory::buildContainer(Loader::load());
-        $container = &$this->container;
 
         if ($container->has('router') == false) {
             throw new Exception('Define router config');
         }
-
-        $container->set('di', $container);
     }
 
     /**

diff --git a/src/Container/PHPDiFactory.php b/src/Container/PHPDiFactory.php
@@ -19,13 +19,17 @@ public static function buildContainer($config = [])
     {
         $builder = new DI\ContainerBuilder();
         $builder->useAnnotations(true);
-        $builder->addDefinitions([
-            "event_manager" =>  DI\object('Zend\EventManager\EventManager'),
-            "dispatcher" => DI\object('GianArb\Penny\Dispatcher')
-                ->constructor(DI\get('router')),
-        ]);
+        $builder->addDefinitions(
+            [
+                "event_manager" =>  DI\object('Zend\EventManager\EventManager'),
+                "dispatcher" => DI\object('GianArb\Penny\Dispatcher')
+                    ->constructor(DI\get('router')),
+            ]
+        );
         $builder->addDefinitions($config);
+        $container = $builder->build();
+        $container->set('di', $container);
 
-        return $builder->build();
+        return $container;
     }
 }