fixed merge

Author: fabpot

src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php

@@ -127,11 +127,13 @@ public function testGetCalledListeners($isWrapped)
  $this->assertArrayHasKey('data', $listeners['foo.closure']);
  unset($listeners['foo.closure']['data']);
  $this->assertEquals(array(), $tdispatcher->getCalledListeners());
- $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure', 'priority' => 5)), $tdispatcher->getNotCalledListeners());
+ $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'pretty' => 'closure', 'priority' => 5)), $listeners);
 
  $tdispatcher->dispatch('foo');
 
- $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure', 'priority' => 5)), $tdispatcher->getCalledListeners());
+ $listeners = $tdispatcher->getCalledListeners();
+ unset($listeners['foo.closure']['data']);
+ $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'pretty' => 'closure', 'priority' => 5)), $listeners);
  $this->assertEquals(array(), $tdispatcher->getNotCalledListeners());
  }