diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php
index f392c962e3130..c4b201a40f397 100644
--- a/src/Symfony/Component/Process/ExecutableFinder.php
+++ b/src/Symfony/Component/Process/ExecutableFinder.php
@@ -48,9 +48,13 @@ public function addSuffix(string $suffix)
*/
public function find(string $name, ?string $default = null, array $extraDirs = [])
{
- if (\ini_get('open_basedir')) {
- $searchPath = array_merge(explode(\PATH_SEPARATOR, \ini_get('open_basedir')), $extraDirs);
- $dirs = [];
+ $dirs = array_merge(
+ explode(\PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')),
+ $extraDirs
+ );
+
+ if ($openBaseDir = \ini_get('open_basedir')) {
+ $searchPath = explode(\PATH_SEPARATOR, $openBaseDir);
foreach ($searchPath as $path) {
// Silencing against https://bugs.php.net/69240
if (@is_dir($path)) {
@@ -61,11 +65,6 @@ public function find(string $name, ?string $default = null, array $extraDirs = [
}
}
}
- } else {
- $dirs = array_merge(
- explode(\PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')),
- $extraDirs
- );
}
$suffixes = [''];
@@ -74,7 +73,7 @@ public function find(string $name, ?string $default = null, array $extraDirs = [
$suffixes = array_merge($pathExt ? explode(\PATH_SEPARATOR, $pathExt) : $this->suffixes, $suffixes);
}
foreach ($suffixes as $suffix) {
- foreach ($dirs as $dir) {
+ foreach (array_unique($dirs) as $dir) {
if (@is_file($file = $dir.\DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === \DIRECTORY_SEPARATOR || @is_executable($file))) {
return $file;
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy