public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Always set bin-dir into PATH before calling scripts, fixes #4852, closes #4898

pull/4898/merge
Jordi Boggiano 2016-02-10 14:10:52 +00:00
parent 6eb50623e6
commit 2609cfdd1d
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Composer/Command/RunScriptCommand.php
View File

@ -84,13 +84,6 @@ EOT
throw new \InvalidArgumentException(sprintf('Script "%s" is not defined in this package', $script)); throw new \InvalidArgumentException(sprintf('Script "%s" is not defined in this package', $script));
} }
// add the bin dir to the PATH to make local binaries of deps usable in scripts
$binDir = $composer->getConfig()->get('bin-dir');
if (is_dir($binDir)) {
$_SERVER['PATH'] = realpath($binDir).PATH_SEPARATOR.getenv('PATH');
putenv('PATH='.$_SERVER['PATH']);
}
$args = $input->getArgument('args'); $args = $input->getArgument('args');
return $composer->getEventDispatcher()->dispatchScript($script, $input->getOption('dev') || !$input->getOption('no-dev'), $args); return $composer->getEventDispatcher()->dispatchScript($script, $input->getOption('dev') || !$input->getOption('no-dev'), $args);

7
src/Composer/Command/ScriptAliasCommand.php
View File

@ -54,13 +54,6 @@ EOT
{ {
$composer = $this->getComposer(); $composer = $this->getComposer();
// add the bin dir to the PATH to make local binaries of deps usable in scripts
$binDir = $composer->getConfig()->get('bin-dir');
if (is_dir($binDir)) {
$_SERVER['PATH'] = realpath($binDir).PATH_SEPARATOR.getenv('PATH');
putenv('PATH='.$_SERVER['PATH']);
}
$args = $input->getArguments(); $args = $input->getArguments();
return $composer->getEventDispatcher()->dispatchScript($this->script, $input->getOption('dev') || !$input->getOption('no-dev'), $args['args']); return $composer->getEventDispatcher()->dispatchScript($this->script, $input->getOption('dev') || !$input->getOption('no-dev'), $args['args']);

10
src/Composer/EventDispatcher/EventDispatcher.php
View File

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