CS fixes

Author: nicolas-grekas

AccessToken/FormEncodedBodyExtractor.php

@@ -28,7 +28,7 @@
 final class FormEncodedBodyExtractor implements AccessTokenExtractorInterface
 {
     public function __construct(
-        private readonly string $parameter = 'access_token'
+        private readonly string $parameter = 'access_token',
     ) {
     }
 

AccessToken/HeaderAccessTokenExtractor.php

@@ -26,9 +26,9 @@ final class HeaderAccessTokenExtractor implements AccessTokenExtractorInterface
 
     public function __construct(
         private readonly string $headerParameter = 'Authorization',
-        private readonly string $tokenType = 'Bearer'
+        private readonly string $tokenType = 'Bearer',
     ) {
-        $this->regex = sprintf(
+        $this->regex = \sprintf(
             '/^%s([a-zA-Z0-9\-_\+~\/\.]+=*)$/',
             '' === $this->tokenType ? '' : preg_quote($this->tokenType).'\s+'
         );

AccessToken/Oidc/OidcTokenHandler.php

@@ -44,7 +44,7 @@ public function __construct(
         private array $issuers,
         private string $claim = 'sub',
         private ?LoggerInterface $logger = null,
-        private ClockInterface $clock = new Clock()
+        private ClockInterface $clock = new Clock(),
     ) {
     }
 
@@ -88,7 +88,7 @@ public function getUserBadgeFrom(string $accessToken): UserBadge
             $claimCheckerManager->check($claims);
 
             if (empty($claims[$this->claim])) {
-                throw new MissingClaimException(sprintf('"%s" claim not found.', $this->claim));
+                throw new MissingClaimException(\sprintf('"%s" claim not found.', $this->claim));
             }
 
             // UserLoader argument can be overridden by a UserProvider on AccessTokenAuthenticator::authenticate

AccessToken/Oidc/OidcUserInfoTokenHandler.php

@@ -29,7 +29,7 @@ final class OidcUserInfoTokenHandler implements AccessTokenHandlerInterface
     public function __construct(
         private HttpClientInterface $client,
         private ?LoggerInterface $logger = null,
-        private string $claim = 'sub'
+        private string $claim = 'sub',
     ) {
     }
 
@@ -43,7 +43,7 @@ public function getUserBadgeFrom(string $accessToken): UserBadge
             ])->toArray();
 
             if (empty($claims[$this->claim])) {
-                throw new MissingClaimException(sprintf('"%s" claim not found on OIDC server response.', $this->claim));
+                throw new MissingClaimException(\sprintf('"%s" claim not found on OIDC server response.', $this->claim));
             }
 
             // UserLoader argument can be overridden by a UserProvider on AccessTokenAuthenticator::authenticate

Authentication/AuthenticatorManager.php

@@ -105,7 +105,7 @@ public function supports(Request $request): ?bool
             $this->logger?->debug('Checking support on authenticator.', ['firewall_name' => $this->firewallName, 'authenticator' => $authenticator::class]);
 
             if (!$authenticator instanceof AuthenticatorInterface) {
-                throw new \InvalidArgumentException(sprintf('Authenticator "%s" must implement "%s".', get_debug_type($authenticator), AuthenticatorInterface::class));
+                throw new \InvalidArgumentException(\sprintf('Authenticator "%s" must implement "%s".', get_debug_type($authenticator), AuthenticatorInterface::class));
             }
 
             if (false !== $supports = $authenticator->supports($request)) {
@@ -183,15 +183,15 @@ private function executeAuthenticator(AuthenticatorInterface $authenticator, Req
             $resolvedBadges = [];
             foreach ($passport->getBadges() as $badge) {
                 if (!$badge->isResolved()) {
-                    throw new BadCredentialsException(sprintf('Authentication failed: Security badge "%s" is not resolved, did you forget to register the correct listeners?', get_debug_type($badge)));
+                    throw new BadCredentialsException(\sprintf('Authentication failed: Security badge "%s" is not resolved, did you forget to register the correct listeners?', get_debug_type($badge)));
                 }
 
                 $resolvedBadges[] = $badge::class;
             }
 
             $missingRequiredBadges = array_diff($this->requiredBadges, $resolvedBadges);
             if ($missingRequiredBadges) {
-                throw new BadCredentialsException(sprintf('Authentication failed; Some badges marked as required by the firewall config are not available on the passport: "%s".', implode('", "', $missingRequiredBadges)));
+                throw new BadCredentialsException(\sprintf('Authentication failed; Some badges marked as required by the firewall config are not available on the passport: "%s".', implode('", "', $missingRequiredBadges)));
             }
 
             // create the authentication token

Authentication/DefaultAuthenticationFailureHandler.php

@@ -75,7 +75,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
         if (\is_string($failureUrl) && (str_starts_with($failureUrl, '/') || str_starts_with($failureUrl, 'http'))) {
             $options['failure_path'] = $failureUrl;
         } elseif ($this->logger && $failureUrl) {
-            $this->logger->debug(sprintf('Ignoring query parameter "%s": not a valid URL.', $options['failure_path_parameter']));
+            $this->logger->debug(\sprintf('Ignoring query parameter "%s": not a valid URL.', $options['failure_path_parameter']));
         }
 
         $options['failure_path'] ??= $options['login_path'];

Authentication/DefaultAuthenticationSuccessHandler.php

@@ -99,7 +99,7 @@ protected function determineTargetUrl(Request $request): string
         }
 
         if ($this->logger && $targetUrl) {
-            $this->logger->debug(sprintf('Ignoring query parameter "%s": not a valid URL.', $this->options['target_path_parameter']));
+            $this->logger->debug(\sprintf('Ignoring query parameter "%s": not a valid URL.', $this->options['target_path_parameter']));
         }
 
         $firewallName = $this->getFirewallName();

Authenticator/AccessTokenAuthenticator.php

@@ -118,9 +118,9 @@ private function getAuthenticateHeader(?string $errorDescription = null): string
             if (null === $v || '' === $v) {
                 continue;
             }
-            $values[] = sprintf('%s="%s"', $k, $v);
+            $values[] = \sprintf('%s="%s"', $k, $v);
         }
 
-        return sprintf('Bearer %s', implode(',', $values));
+        return \sprintf('Bearer %s', implode(',', $values));
     }
 }

