Merge branch '4.4' into 5.0

* 4.4:
  [Security/Http] fix merge
  [ErrorHandler] fix setting $trace to null in FatalError

Author: nicolas-grekas

Firewall/ExceptionListener.php

@@ -183,7 +183,7 @@ private function handleAccessDeniedException(ExceptionEvent $event, AccessDenied
 
     private function handleLogoutException(ExceptionEvent $event, LogoutException $exception): void
     {
-        $event->setException(new AccessDeniedHttpException($exception->getMessage(), $exception));
+        $event->setThrowable(new AccessDeniedHttpException($exception->getMessage(), $exception));
 
         if (null !== $this->logger) {
             $this->logger->info('A LogoutException was thrown; wrapping with AccessDeniedHttpException', ['exception' => $exception]);

Tests/Firewall/ExceptionListenerTest.php

@@ -165,8 +165,8 @@ public function testLogoutException()
         $listener = $this->createExceptionListener();
         $listener->onKernelException($event);
 
-        $this->assertEquals('Invalid CSRF.', $event->getException()->getMessage());
-        $this->assertEquals(403, $event->getException()->getStatusCode());
+        $this->assertEquals('Invalid CSRF.', $event->getThrowable()->getMessage());
+        $this->assertEquals(403, $event->getThrowable()->getStatusCode());
     }
 
     public function getAccessDeniedExceptionProvider()