[12.x] Add commandFileFinder method and exclude test files from command discovery (#58017)

* wip

* formatting

---------

Co-authored-by: Taylor Otwell <[email protected]>

Author: davidhemphill

src/Illuminate/Foundation/Console/Kernel.php

@@ -366,7 +366,7 @@ protected function load($paths)
 
         $namespace = $this->app->getNamespace();
 
-        foreach (Finder::create()->in($paths)->files() as $file) {
+        foreach ($this->findCommands($paths) as $file) {
             $command = $this->commandClassFromFile($file, $namespace);
 
             if (is_subclass_of($command, Command::class) &&
@@ -378,6 +378,17 @@ protected function load($paths)
         }
     }
 
+    /**
+     * Get the Finder instance for discovering command files.
+     *
+     * @param  array  $paths
+     * @return \Symfony\Component\Finder\Finder
+     */
+    protected function findCommands(array $paths)
+    {
+        return Finder::create()->in($paths)->notName('*Test.php')->files();
+    }
+
     /**
      * Extract the command class name from the given file path.
      *

tests/Console/ConsoleApplicationTest.php

@@ -8,6 +8,7 @@
 use Illuminate\Contracts\Foundation\Application as ApplicationContract;
 use Illuminate\Events\Dispatcher as EventsDispatcher;
 use Illuminate\Foundation\Application as FoundationApplication;
+use Illuminate\Foundation\Console\Kernel;
 use Illuminate\Tests\Console\Fixtures\FakeCommandWithArrayInputPrompting;
 use Illuminate\Tests\Console\Fixtures\FakeCommandWithInputPrompting;
 use Mockery as m;
@@ -241,6 +242,35 @@ public function testCallMethodCanCallArtisanCommandUsingCommandClassObject()
         $this->assertSame(0, $exitCode);
     }
 
+    public function testLoadIgnoresTestFiles()
+    {
+        $dir = __DIR__.'/laravel';
+        @mkdir($dir.'/app/Console/Commands', 0755, true);
+        file_put_contents($dir.'/composer.json', json_encode(['autoload' => ['psr-4' => ['App\\' => 'app/']]]));
+        file_put_contents($dir.'/app/Console/Commands/ExampleCommand.php', '<?php namespace App\Console\Commands; class ExampleCommand extends \Illuminate\Console\Command { protected $signature = "example"; public function handle() {} }');
+        file_put_contents($dir.'/app/Console/Commands/ExampleCommandTest.php', '<?php namespace App\Console\Commands; class ExampleCommandTest extends \Illuminate\Console\Command { protected $signature = "example-test"; public function handle() {} }');
+
+        try {
+            $app = new FoundationApplication($dir);
+            $events = new EventsDispatcher($app);
+            $app->instance('events', $events);
+
+            $kernel = new TestKernel($app, $events);
+            $kernel->loadFrom([$dir.'/app/Console/Commands']);
+
+            $this->assertContains('App\Console\Commands\ExampleCommand', $kernel->loadedCommands);
+            $this->assertNotContains('App\Console\Commands\ExampleCommandTest', $kernel->loadedCommands);
+        } finally {
+            @unlink($dir.'/app/Console/Commands/ExampleCommand.php');
+            @unlink($dir.'/app/Console/Commands/ExampleCommandTest.php');
+            @unlink($dir.'/composer.json');
+            @rmdir($dir.'/app/Console/Commands');
+            @rmdir($dir.'/app/Console');
+            @rmdir($dir.'/app');
+            @rmdir($dir);
+        }
+    }
+
     protected function getMockConsole(array $methods)
     {
         $app = m::mock(ApplicationContract::class, ['version' => '6.0']);
@@ -273,3 +303,18 @@ class CommandWithAliasViaProperty extends Command
     public $name = 'command-name';
     public $aliases = ['command-alias'];
 }
+
+class TestKernel extends Kernel
+{
+    public $loadedCommands = [];
+
+    public function loadFrom($paths)
+    {
+        $this->load($paths);
+    }
+
+    protected function commandClassFromFile(\SplFileInfo $file, string $namespace): string
+    {
+        return tap(parent::commandClassFromFile($file, $namespace), fn ($command) => $this->loadedCommands[] = $command);
+    }
+}