Remove the commands registered by #[AsCommand]

src/Kernel.php

@@ -181,20 +181,32 @@ protected function commands(): void
         Artisan::starting(
             function ($artisan) use ($toRemoveCommands) {
                 $reflectionClass = new ReflectionClass(Artisan::class);
-                $commands = collect($artisan->all())
+
+                $commandsProperty = $reflectionClass->getParentClass()->getProperty('commands');
+                $commands = collect($commandsProperty->getValue($artisan))
                     ->filter(
                         function ($command) use ($toRemoveCommands) {
                             return ! in_array(get_class($command), $toRemoveCommands, true);
                         }
                     )
                     ->toArray();
 
-                $property = $reflectionClass->getParentClass()
-                    ->getProperty('commands');
+                $commandsProperty->setAccessible(true);
+                $commandsProperty->setValue($artisan, $commands);
+                $commandsProperty->setAccessible(false);
+
+                $commandMapProperty = $reflectionClass->getProperty('commandMap');
+                $commandMap = collect($commandMapProperty->getValue($artisan))
+                    ->filter(
+                        function ($command) use ($toRemoveCommands) {
+                            return ! in_array($command, $toRemoveCommands, true);
+                        }
+                    )
+                    ->toArray();
 
-                $property->setAccessible(true);
-                $property->setValue($artisan, $commands);
-                $property->setAccessible(false);
+                $commandMapProperty->setAccessible(true);
+                $commandMapProperty->setValue($artisan, $commandMap);
+                $commandMapProperty->setAccessible(false);
             }
         );
 

tests/Application/app/Commands/FakeDefaultCommand.php

@@ -3,7 +3,9 @@
 namespace App\Commands;
 
 use LaravelZero\Framework\Commands\Command;
+use Symfony\Component\Console\Attribute\AsCommand;
 
+#[AsCommand(name: 'fake:default')]
 class FakeDefaultCommand extends Command
 {
     protected $name = 'fake:default';

tests/Application/app/Commands/FakeEnvironmentValueCommand.php

@@ -3,7 +3,9 @@
 namespace App\Commands;
 
 use LaravelZero\Framework\Commands\Command;
+use Symfony\Component\Console\Attribute\AsCommand;
 
+#[AsCommand(name: 'fake:environmentValue')]
 class FakeEnvironmentValueCommand extends Command
 {
     protected $name = 'fake:environmentValue';

tests/Application/app/Commands/FakeFooCommand.php

@@ -3,7 +3,9 @@
 namespace App\Commands;
 
 use LaravelZero\Framework\Commands\Command;
+use Symfony\Component\Console\Attribute\AsCommand;
 
+#[AsCommand(name: 'fake:foo')]
 class FakeFooCommand extends Command
 {
     protected $signature = 'fake:foo {foo? : The bar}';

tests/Application/app/Commands/FakeRemovedCommand.php

@@ -3,7 +3,9 @@
 namespace App\Commands;
 
 use LaravelZero\Framework\Commands\Command;
+use Symfony\Component\Console\Attribute\AsCommand;
 
+#[AsCommand(name: 'fake:removed')]
 class FakeRemovedCommand extends Command
 {
     protected $name = 'fake:removed';