[HttpKernel] Decouple exception logging from rendering

ro0NL · ro0NL · commit a203d31838b9 · 2017-12-06T19:15:30.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+4.1.0
+-----
+
+ * `ExceptionListener` now logs and collects exceptions at priority `2048` (previously logged at `-128` and collected at `0`)
+
 4.0.0
 -----
 
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
@@ -37,14 +37,17 @@ public function __construct($controller, LoggerInterface $logger = null)
         $this->logger = $logger;
     }
 
-    public function onKernelException(GetResponseForExceptionEvent $event)
+    public function logKernelException(GetResponseForExceptionEvent $event)
     {
         $exception = $event->getException();
-        $request = $event->getRequest();
 
         $this->logException($exception, sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', get_class($exception), $exception->getMessage(), $exception->getFile(), $exception->getLine()));
+    }
 
-        $request = $this->duplicateRequest($exception, $request);
+    public function onKernelException(GetResponseForExceptionEvent $event)
+    {
+        $exception = $event->getException();
+        $request = $this->duplicateRequest($exception, $event->getRequest());
 
         try {
             $response = $event->getKernel()->handle($request, HttpKernelInterface::SUB_REQUEST, false);
@@ -72,7 +75,10 @@ public function onKernelException(GetResponseForExceptionEvent $event)
     public static function getSubscribedEvents()
     {
         return array(
-            KernelEvents::EXCEPTION => array('onKernelException', -128),
+            KernelEvents::EXCEPTION => array(
+                array('logKernelException', 2048),
+                array('onKernelException', -128),
+            ),
         );
     }
 
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
@@ -121,7 +121,7 @@ public static function getSubscribedEvents()
     {
         return array(
             KernelEvents::RESPONSE => array('onKernelResponse', -100),
-            KernelEvents::EXCEPTION => 'onKernelException',
+            KernelEvents::EXCEPTION => array('onKernelException', 2048),
             KernelEvents::TERMINATE => array('onKernelTerminate', -1024),
         );
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php
@@ -51,11 +51,13 @@ public function testHandleWithoutLogger($event, $event2)
         $this->iniSet('error_log', file_exists('/dev/null') ? '/dev/null' : 'nul');
 
         $l = new ExceptionListener('foo');
+        $l->logKernelException($event);
         $l->onKernelException($event);
 
         $this->assertEquals(new Response('foo'), $event->getResponse());
 
         try {
+            $l->logKernelException($event2);
             $l->onKernelException($event2);
             $this->fail('RuntimeException expected');
         } catch (\RuntimeException $e) {
@@ -72,11 +74,13 @@ public function testHandleWithLogger($event, $event2)
         $logger = new TestLogger();
 
         $l = new ExceptionListener('foo', $logger);
+        $l->logKernelException($event);
         $l->onKernelException($event);
 
         $this->assertEquals(new Response('foo'), $event->getResponse());
 
         try {
+            $l->logKernelException($event2);
             $l->onKernelException($event2);
             $this->fail('RuntimeException expected');
         } catch (\RuntimeException $e) {

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public static function getSubscribedEvents()`
`121`	`121`	`{`
`122`	`122`	`return array(`
`123`	`123`	`KernelEvents::RESPONSE => array('onKernelResponse', -100),`
`124`		`- KernelEvents::EXCEPTION => 'onKernelException',`
	`124`	`+ KernelEvents::EXCEPTION => array('onKernelException', 2048),`
`125`	`125`	`KernelEvents::TERMINATE => array('onKernelTerminate', -1024),`
`126`	`126`	`);`
`127`	`127`	`}`