Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for composer/composer#3382 #3544

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 29 additions & 0 deletions src/Composer/EventDispatcher/EventDispatcher.php
Expand Up @@ -155,6 +155,7 @@ protected function doDispatch(Event $event)
$return = 0;
foreach ($listeners as $callable) {
if (!is_string($callable) && is_callable($callable)) {
$event = $this->checkListenerExpectedEvent($callable, $event);
$return = false === call_user_func($callable, $event) ? 1 : 0;
} elseif ($this->isPhpScript($callable)) {
$className = substr($callable, 0, strpos($callable, '::'));
Expand Down Expand Up @@ -200,9 +201,37 @@ protected function doDispatch(Event $event)
*/
protected function executeEventPhpScript($className, $methodName, Event $event)
{
$event = $this->checkListenerExpectedEvent(array($className, $methodName), $event);

return $className::$methodName($event);
}

/**
* @param mixed $target
* @param Event $event
* @return Event|CommandEvent
*/
protected function checkListenerExpectedEvent($target, Event $event)
{
if (!$event instanceof Script\Event) {
return $event;
}

try {
$reflected = new \ReflectionParameter($target, 0);
} catch (\ReflectionException $e) {
return $event;
}

$expected = $reflected->getClass()->name;

if (!$event instanceof $expected && $expected === 'Composer\Script\CommandEvent') {
$event = new CommandEvent($event->getName(), $event->getComposer(), $event->getIO(), $event->isDevMode(), $event->getArguments());
}

return $event;
}

/**
* Add a listener for a particular event
*
Expand Down
16 changes: 16 additions & 0 deletions tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
Expand Up @@ -17,6 +17,7 @@
use Composer\Installer\InstallerEvents;
use Composer\TestCase;
use Composer\Script\ScriptEvents;
use Composer\Script\CommandEvent;
use Composer\Util\ProcessExecutor;

class EventDispatcherTest extends TestCase
Expand All @@ -38,6 +39,16 @@ public function testListenerExceptionsAreCaught()
$dispatcher->dispatchCommandEvent(ScriptEvents::POST_INSTALL_CMD, false);
}

public function testDispatcherCanConvertScriptEventToCommandEventForListener()
{
$io = $this->getMock('Composer\IO\IOInterface');
$dispatcher = $this->getDispatcherStubForListenersTest(array(
"Composer\Test\EventDispatcher\EventDispatcherTest::convertEvent"
), $io);

$this->assertEquals(1, $dispatcher->dispatchScript(ScriptEvents::POST_INSTALL_CMD, false));
}

/**
* @dataProvider getValidCommands
* @param string $command
Expand Down Expand Up @@ -205,6 +216,11 @@ public static function call()
throw new \RuntimeException();
}

public static function convertEvent(CommandEvent $event)
{
return false;
}

public static function someMethod()
{
return true;
Expand Down