More code adjustments for PHP 8.2

Author: scheb

tests/ComposerJsonTest.php

@@ -45,7 +45,7 @@ public function packageDependenciesEqualRootDependencies(): void
         }
 
         $unusedDependencies = array_diff(array_keys($rootDependencies), array_unique($usedDependencies));
-        $message = sprintf('Dependencies declared in root composer.json, which are not declared in any sub-package: %s', implode($unusedDependencies));
+        $message = sprintf('Dependencies declared in root composer.json, which are not declared in any sub-package: %s', implode('', $unusedDependencies));
         $this->assertCount(0, $unusedDependencies, $message);
     }
 

tests/DependencyInjection/Factory/Security/TestableFactoryConfiguration.php

@@ -13,7 +13,7 @@
  */
 class TestableFactoryConfiguration implements ConfigurationInterface
 {
-    public function __construct(private TwoFactorFactory $factory)
+    public function __construct(private readonly TwoFactorFactory $factory)
     {
     }
 

tests/DependencyInjection/SchebTwoFactorExtensionTest.php

@@ -11,6 +11,8 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
+use Symfony\Component\Security\Http\Authenticator\Token\PostAuthenticationToken;
 use Symfony\Component\Yaml\Parser;
 use function array_map;
 use function sprintf;
@@ -60,8 +62,8 @@ public function load_emptyConfig_setDefaultValues(): void
         $this->assertHasNotParameter('scheb_two_factor.trusted_device.cookie_domain');
         $this->assertHasNotParameter('scheb_two_factor.trusted_device.cookie_path');
         $this->assertHasParameter([
-            'Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken',
-            'Symfony\Component\Security\Http\Authenticator\Token\PostAuthenticationToken',
+            UsernamePasswordToken::class,
+            PostAuthenticationToken::class,
         ], 'scheb_two_factor.security_tokens');
         $this->assertHasParameter([], 'scheb_two_factor.ip_whitelist');
     }
@@ -707,8 +709,6 @@ private function getConditionRegistryServices(): array
         $conditionsArgument = $this->container->getDefinition('scheb_two_factor.condition_registry')->getArgument(0);
         $this->assertInstanceOf(IteratorArgument::class, $conditionsArgument);
 
-        return array_map(static function (Reference $serviceReference) {
-            return (string) $serviceReference;
-        }, $conditionsArgument->getValues());
+        return array_map(static fn (Reference $serviceReference) => (string) $serviceReference, $conditionsArgument->getValues());
     }
 }

tests/Security/Http/EventListener/TrustedDeviceListenerTest.php

@@ -60,9 +60,7 @@ private function createPassportMock(): MockObject|Passport
         $passport
             ->expects($this->any())
             ->method('hasBadge')
-            ->willReturnCallback(function (string $badgeClass) {
-                return in_array($badgeClass, $this->availableBadges);
-            });
+            ->willReturnCallback(fn (string $badgeClass) => in_array($badgeClass, $this->availableBadges));
 
         return $passport;
     }

tests/Security/TwoFactor/Provider/Google/GoogleAuthenticatorTwoFactorProviderTest.php

@@ -51,7 +51,7 @@ private function createAuthenticationContext(UserInterface|null $user = null): M
         $authContext
             ->expects($this->any())
             ->method('getUser')
-            ->willReturn($user ? $user : $this->createUser());
+            ->willReturn($user ?: $this->createUser());
 
         return $authContext;
     }

tests/Security/TwoFactor/Provider/Totp/TotpAuthenticatorTwoFactorProviderTest.php

@@ -62,7 +62,7 @@ private function createAuthenticationContext(UserInterface|null $user = null): M
         $authContext
             ->expects($this->any())
             ->method('getUser')
-            ->willReturn($user ? $user : $this->createUser());
+            ->willReturn($user ?: $this->createUser());
 
         return $authContext;
     }

tests/Security/TwoFactor/TwoFactorFirewallConfigTest.php

@@ -57,9 +57,7 @@ private function stubRequestMethod(MockObject|Request $request, string $method):
         $request
             ->expects($this->any())
             ->method('isMethod')
-            ->willReturnCallback(static function (string $arg) use ($method) {
-                return $arg === $method;
-            });
+            ->willReturnCallback(static fn (string $arg) => $arg === $method);
     }
 
     private function stubCheckRequestPath(MockObject|Request $request, string $pathToCheck, bool $result): void