Authenticator/FormLoginAuthenticator.php

@@ -124,19 +124,19 @@ private function getCredentials(Request $request): array
         }
 
         if (!\is_string($credentials['username']) && !$credentials['username'] instanceof \Stringable) {
-            throw new BadRequestHttpException(sprintf('The key "%s" must be a string, "%s" given.', $this->options['username_parameter'], \gettype($credentials['username'])));
+            throw new BadRequestHttpException(\sprintf('The key "%s" must be a string, "%s" given.', $this->options['username_parameter'], \gettype($credentials['username'])));
         }
 
         $credentials['username'] = trim($credentials['username']);
 
         $request->getSession()->set(SecurityRequestAttributes::LAST_USERNAME, $credentials['username']);
 
         if (!\is_string($credentials['password']) && (!\is_object($credentials['password']) || !method_exists($credentials['password'], '__toString'))) {
-            throw new BadRequestHttpException(sprintf('The key "%s" must be a string, "%s" given.', $this->options['password_parameter'], \gettype($credentials['password'])));
+            throw new BadRequestHttpException(\sprintf('The key "%s" must be a string, "%s" given.', $this->options['password_parameter'], \gettype($credentials['password'])));
         }
 
         if (!\is_string($credentials['csrf_token'] ?? '') && (!\is_object($credentials['csrf_token']) || !method_exists($credentials['csrf_token'], '__toString'))) {
-            throw new BadRequestHttpException(sprintf('The key "%s" must be a string, "%s" given.', $this->options['csrf_parameter'], \gettype($credentials['csrf_token'])));
+            throw new BadRequestHttpException(\sprintf('The key "%s" must be a string, "%s" given.', $this->options['csrf_parameter'], \gettype($credentials['csrf_token'])));
         }
 
         return $credentials;

Authenticator/HttpBasicAuthenticator.php

@@ -47,7 +47,7 @@ public function __construct(string $realmName, UserProviderInterface $userProvid
     public function start(Request $request, ?AuthenticationException $authException = null): Response
     {
         $response = new Response();
-        $response->headers->set('WWW-Authenticate', sprintf('Basic realm="%s"', $this->realmName));
+        $response->headers->set('WWW-Authenticate', \sprintf('Basic realm="%s"', $this->realmName));
         $response->setStatusCode(401);
 
         return $response;