1
0
Fork 0

fix path info

pull/5114/head
nishiyama 2016-03-25 20:04:43 +09:00
parent 0a8528c5c7
commit 8b221905ca
1 changed files with 8 additions and 3 deletions

View File

@ -145,13 +145,18 @@ class EventDispatcher
*/ */
protected function doDispatch(Event $event) protected function doDispatch(Event $event)
{ {
$pathStr = 'PATH';
if (!isset($_SERVER[$pathStr])) {
$pathStr = 'Path';
}
// add the bin dir to the PATH to make local binaries of deps usable in scripts // add the bin dir to the PATH to make local binaries of deps usable in scripts
$binDir = $this->composer->getConfig()->get('bin-dir'); $binDir = $this->composer->getConfig()->get('bin-dir');
if (is_dir($binDir)) { if (is_dir($binDir)) {
$binDir = realpath($binDir); $binDir = realpath($binDir);
if (isset($_SERVER['PATH']) && !preg_match('{(^|'.PATH_SEPARATOR.')'.preg_quote($binDir).'($|'.PATH_SEPARATOR.')}', $_SERVER['PATH'])) { if (isset($_SERVER[$pathStr]) && !preg_match('{(^|'.PATH_SEPARATOR.')'.preg_quote($binDir).'($|'.PATH_SEPARATOR.')}', $_SERVER[$pathStr])) {
$_SERVER['PATH'] = $binDir.PATH_SEPARATOR.getenv('PATH'); $_SERVER[$pathStr] = $binDir.PATH_SEPARATOR.getenv($pathStr);
putenv('PATH='.$_SERVER['PATH']); putenv($pathStr.'='.$_SERVER[$pathStr]);
} }
} }