Fix inconsistent escaping of artisan argument (#39953)

* Fix inconsistent escaping of artisan argument

* Update tests

* Fix test

Author: mcdamo

src/Illuminate/Console/Application.php

@@ -116,7 +116,7 @@ public static function phpBinary()
      */
     public static function artisanBinary()
     {
-        return defined('ARTISAN_BINARY') ? ProcessUtils::escapeArgument(ARTISAN_BINARY) : 'artisan';
+        return ProcessUtils::escapeArgument(defined('ARTISAN_BINARY') ? ARTISAN_BINARY : 'artisan');
     }
 
     /**

tests/Console/ConsoleEventSchedulerTest.php

@@ -101,9 +101,10 @@ public function testCommandCreatesNewArtisanCommand()
 
         $events = $schedule->events();
         $binary = $escape.PHP_BINARY.$escape;
-        $this->assertEquals($binary.' artisan queue:listen', $events[0]->command);
-        $this->assertEquals($binary.' artisan queue:listen --tries=3', $events[1]->command);
-        $this->assertEquals($binary.' artisan queue:listen --tries=3', $events[2]->command);
+        $artisan = $escape.'artisan'.$escape;
+        $this->assertEquals($binary.' '.$artisan.' queue:listen', $events[0]->command);
+        $this->assertEquals($binary.' '.$artisan.' queue:listen --tries=3', $events[1]->command);
+        $this->assertEquals($binary.' '.$artisan.' queue:listen --tries=3', $events[2]->command);
     }
 
     public function testCreateNewArtisanCommandUsingCommandClass()
@@ -115,7 +116,8 @@ public function testCreateNewArtisanCommandUsingCommandClass()
 
         $events = $schedule->events();
         $binary = $escape.PHP_BINARY.$escape;
-        $this->assertEquals($binary.' artisan foo:bar --force', $events[0]->command);
+        $artisan = $escape.'artisan'.$escape;
+        $this->assertEquals($binary.' '.$artisan.' foo:bar --force', $events[0]->command);
     }
 
     public function testCallCreatesNewJobWithTimezone()

tests/Console/Scheduling/EventTest.php

@@ -47,7 +47,7 @@ public function testBuildCommandInBackgroundUsingUnix()
 
         $scheduleId = '"framework'.DIRECTORY_SEPARATOR.'schedule-eeb46c93d45e928d62aaf684d727e213b7094822"';
 
-        $this->assertSame("(php -i > '/dev/null' 2>&1 ; '".PHP_BINARY."' artisan schedule:finish {$scheduleId} \"$?\") > '/dev/null' 2>&1 &", $event->buildCommand());
+        $this->assertSame("(php -i > '/dev/null' 2>&1 ; '".PHP_BINARY."' 'artisan' schedule:finish {$scheduleId} \"$?\") > '/dev/null' 2>&1 &", $event->buildCommand());
     }
 
     public function testBuildCommandInBackgroundUsingWindows()
@@ -61,7 +61,7 @@ public function testBuildCommandInBackgroundUsingWindows()
 
         $scheduleId = '"framework'.DIRECTORY_SEPARATOR.'schedule-eeb46c93d45e928d62aaf684d727e213b7094822"';
 
-        $this->assertSame('start /b cmd /c "(php -i & "'.PHP_BINARY.'" artisan schedule:finish '.$scheduleId.' "%errorlevel%") > "NUL" 2>&1"', $event->buildCommand());
+        $this->assertSame('start /b cmd /c "(php -i & "'.PHP_BINARY.'" "artisan" schedule:finish '.$scheduleId.' "%errorlevel%") > "NUL" 2>&1"', $event->buildCommand());
     }
 
     public function testBuildCommandSendOutputTo()