From 222ee004e0dc11ae299fd71bfd1bc1d672798959 Mon Sep 17 00:00:00 2001 From: Rob Bast Date: Tue, 9 Jun 2015 09:02:32 +0200 Subject: [PATCH 1/4] modified test case --- .../Test/EventDispatcher/EventDispatcherTest.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php b/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php index 06d9c652d..a40c6684d 100644 --- a/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php +++ b/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php @@ -150,12 +150,12 @@ class EventDispatcherTest extends TestCase ); } - public function testDispatcherOutputsCommands() + public function testDispatcherOutputsCommandsInVerboseMode() { $dispatcher = $this->getMockBuilder('Composer\EventDispatcher\EventDispatcher') ->setConstructorArgs(array( $this->getMock('Composer\Composer'), - $this->getMock('Composer\IO\IOInterface'), + $io = $this->getMock('Composer\IO\IOInterface'), new ProcessExecutor, )) ->setMethods(array('getListeners')) @@ -166,6 +166,14 @@ 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')); + ob_start(); $dispatcher->dispatchScript(ScriptEvents::POST_INSTALL_CMD, false); $this->assertEquals('foo', trim(ob_get_clean())); From cbd61660ab26201a2a3e2a4a54328b1b79c81a72 Mon Sep 17 00:00:00 2001 From: Rob Bast Date: Tue, 9 Jun 2015 09:02:43 +0200 Subject: [PATCH 2/4] implemented verbose output --- src/Composer/EventDispatcher/EventDispatcher.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Composer/EventDispatcher/EventDispatcher.php b/src/Composer/EventDispatcher/EventDispatcher.php index 3bb1c8496..e96d47a81 100644 --- a/src/Composer/EventDispatcher/EventDispatcher.php +++ b/src/Composer/EventDispatcher/EventDispatcher.php @@ -170,8 +170,12 @@ class EventDispatcher throw $e; } } else { - $args = implode(' ', array_map(array('Composer\Util\ProcessExecutor','escape'), $event->getArguments())); - if (0 !== ($exitCode = $this->process->execute($callable . ($args === '' ? '' : ' '.$args)))) { + $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)); + } + if (0 !== ($exitCode = $this->process->execute($exec))) { $this->io->writeError(sprintf('Script %s handling the %s event returned with an error', $callable, $event->getName())); throw new \RuntimeException('Error Output: '.$this->process->getErrorOutput(), $exitCode); From 9223f4a208213a1abde76fb5a6dcf8b403b9ab17 Mon Sep 17 00:00:00 2001 From: Rob Bast Date: Tue, 9 Jun 2015 13:40:13 +0200 Subject: [PATCH 3/4] 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')); From fd34c5883afa4e5c0eb6fa70746c4ba406bfcdd8 Mon Sep 17 00:00:00 2001 From: Rob Bast Date: Wed, 24 Jun 2015 09:21:36 +0200 Subject: [PATCH 4/4] added php script handler info as well --- .../EventDispatcher/EventDispatcher.php | 2 ++ .../EventDispatcher/EventDispatcherTest.php | 25 +++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/Composer/EventDispatcher/EventDispatcher.php b/src/Composer/EventDispatcher/EventDispatcher.php index 65d6ea700..7b70fb76c 100644 --- a/src/Composer/EventDispatcher/EventDispatcher.php +++ b/src/Composer/EventDispatcher/EventDispatcher.php @@ -197,6 +197,8 @@ class EventDispatcher { $event = $this->checkListenerExpectedEvent(array($className, $methodName), $event); + $this->io->writeError(sprintf('> %s::%s', $className, $methodName)); + return $className::$methodName($event); } diff --git a/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php b/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php index 9b5604591..973827cec 100644 --- a/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php +++ b/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php @@ -32,7 +32,11 @@ class EventDispatcherTest extends TestCase 'Composer\Test\EventDispatcher\EventDispatcherTest::call' ), $io); - $io->expects($this->once()) + $io->expects($this->at(0)) + ->method('writeError') + ->with('> Composer\Test\EventDispatcher\EventDispatcherTest::call'); + + $io->expects($this->at(1)) ->method('writeError') ->with('Script Composer\Test\EventDispatcher\EventDispatcherTest::call handling the post-install-cmd event terminated with an exception'); @@ -94,12 +98,11 @@ class EventDispatcherTest extends TestCase $dispatcher = $this->getMockBuilder('Composer\EventDispatcher\EventDispatcher') ->setConstructorArgs(array( $this->getMock('Composer\Composer'), - $this->getMock('Composer\IO\IOInterface'), + $io = $this->getMock('Composer\IO\IOInterface'), $process, )) ->setMethods(array( 'getListeners', - 'executeEventPhpScript', )) ->getMock(); @@ -112,14 +115,22 @@ class EventDispatcherTest extends TestCase 'Composer\\Test\\EventDispatcher\\EventDispatcherTest::someMethod', 'echo -n bar', ); + $dispatcher->expects($this->atLeastOnce()) ->method('getListeners') ->will($this->returnValue($listeners)); - $dispatcher->expects($this->once()) - ->method('executeEventPhpScript') - ->with('Composer\Test\EventDispatcher\EventDispatcherTest', 'someMethod') - ->will($this->returnValue(true)); + $io->expects($this->at(0)) + ->method('writeError') + ->with($this->equalTo('> echo -n foo')); + + $io->expects($this->at(1)) + ->method('writeError') + ->with($this->equalTo('> Composer\Test\EventDispatcher\EventDispatcherTest::someMethod')); + + $io->expects($this->at(2)) + ->method('writeError') + ->with($this->equalTo('> echo -n bar')); $dispatcher->dispatchScript(ScriptEvents::POST_INSTALL_CMD, false); }