bug #29305 [EventDispatcher] Unwrap wrapped listeners internally (ro0NL)

fabpot · fabpot · commit 511b070ed6f5 · 2018-11-26T08:28:51.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [EventDispatcher] Unwrap wrapped listeners internally | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no  | Deprecations? | no | Tests pass? | yes  | Fixed tickets | partially #24275 | License | MIT | Doc PR | symfony/symfony-docs#...  I believe what happens is we re-register the listeners on the wrapped dispatcher, so in case of sub request we get those and wrap it again. The profiler seems to confirm this in case of an exception (default 404 here) and thus creates a sub-request. ## Before: (main request) No exception: (OK) ![image](https://user-images.githubusercontent.com/1047696/48968597-295ec180-eff2-11e8-982c-756e9019e107.png) Exception: (KO) ![image](https://user-images.githubusercontent.com/1047696/48968612-4abfad80-eff2-11e8-8556-37bfbd51bc3b.png) ## After (main request): No exception: same Exception: (OK) ![image](https://user-images.githubusercontent.com/1047696/48968636-9f632880-eff2-11e8-983e-b4099133600b.png) I haven't furhter investigated if we should split events per request as done in #23659 for logs. It seems somewhere we deduplicate events.. so im not sure the profiler actually shows correct data. Commits ------- 448e2e2 [EventDispatcher] Unwrap wrapped listeners internally
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -249,7 +249,7 @@ private function preProcess($eventName)
     {
         foreach ($this->dispatcher->getListeners($eventName) as $listener) {
             $priority = $this->getListenerPriority($eventName, $listener);
-            $wrappedListener = new WrappedListener($listener, null, $this->stopwatch, $this);
+            $wrappedListener = new WrappedListener($listener instanceof WrappedListener ? $listener->getWrappedListener() : $listener, null, $this->stopwatch, $this);
             $this->wrappedListeners[$eventName][] = $wrappedListener;
             $this->dispatcher->removeListener($eventName, $listener);
             $this->dispatcher->addListener($eventName, $wrappedListener, $priority);

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ private function preProcess($eventName)`
`249`	`249`	`{`
`250`	`250`	`foreach ($this->dispatcher->getListeners($eventName) as $listener) {`
`251`	`251`	`$priority = $this->getListenerPriority($eventName, $listener);`
`252`		`- $wrappedListener = new WrappedListener($listener, null, $this->stopwatch, $this);`
	`252`	`+ $wrappedListener = new WrappedListener($listener instanceof WrappedListener ? $listener->getWrappedListener() : $listener, null, $this->stopwatch, $this);`
`253`	`253`	`$this->wrappedListeners[$eventName][] = $wrappedListener;`
`254`	`254`	`$this->dispatcher->removeListener($eventName, $listener);`
`255`	`255`	`$this->dispatcher->addListener($eventName, $wrappedListener, $priority);`