comparison vendor/symfony/process/ExecutableFinder.php @ 18:af1871eacc83

Update to Drupal core 8.7.1
author Chris Cannam
date Thu, 09 May 2019 15:33:08 +0100
parents 129ea1e6d783
children
comparison
equal deleted inserted replaced
17:129ea1e6d783 18:af1871eacc83
49 * @return string|null The executable path or default value 49 * @return string|null The executable path or default value
50 */ 50 */
51 public function find($name, $default = null, array $extraDirs = []) 51 public function find($name, $default = null, array $extraDirs = [])
52 { 52 {
53 if (ini_get('open_basedir')) { 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 $dirs = []; 55 $dirs = [];
56 foreach ($searchPath as $path) { 56 foreach ($searchPath as $path) {
57 // Silencing against https://bugs.php.net/69240 57 // Silencing against https://bugs.php.net/69240
58 if (@is_dir($path)) { 58 if (@is_dir($path)) {
59 $dirs[] = $path; 59 $dirs[] = $path;