Use MainRequestTrait to fix deprecation

Author: loevgaard

composer.json

@@ -24,6 +24,7 @@
         "setono/client-id-contracts": "^0.2",
         "setono/consent-bundle": "^0.1",
         "setono/consent-contracts": "^0.1",
+        "setono/symfony-main-request-trait": "^1.0",
         "sylius/resource-bundle": "^1.6",
         "symfony/config": "^4.4 || ^5.4",
         "symfony/console": "^4.4 || ^5.4",

psalm.xml

@@ -28,12 +28,7 @@
     </plugins>
     <issueHandlers>
         <PluginIssue name="QueryBuilderSetParameter" errorLevel="info"/>
-        <UnnecessaryVarAnnotation
-            errorLevel="suppress"/> <!-- We only use 'unnecessary' var annotations when we want to help PhpStorm :) -->
-        <DeprecatedMethod>
-            <errorLevel type="suppress">
-                <referencedMethod name="Symfony\Component\HttpFoundation\RequestStack::getMasterRequest"/>
-            </errorLevel>
-        </DeprecatedMethod>
+        <!-- We only use 'unnecessary' var annotations when we want to help PhpStorm :) -->
+        <UnnecessaryVarAnnotation errorLevel="suppress"/>
     </issueHandlers>
 </psalm>

src/Generator/PixelEventsGenerator.php

@@ -5,6 +5,7 @@
 namespace Setono\SyliusFacebookPlugin\Generator;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Setono\MainRequestTrait\MainRequestTrait;
 use Setono\SyliusFacebookPlugin\Context\PixelContextInterface;
 use Setono\SyliusFacebookPlugin\DataMapper\DataMapperInterface;
 use Setono\SyliusFacebookPlugin\Factory\PixelEventFactoryInterface;
@@ -14,6 +15,8 @@
 
 final class PixelEventsGenerator implements PixelEventsGeneratorInterface
 {
+    use MainRequestTrait;
+
     private PixelContextInterface $pixelContext;
 
     private RequestStack $requestStack;
@@ -49,7 +52,7 @@ public function generatePixelEvents($source, string $eventName, Request $request
     {
         $serverSideEvent = $this->serverSideFactory->create($eventName);
         $this->dataMapper->map($source, $serverSideEvent, [
-            'request' => $request ?? $this->requestStack->getMasterRequest(),
+            'request' => $request ?? $this->getMainRequestFromRequestStack($this->requestStack),
             'event' => $eventName,
         ]);