Merge branch '6.2' into 6.3

* 6.2:
  [Security] remove deprecated conditions in supports and authenticate methods from AccessListener class
  [Tests] Replace `setMethods()` by `onlyMethods()` and `addMethods()`

Author: nicolas-grekas

Firewall/AccessListener.php

@@ -50,10 +50,7 @@ public function supports(Request $request): ?bool
         [$attributes] = $this->map->getPatterns($request);
         $request->attributes->set('_access_control_attributes', $attributes);
 
-        if ($attributes && (
-            (\defined(AuthenticatedVoter::class.'::IS_AUTHENTICATED_ANONYMOUSLY') ? [AuthenticatedVoter::IS_AUTHENTICATED_ANONYMOUSLY] !== $attributes : true)
-            && [AuthenticatedVoter::PUBLIC_ACCESS] !== $attributes
-        )) {
+        if ($attributes && [AuthenticatedVoter::PUBLIC_ACCESS] !== $attributes) {
             return true;
         }
 
@@ -72,10 +69,9 @@ public function authenticate(RequestEvent $event)
         $attributes = $request->attributes->get('_access_control_attributes');
         $request->attributes->remove('_access_control_attributes');
 
-        if (!$attributes || ((
-            (\defined(AuthenticatedVoter::class.'::IS_AUTHENTICATED_ANONYMOUSLY') ? [AuthenticatedVoter::IS_AUTHENTICATED_ANONYMOUSLY] === $attributes : false)
-            || [AuthenticatedVoter::PUBLIC_ACCESS] === $attributes
-        ) && $event instanceof LazyResponseEvent)) {
+        if (!$attributes || (
+            [AuthenticatedVoter::PUBLIC_ACCESS] === $attributes && $event instanceof LazyResponseEvent
+        )) {
             return;
         }
 

Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php

@@ -47,7 +47,7 @@ protected function setUp(): void
         $this->session = $this->createMock(SessionInterface::class);
         $this->request = $this->createMock(Request::class);
         $this->request->expects($this->any())->method('getSession')->willReturn($this->session);
-        $this->exception = $this->getMockBuilder(AuthenticationException::class)->setMethods(['getMessage'])->getMock();
+        $this->exception = $this->getMockBuilder(AuthenticationException::class)->onlyMethods(['getMessage'])->getMock();
     }
 
     public function testForward()

Tests/EventListener/CheckCredentialsListenerTest.php

@@ -134,7 +134,7 @@ public function testAddsNoPasswordUpgradeBadgeIfItAlreadyExists()
         $this->hasherFactory->expects($this->any())->method('getPasswordHasher')->with($this->identicalTo($this->user))->willReturn($hasher);
 
         $passport = $this->getMockBuilder(Passport::class)
-            ->setMethods(['addBadge'])
+            ->onlyMethods(['addBadge'])
             ->setConstructorArgs([new UserBadge('wouter', fn () => $this->user), new PasswordCredentials('ThePa$$word'), [new PasswordUpgradeBadge('ThePa$$word')]])
             ->getMock();
 
@@ -151,7 +151,7 @@ public function testAddsNoPasswordUpgradeBadgeIfPasswordIsInvalid()
         $this->hasherFactory->expects($this->any())->method('getPasswordHasher')->with($this->identicalTo($this->user))->willReturn($hasher);
 
         $passport = $this->getMockBuilder(Passport::class)
-            ->setMethods(['addBadge'])
+            ->onlyMethods(['addBadge'])
             ->setConstructorArgs([new UserBadge('wouter', fn () => $this->user), new PasswordCredentials('ThePa$$word'), [new PasswordUpgradeBadge('ThePa$$word')]])
             ->getMock();
 

Tests/Firewall/ContextListenerTest.php

@@ -307,7 +307,7 @@ public function testWithPreviousNotStartedSession()
 
     public function testSessionIsNotReported()
     {
-        $usageReporter = $this->getMockBuilder(\stdClass::class)->setMethods(['__invoke'])->getMock();
+        $usageReporter = $this->getMockBuilder(\stdClass::class)->addMethods(['__invoke'])->getMock();
         $usageReporter->expects($this->never())->method('__invoke');
 
         $session = new Session(new MockArraySessionStorage(), null, null, $usageReporter);