Add support for command lazy-loading

Author: chalasr

CHANGELOG.md

@@ -18,6 +18,8 @@ CHANGELOG
    `Symfony\Component\Translation\DependencyInjection\TranslationExtractorPass` instead
  * Deprecated `TranslatorPass`, use 
    `Symfony\Component\Translation\DependencyInjection\TranslatorPass` instead
+ * Added `command` attribute to the `console.command` tag which takes the command
+   name as value, using it makes the command lazy
 
 3.3.0
 -----

Console/Application.php

@@ -68,15 +68,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
     {
         $this->kernel->boot();
 
-        $container = $this->kernel->getContainer();
-
-        foreach ($this->all() as $command) {
-            if ($command instanceof ContainerAwareInterface) {
-                $command->setContainer($container);
-            }
-        }
-
-        $this->setDispatcher($container->get('event_dispatcher'));
+        $this->setDispatcher($this->kernel->getContainer()->get('event_dispatcher'));
 
         return parent::doRun($input, $output);
     }
@@ -98,7 +90,13 @@ public function get($name)
     {
         $this->registerCommands();
 
-        return parent::get($name);
+        $command = parent::get($name);
+
+        if ($command instanceof ContainerAwareInterface) {
+            $command->setContainer($this->kernel->getContainer());
+        }
+
+        return $command;
     }
 
     /**
@@ -144,9 +142,15 @@ protected function registerCommands()
             }
         }
 
+        if ($container->has('console.command_loader')) {
+            $this->setCommandLoader($container->get('console.command_loader'));
+        }
+
         if ($container->hasParameter('console.command.ids')) {
             foreach ($container->getParameter('console.command.ids') as $id) {
-                $this->add($container->get($id));
+                if (false !== $id) {
+                    $this->add($container->get($id));
+                }
             }
         }
     }

Tests/Command/RouterDebugCommandTest.php

@@ -77,10 +77,15 @@ private function getKernel()
 
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
         $container
-            ->expects($this->once())
+            ->expects($this->atLeastOnce())
             ->method('has')
-            ->with('router')
-            ->will($this->returnValue(true))
+            ->will($this->returnCallback(function ($id) {
+                if ('console.command_loader' === $id) {
+                    return false;
+                }
+
+                return true;
+            }))
         ;
         $container
             ->expects($this->any())

Tests/Command/RouterMatchCommandTest.php

@@ -78,8 +78,14 @@ private function getKernel()
         $container
             ->expects($this->atLeastOnce())
             ->method('has')
-            ->with('router')
-            ->will($this->returnValue(true));
+            ->will($this->returnCallback(function ($id) {
+                if ('console.command_loader' === $id) {
+                    return false;
+                }
+
+                return true;
+            }))
+        ;
         $container
             ->expects($this->any())
             ->method('get')

composer.json

@@ -35,7 +35,7 @@
         "fig/link-util": "^1.0",
         "symfony/asset": "~3.3|~4.0",
         "symfony/browser-kit": "~2.8|~3.0|~4.0",
-        "symfony/console": "~3.3|~4.0",
+        "symfony/console": "~3.4|~4.0",
         "symfony/css-selector": "~2.8|~3.0|~4.0",
         "symfony/dom-crawler": "~2.8|~3.0|~4.0",
         "symfony/polyfill-intl-icu": "~1.0",
@@ -64,7 +64,7 @@
         "phpdocumentor/type-resolver": "<0.2.0",
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
         "symfony/asset": "<3.3",
-        "symfony/console": "<3.3",
+        "symfony/console": "<3.4",
         "symfony/form": "<3.3",
         "symfony/property-info": "<3.3",
         "symfony/serializer": "<3.3",