Fix merge

Author: wouterj

Tests/Controller/AbstractControllerTest.php

@@ -138,12 +138,7 @@ public function testForward()
     public function testGetUser()
     {
         $user = new InMemoryUser('user', 'pass');
-        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']);
-        }
+        $token = new UsernamePasswordToken($user, 'default', ['ROLE_USER']);
 
         $controller = $this->createController();
         $controller->setContainer($this->getContainerWithTokenStorage($token));
@@ -156,11 +151,6 @@ 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();