bug #54006 [Process] Fix the command -v exception (kayw-geek)

nicolas-grekas · nicolas-grekas · commit faac38c4403f · 2024-02-20T07:31:04.000-05:00
This PR was submitted for the 7.1 branch but it was merged into the 6.4 branch instead. Discussion ---------- [Process] Fix the `command -v` exception | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #53479 | License | MIT This PR is a continuation of the fixes made in PR #53481 to address the issue. The previous PR partially addressed the problem, but after further review and testing, it was determined that additional changes were needed. Fix the `command -v` exception when the command option with a dash prefix. Commits ------- 2b73f0c Fix the `command -v` exception when the command option with a dash prefix
diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php
@@ -72,7 +72,7 @@ public function find(string $name, ?string $default = null, array $extraDirs = [
             }
         }
 
-        $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v';
+        $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v --';
         if (\function_exists('exec') && ($executablePath = strtok(@exec($command.' '.escapeshellarg($name)), \PHP_EOL)) && @is_executable($executablePath)) {
             return $executablePath;
         }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function find(string $name, ?string $default = null, array $extraDirs = [`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`- $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v';`
	`75`	`+ $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v --';`
`76`	`76`	`if (\function_exists('exec') && ($executablePath = strtok(@exec($command.' '.escapeshellarg($name)), \PHP_EOL)) && @is_executable($executablePath)) {`
`77`	`77`	`return $executablePath;`
`78`	`78`	`}`