laravel · taylorotwell · May 12, 2025 · May 12, 2025 · crynobone · May 12, 2025
diff --git a/src/Illuminate/Console/Application.php b/src/Illuminate/Console/Application.php
@@ -8,7 +8,9 @@
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Support\ProcessUtils;
+use ReflectionClass;
 use Symfony\Component\Console\Application as SymfonyApplication;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command as SymfonyCommand;
 use Symfony\Component\Console\Exception\CommandNotFoundException;
 use Symfony\Component\Console\Input\ArrayInput;
@@ -239,12 +241,18 @@ protected function addToParent(SymfonyCommand $command)
     */
    public function resolve($command)
    {
-        if (is_subclass_of($command, SymfonyCommand::class) && ($commandName = $command::getDefaultName())) {
-            foreach (explode('|', $commandName) as $name) {
-                $this->commandMap[$name] = $command;
-            }
+        if (is_subclass_of($command, SymfonyCommand::class)) {
+            $attribute = (new ReflectionClass($command))->getAttributes(AsCommand::class);
+
+            $commandName = ! empty($attribute) ? $attribute[0]->newInstance()->name : null;

-            return null;
+            if (! is_null($commandName)) {
+                foreach (explode('|', $commandName) as $name) {
+                    $this->commandMap[$name] = $command;
+                }
+
+                return null;
+            }
        }

        if ($command instanceof Command) {

diff --git a/tests/Console/CommandMutexTest.php b/tests/Console/CommandMutexTest.php
@@ -7,12 +7,15 @@
 use Illuminate\Contracts\Console\Isolatable;
 use Illuminate\Foundation\Application;
 use Mockery as m;
+use Orchestra\Testbench\Concerns\InteractsWithMockery;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;

 class CommandMutexTest extends TestCase
 {
+    use InteractsWithMockery;
+
    /**
     * @var Command
     */
@@ -23,6 +26,8 @@ class CommandMutexTest extends TestCase
     */
    protected $commandMutex;

+    /** {@inheritdoc} */
+    #[\Override]
    protected function setUp(): void
    {
        $this->command = new class extends Command implements Isolatable
@@ -42,6 +47,13 @@ public function __invoke()
        $this->command->setLaravel($app);
    }

+    /** {@inheritdoc} */
+    #[\Override]
+    protected function tearDown(): void
+    {
+        $this->tearDownTheTestEnvironmentUsingMockery();
+    }
+
    public function testCanRunIsolatedCommandIfNotBlocked()
    {
        $this->commandMutex->shouldReceive('create')