Simplify container initialization.

easychen · Sep 10, 2016 · 7ec4e7c · 7ec4e7c
1 parent 551a819
commit 7ec4e7c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/Robo.php b/src/Robo.php
@@ -47,7 +47,7 @@ public static function unsetContainer()
     /**
      * Returns the currently active global container.
      *
-     * @return \League\Container\ContainerInterface|null
+     * @return \League\Container\ContainerInterface
      *
      * @throws \RuntimeException
      */
@@ -74,10 +74,14 @@ public static function hasContainer()
      */
     public static function createDefaultContainer($input = null, $output = null, $app)
     {
+        // Do not allow this function to be called more than once.
+        if (static::hasContainer()) {
+            return static::getContainer();
+        }
+
         // Set up our dependency injection container.
         $container = new Container();
         static::configureContainer($container, $input, $output, $app);
-        static::setContainer($container);
 
         return $container;
     }
@@ -89,6 +93,7 @@ public static function configureContainer($container, $input = null, $output = n
     {
         // Self-referential container refernce for the inflector
         $container->add('container', $container);
+        static::setContainer($container);
 
         // Create default input and output objects if they were not provided
         if (!$input) {

diff --git a/src/Runner.php b/src/Runner.php
@@ -112,19 +112,15 @@ public function run($input = null, $output = null, $app = null, $commandFiles =
         $this->setInput($input);
         $this->setOutput($output);
 
-        // If our client gave us a container, then also set it inside
-        // the static Robo class.
-        if ($this->getContainer()) {
-            Robo::setContainer($this->getContainer());
-        }
         // If we were not provided a container, then create one
-        if (!Robo::hasContainer()) {
-            Robo::createDefaultContainer($input, $output, $app);
-            $this->setContainer(Robo::getContainer());
+        if (!$this->getContainer()) {
+            $container = Robo::createDefaultContainer($input, $output, $app);
+            $this->setContainer($container);
             // Automatically register a shutdown function and
             // an error handler when we provide the container.
             $this->installRoboHandlers();
         }
+
         if (!$app) {
             $app = Robo::application();
         }