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

Simplify exec implementation and add full PATH support, refs #4887

pull/4962/head
Jordi Boggiano 2016-02-25 12:14:50 +00:00
parent f4f66be6f6
commit 934be204a2
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Composer/Command/ExecCommand.php
View File

@ -20,7 +20,7 @@ use Symfony\Component\Console\Input\InputArgument;
/** /**
* @author Davey Shafik <me@daveyshafik.com> * @author Davey Shafik <me@daveyshafik.com>
*/ */
class ExecCommand extends Command class ExecCommand extends BaseCommand
{ {
protected function configure() protected function configure()
{ {
@ -41,8 +41,9 @@ class ExecCommand extends Command
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$binDir = $this->getComposer()->getConfig()->get('bin-dir'); $composer = $this->getComposer();
if ($input->hasArgument('list') || !$input->hasArgument('script') || !$input->getArgument('script')) { $binDir = $composer->getConfig()->get('bin-dir');
if ($input->getOption('list') || !$input->getArgument('script')) {
$bins = glob($binDir . '/*'); $bins = glob($binDir . '/*');
if (!$bins) { if (!$bins) {
@ -55,6 +56,12 @@ EOT
); );
foreach ($bins as $bin) { foreach ($bins as $bin) {
// skip .bat copies
if (isset($previousBin) && $bin === $previousBin.'.bat') {
continue;
}
$previousBin = $bin;
$bin = basename($bin); $bin = basename($bin);
$this->getIO()->write(<<<EOT $this->getIO()->write(<<<EOT
<info>- $bin</info> <info>- $bin</info>
@ -66,19 +73,13 @@ EOT
} }
$script = $input->getArgument('script'); $script = $input->getArgument('script');
if (!file_exists($binDir . '/' . $script)) {
throw new \RuntimeException("script '$script' not found in bin-dir ($binDir)"); $dispatcher = $composer->getEventDispatcher();
$dispatcher->addListener('__exec_command', $script);
if ($output->getVerbosity() === OutputInterface::VERBOSITY_NORMAL) {
$output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
} }
if ($args = $input->getArgument('args')) { return $dispatcher->dispatchScript('__exec_command', true, $input->getArgument('args'));
$args = " " . implode(" ", $args);
}
$this->getIO()->write(<<<EOT
<comment>Executing $script$args:</comment>
EOT
);
passthru($binDir . '/' . $script . $args);
} }
} }

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

@ -284,7 +284,7 @@ class EventDispatcher
* @param Callable $listener A callable expecting an event argument * @param Callable $listener A callable expecting an event argument
* @param int $priority A higher value represents a higher priority * @param int $priority A higher value represents a higher priority
*/ */
protected function addListener($eventName, $listener, $priority = 0) public function addListener($eventName, $listener, $priority = 0)
{ {
$this->listeners[$eventName][$priority][] = $listener; $this->listeners[$eventName][$priority][] = $listener;
} }