[console] Relocate command registration to loadCommands method. (#308)

hechoendrupal · Feb 9, 2018 · 7bbdebd · 7bbdebd
1 parent a80391b
commit 7bbdebd
Showing 1 changed file with 28 additions and 16 deletions.
diff --git a/src/Application.php b/src/Application.php
@@ -113,29 +113,14 @@ public function doRun(InputInterface $input, OutputInterface $output)
             $output->write(sprintf("\033\143"));
         }
 
-        $this->registerGenerators();
-        $this->registerCommands();
-        $this->registerEvents();
-        $this->registerExtendCommands();
+        $this->loadCommands();
 
         /**
          * @var ConfigurationManager $configurationManager
          */
         $configurationManager = $this->container
             ->get('console.configuration_manager');
 
-        $config = $configurationManager->getConfiguration()
-            ->get('application.extras.config')?:'true';
-        if ($config === 'true') {
-            $this->registerCommandsFromAutoWireConfiguration();
-        }
-
-        $chains = $configurationManager->getConfiguration()
-            ->get('application.extras.chains')?:'true';
-        if ($chains === 'true') {
-            $this->registerChainCommands();
-        }
-
         if (!$this->has($this->commandName)) {
             $isValidCommand = false;
             $config = $configurationManager->getConfiguration();
@@ -199,6 +184,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
             $input,
             $output
         );
+
         if ($this->showMessages($input)) {
             $messages = $messageManager->getMessages();
 
@@ -216,6 +202,32 @@ public function doRun(InputInterface $input, OutputInterface $output)
         return $code;
     }
 
+    public function loadCommands()
+    {
+        $this->registerGenerators();
+        $this->registerCommands();
+        $this->registerEvents();
+        $this->registerExtendCommands();
+
+        /**
+         * @var ConfigurationManager $configurationManager
+         */
+        $configurationManager = $this->container
+            ->get('console.configuration_manager');
+
+        $config = $configurationManager->getConfiguration()
+            ->get('application.extras.config')?:'true';
+        if ($config === 'true') {
+            $this->registerCommandsFromAutoWireConfiguration();
+        }
+
+        $chains = $configurationManager->getConfiguration()
+            ->get('application.extras.chains')?:'true';
+        if ($chains === 'true') {
+            $this->registerChainCommands();
+        }
+    }
+
     /**
      * @param InputInterface $input
      *