Merge branch '5.3' into 5.4

* 5.3:
  Fix compatibility with symfony/security-core 6.x

Author: fabpot

src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php

@@ -126,8 +126,8 @@ public function loginUser(object $user, string $firewallContext = 'main'): self
 
         $token = new TestBrowserToken($user->getRoles(), $user, $firewallContext);
         // @deprecated since Symfony 5.4
-        if (method_exists($token, 'isAuthenticated')) {
-            $token->setAuthenticated(true, false);
+        if (method_exists($token, 'setAuthenticated')) {
+            $token->setAuthenticated(true);
         }
 
         $container = $this->getContainer();

src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php

@@ -138,7 +138,12 @@ public function testForward()
     public function testGetUser()
     {
         $user = new InMemoryUser('user', 'pass');
-        $token = new UsernamePasswordToken($user, 'default', ['ROLE_USER']);
+        if (method_exists(UsernamePasswordToken::class, 'setAuthenticated')) {
+            // @deprecated since Symfony 5.4
+            $token = new UsernamePasswordToken($user, 'pass', 'default', ['ROLE_USER']);
+        } else {
+            $token = new UsernamePasswordToken($user, 'default', ['ROLE_USER']);
+        }
 
         $controller = $this->createController();
         $controller->setContainer($this->getContainerWithTokenStorage($token));
@@ -151,6 +156,11 @@ public function testGetUser()
      */
     public function testGetUserAnonymousUserConvertedToNull()
     {
+        // @deprecated since Symfony 5.4
+        if (!class_exists(AnonymousToken::class)) {
+            $this->markTestSkipped('This test requires "symfony/security-core" <6.0.');
+        }
+
         $token = new AnonymousToken('default', 'anon.');
 
         $controller = $this->createController();