Merge branch '3.4' into 4.2

fabpot · fabpot · commit 8cf39fb4ccff · 2019-04-10T18:20:36.000+02:00
* 3.4:
  Show more accurate message in profiler when missing stopwatch
  CS Fixes: Not double split with one array argument
  Remove redundant animation prefixes
  Remove redundant `box-sizing` prefixes
  Rework firewall access denied rule
  fixed CS
  Fix missing $extraDirs when open_basedir returns
diff --git a/ExecutableFinder.php b/ExecutableFinder.php
@@ -51,7 +51,7 @@ 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

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function addSuffix($suffix)`
`51`	`51`	`public function find($name, $default = null, array $extraDirs = [])`
`52`	`52`	`{`
`53`	`53`	`if (ini_get('open_basedir')) {`
`54`		`- $searchPath = explode(PATH_SEPARATOR, ini_get('open_basedir'));`
	`54`	`+ $searchPath = array_merge(explode(PATH_SEPARATOR, ini_get('open_basedir')), $extraDirs);`
`55`	`55`	`$dirs = [];`
`56`	`56`	`foreach ($searchPath as $path) {`
`57`	`57`	`// Silencing against https://bugs.php.net/69240`