[11.x] Fixes escaping path via Process given as array (#51926)

crynobone · web-flow · commit 28b5d4ebb0da · 2024-06-27T10:28:51.000+02:00
Introduced in symfony/symfony#52409 we no longer should use `Illuminate\Support\ProcessUtils::escapeArgument()` unless calling `Process` via `Process::fromShellCommandline()` fixes #51820 Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
diff --git a/src/Illuminate/Support/Composer.php b/src/Illuminate/Support/Composer.php
@@ -204,7 +204,7 @@ protected function findComposerFile()
      */
     protected function phpBinary()
     {
-        return ProcessUtils::escapeArgument((new PhpExecutableFinder)->find(false));
+        return (string) (new PhpExecutableFinder)->find(false);
     }
 
     /**
diff --git a/tests/Support/SupportComposerTest.php b/tests/Support/SupportComposerTest.php
@@ -24,9 +24,7 @@ public function testDumpAutoloadRunsTheCorrectCommand()
 
     public function testDumpAutoloadRunsTheCorrectCommandWhenCustomComposerPharIsPresent()
     {
-        $escape = '\\' === DIRECTORY_SEPARATOR ? '"' : '\'';
-
-        $expectedProcessArguments = [$escape.PHP_BINARY.$escape,  'composer.phar', 'dump-autoload'];
+        $expectedProcessArguments = [PHP_BINARY,  'composer.phar', 'dump-autoload'];
         $customComposerPhar = true;
 
         $composer = $this->mockComposer($expectedProcessArguments, $customComposerPhar);

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ protected function findComposerFile()`
`204`	`204`	`*/`
`205`	`205`	`protected function phpBinary()`
`206`	`206`	`{`
`207`		`- return ProcessUtils::escapeArgument((new PhpExecutableFinder)->find(false));`
	`207`	`+ return (string) (new PhpExecutableFinder)->find(false);`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,7 @@ public function testDumpAutoloadRunsTheCorrectCommand()`
`24`	`24`
`25`	`25`	`public function testDumpAutoloadRunsTheCorrectCommandWhenCustomComposerPharIsPresent()`
`26`	`26`	`{`
`27`		`- $escape = '\\' === DIRECTORY_SEPARATOR ? '"' : '\'';`
`28`		`-`
`29`		`- $expectedProcessArguments = [$escape.PHP_BINARY.$escape, 'composer.phar', 'dump-autoload'];`
	`27`	`+ $expectedProcessArguments = [PHP_BINARY, 'composer.phar', 'dump-autoload'];`
`30`	`28`	`$customComposerPhar = true;`
`31`	`29`
`32`	`30`	`$composer = $this->mockComposer($expectedProcessArguments, $customComposerPhar);`