bug #26040 [Process] Check PHP_BINDIR before $PATH in PhpExecutableFinder (nicolas-grekas)

fabpot · fabpot · commit 0b08f37ed38d · 2018-02-12T07:54:20.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [Process] Check PHP_BINDIR before $PATH in PhpExecutableFinder | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25187 | License | MIT | Doc PR | - Commits ------- 3a470c4 [Process] Check PHP_BINDIR before $PATH in PhpExecutableFinder
diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php
@@ -62,6 +62,10 @@ public function find($includeArgs = true)
             }
         }
 
+        if (is_executable($php = PHP_BINDIR.'/php'.('\\' === DIRECTORY_SEPARATOR ? '.exe' : ''))) {
+            return $php;
+        }
+
         $dirs = array(PHP_BINDIR);
         if ('\\' === DIRECTORY_SEPARATOR) {
             $dirs[] = 'C:\xampp\php\\';

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,10 @@ public function find($includeArgs = true)`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ if (is_executable($php = PHP_BINDIR.'/php'.('\\' === DIRECTORY_SEPARATOR ? '.exe' : ''))) {`
	`66`	`+ return $php;`
	`67`	`+ }`
	`68`	`+`
`65`	`69`	`$dirs = array(PHP_BINDIR);`
`66`	`70`	`if ('\\' === DIRECTORY_SEPARATOR) {`
`67`	`71`	`$dirs[] = 'C:\xampp\php\\';`