Add compatibility with symfony 5.3

Implementing getUserIdentifier and using HttpKernelInterface::MAIN_REQUEST
sonata-project · Jun 6, 2021 · 7f4b8e5 · 7f4b8e5
1 parent 80d804e
commit 7f4b8e5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/tests/EventSubscriber/LocaleSubscriberTest.php b/tests/EventSubscriber/LocaleSubscriberTest.php
@@ -80,12 +80,18 @@ public function testLocaleSubscriberDefault(): void
         $this->assertSame('fr', $request->getLocale());
     }
 
+    /**
+     * @psalm-suppress DeprecatedConstant
+     */
     private function getEvent(Request $request): RequestEvent
     {
         return new RequestEvent(
             $this->createMock(HttpKernelInterface::class),
             $request,
-            HttpKernelInterface::MASTER_REQUEST
+            // @TODO: Use "HttpKernelInterface::MAIN_REQUEST" when support of Symfony <5.2 is dropped
+            \defined(HttpKernelInterface::class.'::MAIN_REQUEST')
+                ? HttpKernelInterface::MAIN_REQUEST
+                : HttpKernelInterface::MASTER_REQUEST
         );
     }
 }
diff --git a/tests/EventSubscriber/User.php b/tests/EventSubscriber/User.php
@@ -40,6 +40,11 @@ public function getUsername(): string
         return 'username';
     }
 
+    public function getUserIdentifier(): string
+    {
+        return 'username';
+    }
+
     public function eraseCredentials(): void
     {
     }