bug #31012 [Process] Fix missing $extraDirs when open_basedir returns (arsonik)

fabpot · fabpot · commit 6a5eac71503f · 2019-04-08T18:14:55.000+02:00
This PR was submitted for the master branch but it was merged into the 3.4 branch instead (closes #31012). Discussion ---------- [Process] Fix missing $extraDirs when open_basedir returns | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? |no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #31010 | License | MIT Fix missing $extraDirs when open_basedir returns Commits ------- e238c89 Fix missing $extraDirs when open_basedir returns
diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php
@@ -51,7 +51,10 @@ public function addSuffix($suffix)
     public function find($name, $default = null, array $extraDirs = [])
     {
         if (ini_get('open_basedir')) {
-            $searchPath = explode(PATH_SEPARATOR, ini_get('open_basedir'));
+            $searchPath = array_merge(
+                explode(PATH_SEPARATOR, ini_get('open_basedir')),
+                $extraDirs
+            );
             $dirs = [];
             foreach ($searchPath as $path) {
                 // Silencing against https://bugs.php.net/69240
