Fix compatibility with symfony/security-core 6.x

wouterj · wouterj · commit be80f95f6226 · 2021-12-02T18:38:19.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
@@ -123,7 +123,9 @@ public function loginUser(object $user, string $firewallContext = 'main'): self
         }
 
         $token = new TestBrowserToken($user->getRoles(), $user, $firewallContext);
-        $token->setAuthenticated(true);
+        if (method_exists($token, 'setAuthenticated')) {
+            $token->setAuthenticated(true);
+        }
 
         $container = $this->getContainer();
         $container->get('security.untracked_token_storage')->setToken($token);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
@@ -138,7 +138,11 @@ public function testForward()
     public function testGetUser()
     {
         $user = new InMemoryUser('user', 'pass');
-        $token = new UsernamePasswordToken($user, 'pass', 'default', ['ROLE_USER']);
+        if (method_exists(UsernamePasswordToken::class, 'setAuthenticated')) {
+            $token = new UsernamePasswordToken($user, 'pass', 'default', ['ROLE_USER']);
+        } else {
+            $token = new UsernamePasswordToken($user, 'default', ['ROLE_USER']);
+        }
 
         $controller = $this->createController();
         $controller->setContainer($this->getContainerWithTokenStorage($token));
@@ -148,6 +152,10 @@ public function testGetUser()
 
     public function testGetUserAnonymousUserConvertedToNull()
     {
+        if (!class_exists(AnonymousToken::class)) {
+            $this->markTestSkipped('This test requires "symfony/security-core" <6.0.');
+        }
+
         $token = new AnonymousToken('default', 'anon.');
 
         $controller = $this->createController();

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,9 @@ public function loginUser(object $user, string $firewallContext = 'main'): self`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`$token = new TestBrowserToken($user->getRoles(), $user, $firewallContext);`
`126`		`- $token->setAuthenticated(true);`
	`126`	`+ if (method_exists($token, 'setAuthenticated')) {`
	`127`	`+ $token->setAuthenticated(true);`
	`128`	`+ }`
`127`	`129`
`128`	`130`	`$container = $this->getContainer();`
`129`	`131`	`$container->get('security.untracked_token_storage')->setToken($token);`