Merge branch 'event-manager' into experimental

src/Symfony/Bundle/FrameworkBundle/Debug/TraceableEventManager.php

@@ -48,7 +48,7 @@ class TraceableEventDispatcher extends ContainerAwareEventDispatcher implements
     {
         parent::triggerListener($listener, $eventName, $event);
 
-        $listenerString = $this->listenerToString($listener);
+        $listenerString = $this->listenerToString($listener, $eventName);
 
         if (null !== $this->logger) {
             $this->logger->debug(sprintf('Notified event "%s" to listener "%s"', $eventName, $listenerString));
@@ -60,14 +60,14 @@ class TraceableEventDispatcher extends ContainerAwareEventDispatcher implements
         );
 
         if ($event->isPropagationStopped() && null !== $this->logger) {
-            $this->logger->debug(sprintf('Listener "%s" stopped propagation of the event "%s"', $this->listenerToString($listener), $eventName));
+            $this->logger->debug(sprintf('Listener "%s" stopped propagation of the event "%s"', $this->listenerToString($listener, $eventName), $eventName));
 
             $skippedListeners = $this->getListeners($eventName);
             $skipped = false;
 
             foreach ($skippedListeners as $skippedListener) {
                 if ($skipped) {
-                    $this->logger->debug(sprintf('Listener "%s" was not called for event "%s"', $this->listenerToString($skippedListener), $eventName));
+                    $this->logger->debug(sprintf('Listener "%s" was not called for event "%s"', $this->listenerToString($skippedListener, $eventName), $eventName));
                 }
 
                 if ($skippedListener === $listener) {
@@ -92,9 +92,9 @@ class TraceableEventDispatcher extends ContainerAwareEventDispatcher implements
     {
         $notCalled = array();
 
-        foreach (array_keys($this->listeners) as $name) {
+        foreach (array_keys($this->getListeners()) as $name) {
             foreach ($this->getListeners($name) as $listener) {
-                $listener = $this->listenerToString($listener);
+                $listener = $this->listenerToString($listener, $name);
 
                 if (!isset($this->called[$name.'.'.$listener])) {
                     $notCalled[] = array(

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -153,12 +153,12 @@ class FrameworkExtension extends Extension
             'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver',
             'Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller',
 
-            'Symfony\\Bundle\\FrameworkBundle\\ContainerAwareEventDispatcher',
-
             'Symfony\\Component\\EventDispatcher\\EventDispatcher',
             'Symfony\\Component\\EventDispatcher\\EventDispatcherInterface',
             'Symfony\\Component\\EventDispatcher\\Event',
             'Symfony\\Component\\EventDispatcher\\EventSubscriberInterface',
+
+            'Symfony\\Bundle\\FrameworkBundle\\ContainerAwareEventDispatcher',
         ));
     }
 

src/Symfony/Bundle/FrameworkBundle/Profiler/ProfilerListener.php

@@ -14,7 +14,7 @@ namespace Symfony\Bundle\FrameworkBundle\Profiler;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\Event\GetResponseFromExceptionEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpFoundation\RequestMatcherInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -61,9 +61,9 @@ class ProfilerListener
     /**
      * Handles the onCoreException event.
      *
-     * @param GetResponseFromExceptionEvent $event A GetResponseFromExceptionEvent instance
+     * @param GetResponseForExceptionEvent $event A GetResponseForExceptionEvent instance
      */
-    public function onCoreException(GetResponseFromExceptionEvent $event)
+    public function onCoreException(GetResponseForExceptionEvent $event)
     {
         if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
             return;
@@ -79,6 +79,8 @@ class ProfilerListener
      */
     public function filterCoreResponse(FilterResponseEvent $event)
     {
+        $response = $event->getResponse();
+
         if (null !== $this->matcher && !$this->matcher->matches($event->getRequest())) {
             return $response;
         }