[HttpKernel] Strip exception file paths from log messages

ostrolucky · ostrolucky · commit 272c13e83a29 · 2023-08-01T17:37:30.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
@@ -90,7 +90,7 @@ public function logKernelException(ExceptionEvent $event)
 
         $e = FlattenException::createFromThrowable($throwable);
 
-        $this->logException($throwable, sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), $e->getFile(), $e->getLine()), $logLevel);
+        $this->logException($throwable, sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), basename($e->getFile()), $e->getLine()), $logLevel);
     }
 
     /**
@@ -118,7 +118,7 @@ public function onKernelException(ExceptionEvent $event)
         } catch (\Exception $e) {
             $f = FlattenException::createFromThrowable($e);
 
-            $this->logException($e, sprintf('Exception thrown when handling an exception (%s: %s at %s line %s)', $f->getClass(), $f->getMessage(), $e->getFile(), $e->getLine()));
+            $this->logException($e, sprintf('Exception thrown when handling an exception (%s: %s at %s line %s)', $f->getClass(), $f->getMessage(), basename($e->getFile()), $e->getLine()));
 
             $prev = $e;
             do {
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
@@ -96,7 +96,11 @@ public function testHandleWithLogger($event, $event2)
         }
 
         $this->assertEquals(3, $logger->countErrors());
-        $this->assertCount(3, $logger->getLogs('critical'));
+        $logs = $logger->getLogs('critical');
+        $this->assertCount(3, $logs);
+        $this->assertStringStartsWith('Uncaught PHP Exception Exception: "foo" at ErrorListenerTest.php line', $logs[0]);
+        $this->assertStringStartsWith('Uncaught PHP Exception Exception: "foo" at ErrorListenerTest.php line', $logs[1]);
+        $this->assertStringStartsWith('Exception thrown when handling an exception (RuntimeException: bar at ErrorListenerTest.php line', $logs[2]);
     }
 
     public function testHandleWithLoggerAndCustomConfiguration()

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,11 @@ public function testHandleWithLogger($event, $event2)`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`$this->assertEquals(3, $logger->countErrors());`
`99`		`- $this->assertCount(3, $logger->getLogs('critical'));`
	`99`	`+ $logs = $logger->getLogs('critical');`
	`100`	`+ $this->assertCount(3, $logs);`
	`101`	`+ $this->assertStringStartsWith('Uncaught PHP Exception Exception: "foo" at ErrorListenerTest.php line', $logs[0]);`
	`102`	`+ $this->assertStringStartsWith('Uncaught PHP Exception Exception: "foo" at ErrorListenerTest.php line', $logs[1]);`
	`103`	`+ $this->assertStringStartsWith('Exception thrown when handling an exception (RuntimeException: bar at ErrorListenerTest.php line', $logs[2]);`
`100`	`104`	`}`
`101`	`105`
`102`	`106`	`public function testHandleWithLoggerAndCustomConfiguration()`