Completely lazy load console commands when resolving

Author: garygreen

src/Illuminate/Console/Application.php

@@ -54,11 +54,11 @@ class Application extends SymfonyApplication implements ApplicationContract
     protected static $bootstrappers = [];
 
     /**
-     * A map of command names to classes.
+     * The lazy command loader.
      *
-     * @var array
+     * @var \Illuminate\Console\ContainerCommandLoader
      */
-    protected $commandMap = [];
+    protected $commandLoader;
 
     /**
      * Create a new Artisan console application.
@@ -265,8 +265,8 @@ protected function addToParent(SymfonyCommand $command)
      */
     public function resolve($command)
     {
-        if (class_exists($command) && ($commandName = $command::getDefaultName())) {
-            $this->commandMap[$commandName] = $command;
+        if (class_exists($command) && $this->commandLoader) {
+            $this->commandLoader->add($command);
 
             return null;
         }
@@ -298,7 +298,7 @@ public function resolveCommands($commands)
      */
     public function setContainerCommandLoader()
     {
-        $this->setCommandLoader(new ContainerCommandLoader($this->laravel, $this->commandMap));
+        $this->setCommandLoader($this->commandLoader = new ContainerCommandLoader($this->laravel));
 
         return $this;
     }

src/Illuminate/Console/ContainerCommandLoader.php

@@ -17,23 +17,32 @@ class ContainerCommandLoader implements CommandLoaderInterface
     protected $container;
 
     /**
-     * A map of command names to classes.
+     * A list of class names.
      *
      * @var array
      */
-    protected $commandMap;
+    protected $classes = [];
 
     /**
      * Create a new command loader instance.
      *
      * @param  \Psr\Container\ContainerInterface  $container
-     * @param  array  $commandMap
      * @return void
      */
-    public function __construct(ContainerInterface $container, array $commandMap)
+    public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-        $this->commandMap = $commandMap;
+    }
+
+    /**
+     * Add class to the loader.
+     *
+     * @param string $name
+     * @return void
+     */
+    public function add(string $name)
+    {
+        $this->classes[] = $name;
     }
 
     /**
@@ -50,7 +59,7 @@ public function get(string $name): Command
             throw new CommandNotFoundException(sprintf('Command "%s" does not exist.', $name));
         }
 
-        return $this->container->get($this->commandMap[$name]);
+        return $this->container->get($name);
     }
 
     /**
@@ -61,7 +70,7 @@ public function get(string $name): Command
      */
     public function has(string $name): bool
     {
-        return $name && isset($this->commandMap[$name]);
+        return in_array($name, $this->classes);
     }
 
     /**
@@ -71,6 +80,12 @@ public function has(string $name): bool
      */
     public function getNames(): array
     {
-        return array_keys($this->commandMap);
+        $names = [];
+
+        foreach ($this->classes as $class) {
+            $names[] = $class::getDefaultName();
+        }
+
+        return $names;
     }
 }

src/Illuminate/Foundation/Console/Kernel.php

@@ -328,8 +328,8 @@ protected function getArtisan()
     {
         if (is_null($this->artisan)) {
             $this->artisan = (new Artisan($this->app, $this->events, $this->app->version()))
-                                    ->resolveCommands($this->commands)
-                                    ->setContainerCommandLoader();
+                                    ->setContainerCommandLoader()
+                                    ->resolveCommands($this->commands);
         }
 
         return $this->artisan;