bug #26598 Fixes #26563 (open_basedir restriction in effect) (temperatur)

nicolas-grekas · nicolas-grekas · commit 0222fde0052c · 2018-03-19T15:39:18.000+01:00
This PR was submitted for the 4.0 branch but it was merged into the 2.7 branch instead (closes #26598). Discussion ---------- Fixes #26563 (open_basedir restriction in effect) If the open_basedir is set is_file(PHP_BINARY) is false. | Q | A | ------------- | --- | Branch? | 4.0 | Bug fix? | yes/ | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #26563 | License | MIT | Doc PR | If we are using cli we already used the binary so there is no need to check if the file exists. Commits ------- 7a04976 Fixes #26563 (open_basedir restriction in effect)
diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php
@@ -44,7 +44,7 @@ public function find($includeArgs = true)
         }
 
         // PHP_BINARY return the current sapi executable
-        if (defined('PHP_BINARY') && PHP_BINARY && in_array(PHP_SAPI, array('cli', 'cli-server', 'phpdbg')) && is_file(PHP_BINARY)) {
+        if (defined('PHP_BINARY') && PHP_BINARY && in_array(PHP_SAPI, array('cli', 'cli-server', 'phpdbg'))) {
             return PHP_BINARY.$args;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function find($includeArgs = true)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// PHP_BINARY return the current sapi executable`
`47`		`- if (defined('PHP_BINARY') && PHP_BINARY && in_array(PHP_SAPI, array('cli', 'cli-server', 'phpdbg')) && is_file(PHP_BINARY)) {`
	`47`	`+ if (defined('PHP_BINARY') && PHP_BINARY && in_array(PHP_SAPI, array('cli', 'cli-server', 'phpdbg'))) {`
`48`	`48`	`return PHP_BINARY.$args;`
`49`	`49`	`}`
`50`	`50`