[EventDispatcher] Unwrap wrapped listeners internally

ro0NL · ro0NL · commit 34194e3ebe9b · 2018-11-24T14:14:57.000+01:00
diff --git a/Debug/TraceableEventDispatcher.php b/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);`