Merge pull request #111 from JordiDekker/bugfix/main-request

Symfony 6 compatability fix

Author: loevgaard

composer.json

@@ -16,6 +16,7 @@
         "doctrine/persistence": "^1.3 || ^2.1",
         "league/uri": "^6.0",
         "league/uri-components": "^2.3",
+        "setono/symfony-main-request-trait": "^1.0",
         "sylius/resource-bundle": "^1.6",
         "symfony/config": "^5.4 || ^6.0",
         "symfony/console": "^5.4 || ^6.0",

src/EventListener/NotFoundSubscriber.php

@@ -5,6 +5,7 @@
 namespace Setono\SyliusRedirectPlugin\EventListener;
 
 use Doctrine\Persistence\ObjectManager;
+use Setono\MainRequestTrait\MainRequestTrait;
 use Setono\SyliusRedirectPlugin\Resolver\RedirectionPathResolverInterface;
 use Sylius\Component\Channel\Context\ChannelContextInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -16,6 +17,8 @@
 
 class NotFoundSubscriber implements EventSubscriberInterface
 {
+    use MainRequestTrait;
+
     use RedirectResponseTrait;
 
     /** @var ObjectManager */
@@ -46,7 +49,7 @@ public static function getSubscribedEvents(): array
 
     public function onKernelException(ExceptionEvent $event): void
     {
-        if (!$event->isMasterRequest()) {
+        if (!$this->isMainRequest($event)) {
             return;
         }