1
0
Fork 0

Wrapped the listener invocation a try/catch block that catches any

exception and throws a \RuntimeException.
Added a test case for the EventDispatcher.

Note:
In order to test the doDispatch method I had to use a stub EventDispatcher
with a getListeners that returned a preconfigured array. IMHO there should
be a way to inject the listeners into the EventDispatcher.
pull/699/head
Andrea Turso 2012-05-15 21:25:18 +01:00
parent 1a255420b0
commit f626ccbcee
2 changed files with 63 additions and 1 deletions

View File

@ -91,7 +91,11 @@ class EventDispatcher
throw new \UnexpectedValueException('Method '.$callable.' is not callable, can not call '.$event->getName().' script'); throw new \UnexpectedValueException('Method '.$callable.' is not callable, can not call '.$event->getName().' script');
} }
try {
$className::$methodName($event); $className::$methodName($event);
} catch (\Exception $e) {
throw new \RuntimeException("'{$callable}' terminated with an exception.");
}
} }
} }

View File

@ -0,0 +1,58 @@
<?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Composer\Test\Script;
use Exception;
use Composer\Test\TestCase;
use Composer\Script\Event;
use Composer\Script\EventDispatcher;
/**
*
* @group
* @ticket #693
* @author Andrea Turso <turso@officinesoftware.co.uk>
*/
class EventDispatcherTest extends TestCase
{
/**
* @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();
}
}