[12.x] Allow passing command class instances directly to Schedule::command() and Artisan::call() (#56530)

* feat: Run command using command class object

* fix: style ci

* fix tests: call get_class only on objects

* fix: style ci

Author: amirhshokri

src/Illuminate/Console/Application.php

@@ -147,7 +147,7 @@ public static function forgetBootstrappers()
     /**
      * Run an Artisan console command by name.
      *
-     * @param  string  $command
+     * @param  \Symfony\Component\Console\Command\Command|string  $command
      * @param  array  $parameters
      * @param  \Symfony\Component\Console\Output\OutputInterface|null  $outputBuffer
      * @return int
@@ -170,7 +170,7 @@ public function call($command, array $parameters = [], $outputBuffer = null)
     /**
      * Parse the incoming Artisan command and its input.
      *
-     * @param  string  $command
+     * @param  \Symfony\Component\Console\Command\Command|string  $command
      * @param  array  $parameters
      * @return array
      */
@@ -179,6 +179,10 @@ protected function parseCommand($command, $parameters)
         if (is_subclass_of($command, SymfonyCommand::class)) {
             $callingClass = true;
 
+            if (is_object($command)) {
+                $command = get_class($command);
+            }
+
             $command = $this->laravel->make($command)->getName();
         }
 

src/Illuminate/Console/Scheduling/Schedule.php

@@ -18,6 +18,7 @@
 use Illuminate\Support\ProcessUtils;
 use Illuminate\Support\Traits\Macroable;
 use RuntimeException;
+use Symfony\Component\Console\Command\Command as SymfonyCommand;
 
 use function Illuminate\Support\enum_value;
 
@@ -149,12 +150,22 @@ public function call($callback, array $parameters = [])
     /**
      * Add a new Artisan command event to the schedule.
      *
-     * @param  string  $command
+     * @param  \Symfony\Component\Console\Command\Command|string  $command
      * @param  array  $parameters
      * @return \Illuminate\Console\Scheduling\Event
      */
     public function command($command, array $parameters = [])
     {
+        if ($command instanceof SymfonyCommand) {
+            $command = get_class($command);
+
+            $command = Container::getInstance()->make($command);
+
+            return $this->exec(
+                Application::formatCommandString($command->getName()), $parameters,
+            )->description($command->getDescription());
+        }
+
         if (class_exists($command)) {
             $command = Container::getInstance()->make($command);
 

src/Illuminate/Foundation/Console/Kernel.php

@@ -408,7 +408,7 @@ public function registerCommand($command)
     /**
      * Run an Artisan console command by name.
      *
-     * @param  string  $command
+     * @param  \Symfony\Component\Console\Command\Command|string  $command
      * @param  array  $parameters
      * @param  \Symfony\Component\Console\Output\OutputInterface|null  $outputBuffer
      * @return int

src/Illuminate/Support/Facades/Artisan.php

@@ -12,7 +12,7 @@
  * @method static \Illuminate\Console\Scheduling\Schedule resolveConsoleSchedule()
  * @method static \Illuminate\Foundation\Console\ClosureCommand command(string $signature, \Closure $callback)
  * @method static void registerCommand(\Symfony\Component\Console\Command\Command $command)
- * @method static int call(string $command, array $parameters = [], \Symfony\Component\Console\Output\OutputInterface|null $outputBuffer = null)
+ * @method static int call(\Symfony\Component\Console\Command\Command|string $command, array $parameters = [], \Symfony\Component\Console\Output\OutputInterface|null $outputBuffer = null)
  * @method static \Illuminate\Foundation\Bus\PendingDispatch queue(string $command, array $parameters = [])
  * @method static array all()
  * @method static string output()

src/Illuminate/Support/Facades/Schedule.php

@@ -6,7 +6,7 @@
 
 /**
  * @method static \Illuminate\Console\Scheduling\CallbackEvent call(string|callable $callback, array $parameters = [])
- * @method static \Illuminate\Console\Scheduling\Event command(string $command, array $parameters = [])
+ * @method static \Illuminate\Console\Scheduling\Event command(\Symfony\Component\Console\Command\Command|string $command, array $parameters = [])
  * @method static \Illuminate\Console\Scheduling\CallbackEvent job(object|string $job, \UnitEnum|string|null $queue = null, \UnitEnum|string|null $connection = null)
  * @method static \Illuminate\Console\Scheduling\Event exec(string $command, array $parameters = [])
  * @method static void group(\Closure $events)

tests/Console/ConsoleApplicationTest.php

@@ -222,6 +222,25 @@ public function testCommandInputDoesntPromptWhenRequiredArgumentsArePassed()
         $this->assertSame(0, $statusCode);
     }
 
+    public function testCallMethodCanCallArtisanCommandUsingCommandClassObject()
+    {
+        $app = new Application(
+            $laravel = new \Illuminate\Foundation\Application(__DIR__),
+            $events = m::mock(Dispatcher::class, ['dispatch' => null, 'fire' => null]),
+            'testing'
+        );
+
+        $app->addCommands([$command = new FakeCommandWithInputPrompting()]);
+
+        $command->setLaravel($laravel);
+
+        $statusCode = $app->call($command);
+
+        $this->assertTrue($command->prompted);
+        $this->assertSame('foo', $command->argument('name'));
+        $this->assertSame(0, $statusCode);
+    }
+
     protected function getMockConsole(array $methods)
     {
         $app = m::mock(ApplicationContract::class, ['version' => '6.0']);

tests/Console/ConsoleEventSchedulerTest.php

@@ -117,6 +117,26 @@ public function testCreateNewArtisanCommandUsingCommandClass()
         $this->assertEquals($phpBinary.' '.$artisanBinary.' foo:bar --force', $events[0]->command);
     }
 
+    public function testCreateNewArtisanCommandUsingCommandClassObject()
+    {
+        $command = new class extends Command
+        {
+            protected $signature = 'foo:bar';
+
+            public function handle()
+            {
+            }
+        };
+
+        $schedule = $this->schedule;
+        $schedule->command($command, ['--force']);
+
+        $events = $schedule->events();
+        $phpBinary = Application::phpBinary();
+        $artisanBinary = Application::artisanBinary();
+        $this->assertEquals($phpBinary.' '.$artisanBinary.' foo:bar --force', $events[0]->command);
+    }
+
     public function testItUsesCommandDescriptionAsEventDescription()
     {
         $schedule = $this->schedule;