public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Tweak output of calls to script references, refs #4592

pull/4616/head
Jordi Boggiano 2015-11-14 13:52:26 +00:00
parent db5ef12540
commit 24ccaa328d
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/EventDispatcher/EventDispatcher.php
View File

@ -157,8 +157,6 @@ class EventDispatcher
} elseif ($this->isComposerScript($callable)) { } elseif ($this->isComposerScript($callable)) {
if ($this->io->isVerbose()) { if ($this->io->isVerbose()) {
$this->io->writeError(sprintf('> %s: %s', $event->getName(), $callable)); $this->io->writeError(sprintf('> %s: %s', $event->getName(), $callable));
} else {
$this->io->writeError(sprintf('> %s', $callable));
} }
$scriptName = substr($callable, 1); $scriptName = substr($callable, 1);
$return = $this->dispatch($scriptName, new Script\Event($scriptName, $event->getComposer(), $event->getIO(), $event->isDevMode())); $return = $this->dispatch($scriptName, new Script\Event($scriptName, $event->getComposer(), $event->getIO(), $event->isDevMode()));
@ -399,7 +397,7 @@ class EventDispatcher
{ {
$eventName = $event->getName(); $eventName = $event->getName();
if (in_array($eventName, $this->eventStack)) { if (in_array($eventName, $this->eventStack)) {
throw new \RuntimeException(sprintf("Recursive call to '%s' detected", $eventName)); throw new \RuntimeException(sprintf("Circular call to script handler '%s' detected", $eventName));
} }
return array_push($this->eventStack, $eventName); return array_push($this->eventStack, $eventName);