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

show command by default

pull/4123/head
Rob Bast 2015-06-09 13:40:13 +02:00
parent cbd61660ab
commit 9223f4a208
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,9 +172,7 @@ class EventDispatcher
} else { } else {
$args = implode(' ', array_map(array('Composer\Util\ProcessExecutor', 'escape'), $event->getArguments())); $args = implode(' ', array_map(array('Composer\Util\ProcessExecutor', 'escape'), $event->getArguments()));
$exec = $callable . ($args === '' ? '' : ' '.$args); $exec = $callable . ($args === '' ? '' : ' '.$args);
if ($this->io->isVerbose()) {
$this->io->writeError(sprintf('> %s', $exec)); $this->io->writeError(sprintf('> %s', $exec));
}
if (0 !== ($exitCode = $this->process->execute($exec))) { if (0 !== ($exitCode = $this->process->execute($exec))) {
$this->io->writeError(sprintf('<error>Script %s handling the %s event returned with an error</error>', $callable, $event->getName())); $this->io->writeError(sprintf('<error>Script %s handling the %s event returned with an error</error>', $callable, $event->getName()));

12
tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
View File

@ -150,7 +150,7 @@ class EventDispatcherTest extends TestCase
); );
} }
public function testDispatcherOutputsCommandsInVerboseMode() public function testDispatcherOutputsCommand()
{ {
$dispatcher = $this->getMockBuilder('Composer\EventDispatcher\EventDispatcher') $dispatcher = $this->getMockBuilder('Composer\EventDispatcher\EventDispatcher')
->setConstructorArgs(array( ->setConstructorArgs(array(
@ -166,10 +166,6 @@ class EventDispatcherTest extends TestCase
->method('getListeners') ->method('getListeners')
->will($this->returnValue($listener)); ->will($this->returnValue($listener));
$io->expects($this->once())
->method('isVerbose')
->willReturn(true);
$io->expects($this->once()) $io->expects($this->once())
->method('writeError') ->method('writeError')
->with($this->equalTo('> echo foo')); ->with($this->equalTo('> echo foo'));
@ -196,7 +192,11 @@ class EventDispatcherTest extends TestCase
->method('getListeners') ->method('getListeners')
->will($this->returnValue($listener)); ->will($this->returnValue($listener));
$io->expects($this->once()) $io->expects($this->at(0))
->method('writeError')
->willReturn('> exit 1');
$io->expects($this->at(1))
->method('writeError') ->method('writeError')
->with($this->equalTo('<error>Script '.$code.' handling the post-install-cmd event returned with an error</error>')); ->with($this->equalTo('<error>Script '.$code.' handling the post-install-cmd event returned with an error</error>'));