merged branch patrickallaert/issue-8455 (PR #8456)

fabpot · fabpot · commit c1e4bb835302 · 2013-07-21T14:15:26.000+02:00
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8456). Discussion ---------- [Process] Fixed #8455: PhpExecutableFinder::find() does not always return the correct binary Since `PHP_BINARY` is the very first approach considered, there is no way to use a workaround like setting the `PHP_PATH`. Checking `PHP_PATH` could potentially be put before checking `PHP_BINARY`: that would avoid an extra function call (and system call), at the price of a small BC_BREAK, but I think it's better in this case to have a solution that doesn't force people to set the `PHP_PATH` environment variable. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #8455 | License | MIT | Doc PR | none Commits ------- 35a2fe4 [Process] Fixed #8455: PhpExecutableFinder::find() does not always return the correct binary
diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php
@@ -34,7 +34,7 @@ public function __construct()
     public function find()
     {
         // PHP_BINARY return the current sapi executable
-        if (defined('PHP_BINARY') && PHP_BINARY && ('cli' === PHP_SAPI)) {
+        if (defined('PHP_BINARY') && PHP_BINARY && ('cli' === PHP_SAPI) && is_file(PHP_BINARY)) {
             return PHP_BINARY;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __construct()`
`34`	`34`	`public function find()`
`35`	`35`	`{`
`36`	`36`	`// PHP_BINARY return the current sapi executable`
`37`		`- if (defined('PHP_BINARY') && PHP_BINARY && ('cli' === PHP_SAPI)) {`
	`37`	`+ if (defined('PHP_BINARY') && PHP_BINARY && ('cli' === PHP_SAPI) && is_file(PHP_BINARY)) {`
`38`	`38`	`return PHP_BINARY;`
`39`	`39`	`}`
`40`	`40`