bug #27141 [Process] Suppress warnings when open_basedir is non-empty (cbj4074)

nicolas-grekas · nicolas-grekas · commit b7feafcf5822 · 2018-05-15T10:20:41.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [Process] Suppress warnings when open_basedir is non-empty | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | If PHP is configured *with a non-empty open_basedir* value that does not permit access to the target location, these calls to is_executable() throw warnings. While Symfony may not raise exceptions for warnings in production environments, other frameworks (such as Laravel) do, in which case any of these checks causes a show-stopping 500 error. We fixed a similar issue in the ExecutableFinder class via #16182 . This has always been an issue, but symfony/process@709e15e made it more likely that a warning is triggered. Commits ------- 34f136e Suppress warnings when open_basedir is non-empty
diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php
@@ -77,7 +77,7 @@ public function find($name, $default = null, array $extraDirs = array())
         }
         foreach ($suffixes as $suffix) {
             foreach ($dirs as $dir) {
-                if (@is_file($file = $dir.DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === DIRECTORY_SEPARATOR || is_executable($file))) {
+                if (@is_file($file = $dir.DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === DIRECTORY_SEPARATOR || @is_executable($file))) {
                     return $file;
                 }
             }
diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php
@@ -49,20 +49,20 @@ public function find($includeArgs = true)
         }
 
         if ($php = getenv('PHP_PATH')) {
-            if (!is_executable($php)) {
+            if (!@is_executable($php)) {
                 return false;
             }
 
             return $php;
         }
 
         if ($php = getenv('PHP_PEAR_PHP_BIN')) {
-            if (is_executable($php)) {
+            if (@is_executable($php)) {
                 return $php;
             }
         }
 
-        if (is_executable($php = PHP_BINDIR.('\\' === DIRECTORY_SEPARATOR ? '\\php.exe' : '/php'))) {
+        if (@is_executable($php = PHP_BINDIR.('\\' === DIRECTORY_SEPARATOR ? '\\php.exe' : '/php'))) {
             return $php;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function find($name, $default = null, array $extraDirs = array())`
`77`	`77`	`}`
`78`	`78`	`foreach ($suffixes as $suffix) {`
`79`	`79`	`foreach ($dirs as $dir) {`
`80`		`- if (@is_file($file = $dir.DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === DIRECTORY_SEPARATOR \|\| is_executable($file))) {`
	`80`	`+ if (@is_file($file = $dir.DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === DIRECTORY_SEPARATOR \|\| @is_executable($file))) {`
`81`	`81`	`return $file;`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,20 +49,20 @@ public function find($includeArgs = true)`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`if ($php = getenv('PHP_PATH')) {`
`52`		`- if (!is_executable($php)) {`
	`52`	`+ if (!@is_executable($php)) {`
`53`	`53`	`return false;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`return $php;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if ($php = getenv('PHP_PEAR_PHP_BIN')) {`
`60`		`- if (is_executable($php)) {`
	`60`	`+ if (@is_executable($php)) {`
`61`	`61`	`return $php;`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- if (is_executable($php = PHP_BINDIR.('\\' === DIRECTORY_SEPARATOR ? '\\php.exe' : '/php'))) {`
	`65`	`+ if (@is_executable($php = PHP_BINDIR.('\\' === DIRECTORY_SEPARATOR ? '\\php.exe' : '/php'))) {`
`66`	`66`	`return $php;`
`67`	`67`	`}`
`68`	`68`