Merge remote-tracking branch 'Sweetchuck/i9703-event-dispatcher-last-winner'

4 years ago · 2597e195ef
parent d855986c39 360966dcdf
commit 2597e195ef
1 changed files with 5 additions and 2 deletions
--- a/src/Composer/EventDispatcher/EventDispatcher.php
+++ b/src/Composer/EventDispatcher/EventDispatcher.php
@ -157,8 +157,9 @@ class EventDispatcher

        $this->pushEvent($event);

-        $return = 0;
+        $returnMax = 0;
        foreach ($listeners as $callable) {
+            $return = 0;
            $this->ensureBinDirIsInPath();

            if (!is_string($callable)) {
@ -287,6 +288,8 @@ class EventDispatcher
                }
            }

+            $returnMax = max($returnMax, $return);
+
            if ($event->isPropagationStopped()) {
                break;
            }
@ -294,7 +297,7 @@ class EventDispatcher

        $this->popEvent();

-        return $return;
+        return $returnMax;
    }

    protected function executeTty($exec)