[EventDispatcher] TraceableEventDispatcher resets listener priorities

c960657 · c960657 · commit 683169b86c2d · 2016-01-20T17:45:51.000+01:00
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -235,12 +235,12 @@ protected function postDispatch($eventName, Event $event)
     private function preProcess($eventName)
     {
         foreach ($this->dispatcher->getListeners($eventName) as $listener) {
-            $this->dispatcher->removeListener($eventName, $listener);
             $info = $this->getListenerInfo($listener, $eventName);
             $name = isset($info['class']) ? $info['class'] : $info['type'];
             $wrappedListener = new WrappedListener($listener, $name, $this->stopwatch, $this);
             $this->wrappedListeners[$eventName][] = $wrappedListener;
-            $this->dispatcher->addListener($eventName, $wrappedListener);
+            $this->dispatcher->removeListener($eventName, $listener);
+            $this->dispatcher->addListener($eventName, $wrappedListener, $info['priority']);
         }
     }
 
@@ -253,8 +253,9 @@ private function postProcess($eventName)
                 continue;
             }
             // Unwrap listener
+            $priority = $this->getListenerPriority($eventName, $listener);
             $this->dispatcher->removeListener($eventName, $listener);
-            $this->dispatcher->addListener($eventName, $listener->getWrappedListener());
+            $this->dispatcher->addListener($eventName, $listener->getWrappedListener(), $priority);
 
             $info = $this->getListenerInfo($listener->getWrappedListener(), $eventName);
             if ($listener->wasCalled()) {
diff --git a/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
@@ -56,6 +56,23 @@ public function testHasListeners()
         $this->assertTrue($tdispatcher->hasListeners('foo'));
     }
 
+    public function testGetListenerPriority()
+    {
+        $dispatcher = new EventDispatcher();
+        $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
+
+        $tdispatcher->addListener('foo', function () {}, 123);
+
+        $listeners = $dispatcher->getListeners('foo');
+        $this->assertSame(123, $tdispatcher->getListenerPriority('foo', $listeners[0]));
+
+        // Verify that priority is preserved when listener is removed and re-added
+        // in preProcess() and postProcess().
+        $tdispatcher->dispatch('foo', new Event());
+        $listeners = $dispatcher->getListeners('foo');
+        $this->assertSame(123, $tdispatcher->getListenerPriority('foo', $listeners[0]));
+    }
+
     public function testAddRemoveSubscriber()
     {
         $dispatcher = new EventDispatcher();
@@ -138,12 +155,12 @@ public function testDispatchCallListeners()
 
         $dispatcher = new EventDispatcher();
         $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
-        $tdispatcher->addListener('foo', $listener1 = function () use (&$called) { $called[] = 'foo1'; });
-        $tdispatcher->addListener('foo', $listener2 = function () use (&$called) { $called[] = 'foo2'; });
+        $tdispatcher->addListener('foo', $listener1 = function () use (&$called) { $called[] = 'foo1'; }, 10);
+        $tdispatcher->addListener('foo', $listener2 = function () use (&$called) { $called[] = 'foo2'; }, 20);
 
         $tdispatcher->dispatch('foo');
 
-        $this->assertEquals(array('foo1', 'foo2'), $called);
+        $this->assertSame(array('foo2', 'foo1'), $called);
     }
 
     public function testDispatchNested()

Original file line number	Diff line number	Diff line change
`@@ -235,12 +235,12 @@ protected function postDispatch($eventName, Event $event)`
`235`	`235`	`private function preProcess($eventName)`
`236`	`236`	`{`
`237`	`237`	`foreach ($this->dispatcher->getListeners($eventName) as $listener) {`
`238`		`- $this->dispatcher->removeListener($eventName, $listener);`
`239`	`238`	`$info = $this->getListenerInfo($listener, $eventName);`
`240`	`239`	`$name = isset($info['class']) ? $info['class'] : $info['type'];`
`241`	`240`	`$wrappedListener = new WrappedListener($listener, $name, $this->stopwatch, $this);`
`242`	`241`	`$this->wrappedListeners[$eventName][] = $wrappedListener;`
`243`		`- $this->dispatcher->addListener($eventName, $wrappedListener);`
	`242`	`+ $this->dispatcher->removeListener($eventName, $listener);`
	`243`	`+ $this->dispatcher->addListener($eventName, $wrappedListener, $info['priority']);`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`
`@@ -253,8 +253,9 @@ private function postProcess($eventName)`
`253`	`253`	`continue;`
`254`	`254`	`}`
`255`	`255`	`// Unwrap listener`
	`256`	`+ $priority = $this->getListenerPriority($eventName, $listener);`
`256`	`257`	`$this->dispatcher->removeListener($eventName, $listener);`
`257`		`- $this->dispatcher->addListener($eventName, $listener->getWrappedListener());`
	`258`	`+ $this->dispatcher->addListener($eventName, $listener->getWrappedListener(), $priority);`
`258`	`259`
`259`	`260`	`$info = $this->getListenerInfo($listener->getWrappedListener(), $eventName);`
`260`	`261`	`if ($listener->wasCalled()) {`