bug #21613 [Process] Permit empty suffix on Windows (Bilge)

fabpot · fabpot · commit 1901432c578f · 2017-02-16T04:33:38.000-08:00
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #21613). Discussion ---------- [Process] Permit empty suffix on Windows | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | It is a fallacy to assume the blank suffix is not applicable on Windows systems, especially in a world where we often emulate Linux systems with solutions such as CYGWIN, MinGW and MSYS. Commits ------- 412db4c Permit empty suffix on Windows
diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php
@@ -75,7 +75,7 @@ public function find($name, $default = null, array $extraDirs = array())
         $suffixes = array('');
         if ('\\' === DIRECTORY_SEPARATOR) {
             $pathExt = getenv('PATHEXT');
-            $suffixes = $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes;
+            $suffixes = array_merge($suffixes, $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes);
         }
         foreach ($suffixes as $suffix) {
             foreach ($dirs as $dir) {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function find($name, $default = null, array $extraDirs = array())`
`75`	`75`	`$suffixes = array('');`
`76`	`76`	`if ('\\' === DIRECTORY_SEPARATOR) {`
`77`	`77`	`$pathExt = getenv('PATHEXT');`
`78`		`- $suffixes = $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes;`
	`78`	`+ $suffixes = array_merge($suffixes, $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes);`
`79`	`79`	`}`
`80`	`80`	`foreach ($suffixes as $suffix) {`
`81`	`81`	`foreach ($dirs as $dir) {`