Adjust codestyle for PHP 8.2 (#288)

Author: shakaran

app/config/bootstrap.php

@@ -19,5 +19,5 @@
 
 $_SERVER += $_ENV;
 $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev';
-$_SERVER['APP_DEBUG'] = $_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV'];
+$_SERVER['APP_DEBUG'] ??= $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV'];
 $_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], FILTER_VALIDATE_BOOLEAN) ? '1' : '0';

app/public/index.php

@@ -4,6 +4,4 @@
 
 require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 
-return function (array $context) {
-    return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
-};
+return fn (array $context): Kernel => new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);

src/bundle/DependencyInjection/Configuration.php

@@ -47,9 +47,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->arrayNode('ip_whitelist')
                     ->beforeNormalization()
                         ->ifArray()
-                        ->then(static function (array $value): array {
-                            return iterator_to_array(new RecursiveIteratorIterator(new RecursiveArrayIterator($value)), false);
-                        })
+                        ->then(static fn (array $value): array => iterator_to_array(new RecursiveIteratorIterator(new RecursiveArrayIterator($value)), false))
                     ->end()
                     ->defaultValue([])
                     ->prototype('scalar')->end()

src/bundle/Model/Persister/DoctrinePersisterFactory.php

@@ -15,7 +15,7 @@
  */
 class DoctrinePersisterFactory
 {
-    private ManagerRegistry $managerRegistry;
+    private readonly ManagerRegistry $managerRegistry;
 
     public function __construct(
         ManagerRegistry|null $managerRegistry,

src/bundle/Security/Authentication/Exception/TwoFactorProviderNotFoundException.php

@@ -14,7 +14,7 @@ class TwoFactorProviderNotFoundException extends AuthenticationException
     public const MESSAGE_KEY = 'Two-factor provider not found.';
 
     /** @psalm-suppress PropertyNotSetInConstructor */
-    private string|null $provider;
+    private string|null $provider = null;
 
     public function getMessageKey(): string
     {

src/bundle/Security/Http/Authenticator/TwoFactorAuthenticator.php

@@ -39,7 +39,7 @@ class TwoFactorAuthenticator implements AuthenticatorInterface, InteractiveAuthe
 {
     public const FLAG_2FA_COMPLETE = '2fa_complete';
 
-    private LoggerInterface $logger;
+    private readonly LoggerInterface $logger;
 
     public function __construct(
         private readonly TwoFactorFirewallConfig $twoFactorFirewallConfig,
@@ -72,9 +72,7 @@ public function authenticate(Request $request): Passport
         $this->dispatchTwoFactorAuthenticationEvent(TwoFactorAuthenticationEvents::ATTEMPT, $request, $currentToken);
 
         $credentials = new TwoFactorCodeCredentials($currentToken, $this->twoFactorFirewallConfig->getAuthCodeFromRequest($request));
-        $userLoader = static function () use ($currentToken): UserInterface {
-            return $currentToken->getUser();
-        };
+        $userLoader = (static fn (): UserInterface => $currentToken->getUser());
         $userBadge = new UserBadge($currentToken->getUserIdentifier(), $userLoader);
         $passport = new Passport($userBadge, $credentials, []);
         if ($currentToken->hasAttribute(TwoFactorTokenInterface::ATTRIBUTE_NAME_USE_REMEMBER_ME)) {

src/bundle/Security/TwoFactor/Provider/TwoFactorProviderPreparationListener.php

@@ -32,7 +32,7 @@ class TwoFactorProviderPreparationListener implements EventSubscriberInterface
     public const RESPONSE_LISTENER_PRIORITY = 1;
 
     private TwoFactorTokenInterface|null $twoFactorToken = null;
-    private LoggerInterface $logger;
+    private readonly LoggerInterface $logger;
 
     public function __construct(
         private readonly TwoFactorProviderRegistry $providerRegistry,

src/trusted-device/Security/TwoFactor/Trusted/JwtTokenEncoder.php

@@ -25,7 +25,7 @@ class JwtTokenEncoder
     public const CLAIM_FIREWALL = 'fwl';
     public const CLAIM_VERSION = 'vsn';
 
-    private Clock $clock;
+    private readonly Clock $clock;
 
     public function __construct(private readonly Configuration $configuration, Clock|null $clock = null)
     {

src/trusted-device/Security/TwoFactor/Trusted/TrustedCookieResponseListener.php

@@ -56,7 +56,7 @@ public function onKernelResponse(ResponseEvent $event): void
             $this->getValidUntil(),
             $this->cookiePath,
             $domain,
-            null === $this->cookieSecure ? $event->getRequest()->isSecure() : $this->cookieSecure,
+            $this->cookieSecure ?? $event->getRequest()->isSecure(),
             true,
             false,
             $this->cookieSameSite,

src/trusted-device/Security/TwoFactor/Trusted/TrustedDeviceTokenStorage.php

@@ -39,9 +39,7 @@ public function hasUpdatedCookie(): bool
 
     public function getCookieValue(): string|null
     {
-        return implode(self::TOKEN_DELIMITER, array_map(static function (TrustedDeviceToken $token): string {
-            return $token->serialize();
-        }, $this->getTrustedTokenList()));
+        return implode(self::TOKEN_DELIMITER, array_map(static fn (TrustedDeviceToken $token): string => $token->serialize(), $this->getTrustedTokenList()));
     }
 
     public function hasTrustedToken(string $username, string $firewall, int $version): bool