preserve dispatch order

ro0NL · ro0NL · commit c737944e0c4d · 2018-11-25T14:07:11.000+01:00
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -36,7 +36,6 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface
     private $orphanedEvents;
     private $requestStack;
     private $currentRequestHash = '';
-    private $called;
 
     public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, LoggerInterface $logger = null, RequestStack $requestStack = null)
     {
@@ -309,6 +308,7 @@ private function preProcess($eventName)
             $this->wrappedListeners[$eventName][] = $wrappedListener;
             $this->dispatcher->removeListener($eventName, $listener);
             $this->dispatcher->addListener($eventName, $wrappedListener, $priority);
+            $this->callStack->attach($wrappedListener, array($eventName, $this->currentRequestHash));
         }
     }
 
@@ -333,8 +333,8 @@ private function postProcess($eventName)
                 if (null !== $this->logger) {
                     $this->logger->debug('Notified event "{event}" to listener "{listener}".', $context);
                 }
-
-                $this->callStack->attach($listener, array($eventName, $this->currentRequestHash));
+            } else {
+                $this->callStack->detach($listener);
             }
 
             if (null !== $this->logger && $skipped) {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface`
`36`	`36`	`private $orphanedEvents;`
`37`	`37`	`private $requestStack;`
`38`	`38`	`private $currentRequestHash = '';`
`39`		`- private $called;`
`40`	`39`
`41`	`40`	`public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, LoggerInterface $logger = null, RequestStack $requestStack = null)`
`42`	`41`	`{`
`@@ -309,6 +308,7 @@ private function preProcess($eventName)`
`309`	`308`	`$this->wrappedListeners[$eventName][] = $wrappedListener;`
`310`	`309`	`$this->dispatcher->removeListener($eventName, $listener);`
`311`	`310`	`$this->dispatcher->addListener($eventName, $wrappedListener, $priority);`
	`311`	`+ $this->callStack->attach($wrappedListener, array($eventName, $this->currentRequestHash));`
`312`	`312`	`}`
`313`	`313`	`}`
`314`	`314`
`@@ -333,8 +333,8 @@ private function postProcess($eventName)`
`333`	`333`	`if (null !== $this->logger) {`
`334`	`334`	`$this->logger->debug('Notified event "{event}" to listener "{listener}".', $context);`
`335`	`335`	`}`
`336`		`-`
`337`		`- $this->callStack->attach($listener, array($eventName, $this->currentRequestHash));`
	`336`	`+ } else {`
	`337`	`+ $this->callStack->detach($listener);`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`if (null !== $this->logger && $skipped) {`