bug #18426 [EventDispatcher] Try first if the event is Stopped (lyrixx)

nicolas-grekas · nicolas-grekas · commit 18ddc88fb051 · 2016-04-04T18:56:17.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [EventDispatcher] Try first if the event is Stopped | Q | A | ------------- | --- | Branch? | 2.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - If you trigger 2 events with the same instance of Event and if a listener in the first dispatch stop the propagation, then the very first listener of the second dispatch is called. It should not IMHO. Commits ------- a30e166 [EventDispatcher] Try first if the event is Stopped
diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcher.php b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
@@ -155,10 +155,10 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)
     protected function doDispatch($listeners, $eventName, Event $event)
     {
         foreach ($listeners as $listener) {
-            call_user_func($listener, $event);
             if ($event->isPropagationStopped()) {
                 break;
             }
+            call_user_func($listener, $event);
         }
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
@@ -136,6 +136,10 @@ public function dispatch($eventName, Event $event = null)
             $event = new Event();
         }
 
+        if (null !== $this->logger && $event->isPropagationStopped()) {
+            $this->logger->debug(sprintf('The "%s" event is already stopped. No listeners have been called.', $eventName));
+        }
+
         $eventId = ++$this->lastEventId;
 
         $this->preDispatch($eventName, $eventId, $event);

Original file line number	Diff line number	Diff line change
`@@ -155,10 +155,10 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)`
`155`	`155`	`protected function doDispatch($listeners, $eventName, Event $event)`
`156`	`156`	`{`
`157`	`157`	`foreach ($listeners as $listener) {`
`158`		`- call_user_func($listener, $event);`
`159`	`158`	`if ($event->isPropagationStopped()) {`
`160`	`159`	`break;`
`161`	`160`	`}`
	`161`	`+ call_user_func($listener, $event);`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,10 @@ public function dispatch($eventName, Event $event = null)`
`136`	`136`	`$event = new Event();`
`137`	`137`	`}`
`138`	`138`
	`139`	`+ if (null !== $this->logger && $event->isPropagationStopped()) {`
	`140`	`+ $this->logger->debug(sprintf('The "%s" event is already stopped. No listeners have been called.', $eventName));`
	`141`	`+ }`
	`142`	`+`
`139`	`143`	`$eventId = ++$this->lastEventId;`
`140`	`144`
`141`	`145`	`$this->preDispatch($eventName, $eventId, $event);`