diff --git a/src/Composer/Script/EventDispatcher.php b/src/Composer/Script/EventDispatcher.php index 820675b8a..c2248b190 100644 --- a/src/Composer/Script/EventDispatcher.php +++ b/src/Composer/Script/EventDispatcher.php @@ -88,7 +88,15 @@ class EventDispatcher throw new \UnexpectedValueException('Method '.$callable.' is not callable, can not call '.$event->getName().' script'); } - $className::$methodName($event); + try { + $className::$methodName($event); + } catch (\Exception $e) { + $message = "%s terminated with an exception.\n[%s] %s"; + throw new \RuntimeException(sprintf($message, + $callable, + get_class($e), + $e->getMessage())); + } } } diff --git a/tests/Composer/Test/Script/EventDispatcherTest.php b/tests/Composer/Test/Script/EventDispatcherTest.php new file mode 100644 index 000000000..724eb182d --- /dev/null +++ b/tests/Composer/Test/Script/EventDispatcherTest.php @@ -0,0 +1,62 @@ + + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Composer\Test\Script; + +use Composer\Test\TestCase; +use Composer\Script\Event; +use Composer\Script\EventDispatcher; + +/** + * Event Dispatcher Test Case + * + * @group event-dispatcher + * @ticket #693 + * @author Andrea Turso + */ +class EventDispatcherTest extends TestCase +{ + /** + * Test the doDispatch method properly catches any exception + * thrown from the listener invocation, i.e., $className::$methodName($event), + * and replaces it with a \RuntimeException. + * + * @expectedException \RuntimeException + */ + public function testListenerExceptionsAreSuppressed() + { + $dispatcher = $this->getDispatcherStubForListenersTest(array( + "Composer\Test\Script\EventDispatcherTest::call" + )); + $dispatcher->dispatchCommandEvent("post-install-cmd"); + } + + private function getDispatcherStubForListenersTest($listeners) + { + $dispatcher = $this->getMockBuilder('Composer\Script\EventDispatcher') + ->setConstructorArgs(array( + $this->getMock('Composer\Composer'), + $this->getMock('Composer\IO\IOInterface'))) + ->setMethods(array('getListeners')) + ->getMock(); + + $dispatcher->expects($this->atLeastOnce()) + ->method('getListeners') + ->will($this->returnValue($listeners)); + + return $dispatcher; + } + + public static function call() + { + throw new \Exception(); + } +} \ No newline at end of file