diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Process] Add extra dirs argument to the executable finder to allow searching more dirs

Browse Source
This commit is contained in:
Jordi Boggiano 2012-07-03 18:19:03 +02:00
parent 2335dd0d60
commit 56f473a073
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Component/Process/ExecutableFinder.php
View File

@ -43,12 +43,13 @@ class ExecutableFinder
/** /**
* Finds an executable by name. * Finds an executable by name.
* *
* @param string $name The executable name (without the extension) * @param string $name The executable name (without the extension)
* @param string $default The default to return if no executable is found * @param string $default The default to return if no executable is found
* @param array $extraDirs Additional dirs to check into
* *
* @return string The executable path or default value * @return string The executable path or default value
*/ */
public function find($name, $default = null) public function find($name, $default = null, array $extraDirs = array())
{ {
if (ini_get('open_basedir')) { if (ini_get('open_basedir')) {
$searchPath = explode(PATH_SEPARATOR, getenv('open_basedir')); $searchPath = explode(PATH_SEPARATOR, getenv('open_basedir'));
@ -64,7 +65,10 @@ class ExecutableFinder
} }
} }
} else { } else {
$dirs = explode(PATH_SEPARATOR, getenv('PATH') ? getenv('PATH') : getenv('Path')); $dirs = array_merge(
explode(PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')),
$extraDirs
);
} }
$suffixes = DIRECTORY_SEPARATOR == '\\' ? (getenv('PATHEXT') ? explode(PATH_SEPARATOR, getenv('PATHEXT')) : $this->suffixes) : array(''); $suffixes = DIRECTORY_SEPARATOR == '\\' ? (getenv('PATHEXT') ? explode(PATH_SEPARATOR, getenv('PATHEXT')) : $this->suffixes) : array('');