From 9223f4a208213a1abde76fb5a6dcf8b403b9ab17 Mon Sep 17 00:00:00 2001 From: Rob Bast Date: Tue, 9 Jun 2015 13:40:13 +0200 Subject: [PATCH] show command by default --- src/Composer/EventDispatcher/EventDispatcher.php | 4 +--- .../Test/EventDispatcher/EventDispatcherTest.php | 12 ++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Composer/EventDispatcher/EventDispatcher.php b/src/Composer/EventDispatcher/EventDispatcher.php index e96d47a81..65d6ea700 100644 --- a/src/Composer/EventDispatcher/EventDispatcher.php +++ b/src/Composer/EventDispatcher/EventDispatcher.php @@ -172,9 +172,7 @@ class EventDispatcher } else { $args = implode(' ', array_map(array('Composer\Util\ProcessExecutor', 'escape'), $event->getArguments())); $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))) { $this->io->writeError(sprintf('Script %s handling the %s event returned with an error', $callable, $event->getName())); diff --git a/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php b/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php index a40c6684d..9b5604591 100644 --- a/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php +++ b/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php @@ -150,7 +150,7 @@ class EventDispatcherTest extends TestCase ); } - public function testDispatcherOutputsCommandsInVerboseMode() + public function testDispatcherOutputsCommand() { $dispatcher = $this->getMockBuilder('Composer\EventDispatcher\EventDispatcher') ->setConstructorArgs(array( @@ -166,10 +166,6 @@ class EventDispatcherTest extends TestCase ->method('getListeners') ->will($this->returnValue($listener)); - $io->expects($this->once()) - ->method('isVerbose') - ->willReturn(true); - $io->expects($this->once()) ->method('writeError') ->with($this->equalTo('> echo foo')); @@ -196,7 +192,11 @@ class EventDispatcherTest extends TestCase ->method('getListeners') ->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') ->with($this->equalTo('Script '.$code.' handling the post-install-cmd event returned with an error'));