From 9b85fd7b08d0d95235c7f1a1e5348e2ba873d1fb Mon Sep 17 00:00:00 2001 From: Ruud Kamphuis Date: Thu, 10 Jun 2021 11:34:42 +0200 Subject: [PATCH] Use `isMainRequest` when available Symfony 5.3 deprecates `isMasterRequest` in favor of `isMainRequest`. --- EventListener/ResponseStatusCodeListener.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/EventListener/ResponseStatusCodeListener.php b/EventListener/ResponseStatusCodeListener.php index 1f5280d95..751cfb155 100644 --- a/EventListener/ResponseStatusCodeListener.php +++ b/EventListener/ResponseStatusCodeListener.php @@ -15,6 +15,7 @@ use FOS\RestBundle\Util\ExceptionValueMap; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\Event\ExceptionEvent; +use Symfony\Component\HttpKernel\Event\KernelEvent; use Symfony\Component\HttpKernel\Event\ResponseEvent; use Symfony\Component\HttpKernel\KernelEvents; @@ -41,7 +42,7 @@ public static function getSubscribedEvents(): array public function getResponseStatusCodeFromThrowable(ExceptionEvent $event): void { - if (!$event->isMasterRequest()) { + if (!$this->isMainRequest($event)) { return; } @@ -60,7 +61,7 @@ public function getResponseStatusCodeFromThrowable(ExceptionEvent $event): void public function setResponseStatusCode(ResponseEvent $event): void { - if (!$event->isMasterRequest()) { + if (!$this->isMainRequest($event)) { return; } @@ -70,4 +71,13 @@ public function setResponseStatusCode(ResponseEvent $event): void $this->responseStatusCode = null; } } + + private function isMainRequest(KernelEvent $event): bool + { + if (method_exists($event, 'isMainRequest')) { + return $event->isMainRequest(); + } + + return $event->isMasterRequest(); + } }