Apply phpcs fixes

app/src/Entity/User.php

@@ -41,13 +41,13 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface, EmailTw
     private bool $emailAuthenticationEnabled = true;
 
     #[ORM\Column(type: 'integer')]
-    private ?string $emailAuthenticationCode = null;
+    private string|null $emailAuthenticationCode = null;
 
     #[ORM\Column(type: 'boolean')]
     private bool $googleAuthenticatorEnabled = true;
 
     #[ORM\Column(type: 'string')]
-    private ?string $googleAuthenticatorSecret = null;
+    private string|null $googleAuthenticatorSecret = null;
 
     #[ORM\Column(type: 'boolean')]
     private bool $totpAuthenticationEnabled = true;
@@ -72,12 +72,12 @@ public function getEmail(): string
         return $this->email;
     }
 
-    public function getSalt(): ?string
+    public function getSalt(): string|null
     {
         return null;
     }
 
-    public function getPassword(): ?string
+    public function getPassword(): string|null
     {
         return $this->password;
     }
@@ -163,7 +163,7 @@ public function getGoogleAuthenticatorSecret(): string
         return $this->googleAuthenticatorSecret;
     }
 
-    public function setGoogleAuthenticatorSecret(?string $googleAuthenticatorSecret): void
+    public function setGoogleAuthenticatorSecret(string|null $googleAuthenticatorSecret): void
     {
         $this->googleAuthenticatorSecret = $googleAuthenticatorSecret;
     }
@@ -183,7 +183,7 @@ public function getTotpAuthenticationUsername(): string
         return $this->username;
     }
 
-    public function getTotpAuthenticationConfiguration(): ?TotpConfigurationInterface
+    public function getTotpAuthenticationConfiguration(): TotpConfigurationInterface|null
     {
         return new TotpConfiguration($this->googleAuthenticatorSecret, TotpConfiguration::ALGORITHM_SHA1, 30, 6);
     }

phpcs.xml.dist

@@ -33,6 +33,7 @@
 
         <!-- We don't want this -->
 		<exclude name="Generic.Formatting.MultipleStatementAlignment"/>
+		<exclude name="SlevomatCodingStandard.Commenting.RequireOneLineDocComment.MultiLineDocComment"/>
 	</rule>
 
     <!-- Align with php-cs-fixer config -->

src/backup-code/Security/Http/EventListener/CheckBackupCodeListener.php

@@ -36,7 +36,7 @@ protected function isValidCode(string $providerName, object $user, string $code)
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public static function getSubscribedEvents(): array
     {

src/bundle/Controller/FormController.php

@@ -28,7 +28,7 @@ public function __construct(
         private TwoFactorProviderRegistry $providerRegistry,
         private TwoFactorFirewallContext $twoFactorFirewallContext,
         private LogoutUrlGenerator $logoutUrlGenerator,
-        private ?TrustedDeviceManagerInterface $trustedDeviceManager,
+        private TrustedDeviceManagerInterface|null $trustedDeviceManager,
         private bool $trustedFeatureEnabled,
     ) {
     }
@@ -107,7 +107,7 @@ protected function renderForm(string $providerName, Request $request, TwoFactorT
         return $renderer->renderForm($request, $templateVars);
     }
 
-    protected function getLastAuthenticationException(SessionInterface $session): ?AuthenticationException
+    protected function getLastAuthenticationException(SessionInterface $session): AuthenticationException|null
     {
         $authException = $session->get(SecurityRequestAttributes::AUTHENTICATION_ERROR);
         if ($authException instanceof AuthenticationException) {

src/bundle/DependencyInjection/Factory/Security/TwoFactorFactory.php

@@ -95,7 +95,7 @@ public function addConfiguration(NodeDefinition $builder): void
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function createAuthenticator(ContainerBuilder $container, string $firewallName, array $config, string $userProviderId): string
     {
@@ -115,7 +115,7 @@ public function createAuthenticator(ContainerBuilder $container, string $firewal
             $twoFactorFirewallConfigId,
             $successHandlerId,
             $failureHandlerId,
-            $authRequiredHandlerId
+            $authRequiredHandlerId,
         );
     }
 
@@ -125,7 +125,7 @@ private function createAuthenticatorService(
         string $twoFactorFirewallConfigId,
         string $successHandlerId,
         string $failureHandlerId,
-        string $authRequiredHandlerId
+        string $authRequiredHandlerId,
     ): string {
         $authenticatorId = self::AUTHENTICATOR_ID_PREFIX.$firewallName;
         $container
@@ -149,7 +149,7 @@ private function createAuthenticationTokenCreatedListener(ContainerBuilder $cont
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function createListeners(ContainerBuilder $container, string $firewallName, array $config): array
     {

src/bundle/DependencyInjection/SchebTwoFactorExtension.php

@@ -21,7 +21,7 @@
 class SchebTwoFactorExtension extends Extension
 {
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function load(array $configs, ContainerBuilder $container): void
     {

src/bundle/Model/Persister/DoctrinePersisterFactory.php

@@ -18,8 +18,8 @@ class DoctrinePersisterFactory
     private ManagerRegistry $managerRegistry;
 
     public function __construct(
-        ?ManagerRegistry $managerRegistry,
-        private ?string $objectManagerName,
+        ManagerRegistry|null $managerRegistry,
+        private string|null $objectManagerName,
     ) {
         if (null === $managerRegistry) {
             $msg = 'scheb/2fa-bundle requires Doctrine to manage the user entity. If you don\'t want something else ';

src/bundle/Model/PreferredProviderInterface.php

@@ -9,5 +9,5 @@ interface PreferredProviderInterface
     /**
      * Return the alias of the preferred two-factor provider (if chosen by the user).
      */
-    public function getPreferredTwoFactorProvider(): ?string;
+    public function getPreferredTwoFactorProvider(): string|null;
 }

src/bundle/Security/Authentication/AuthenticationTrustResolver.php

@@ -24,7 +24,7 @@ public function __construct(private AuthenticationTrustResolverInterface $decora
      *
      * @deprecated since Symfony 5.4, use !isAuthenticated() instead
      */
-    public function isAnonymous(?TokenInterface $token = null): bool
+    public function isAnonymous(TokenInterface|null $token = null): bool
     {
         if (!method_exists($this->decoratedTrustResolver, 'isAnonymous')) {
             throw new RuntimeException('Method "isAnonymous" was not declared on the decorated AuthenticationTrustResolverInterface');
@@ -33,20 +33,20 @@ public function isAnonymous(?TokenInterface $token = null): bool
         return $this->decoratedTrustResolver->isAnonymous($token);
     }
 
-    public function isRememberMe(?TokenInterface $token = null): bool
+    public function isRememberMe(TokenInterface|null $token = null): bool
     {
         return $this->decoratedTrustResolver->isRememberMe($token);
     }
 
-    public function isFullFledged(?TokenInterface $token = null): bool
+    public function isFullFledged(TokenInterface|null $token = null): bool
     {
         return !$this->isTwoFactorToken($token) && $this->decoratedTrustResolver->isFullFledged($token);
     }
 
     /**
      * Compatibility for Symfony >= 5.4.
      */
-    public function isAuthenticated(?TokenInterface $token = null): bool
+    public function isAuthenticated(TokenInterface|null $token = null): bool
     {
         // The "isAuthenticated" method must be declared in Symfony >= 6.0
         if (method_exists($this->decoratedTrustResolver, 'isAuthenticated')) {
@@ -62,7 +62,7 @@ public function isAuthenticated(?TokenInterface $token = null): bool
         throw new RuntimeException('Neither method "isAuthenticated" nor "isAnonymous" was declared on the decorated AuthenticationTrustResolverInterface');
     }
 
-    private function isTwoFactorToken(?TokenInterface $token): bool
+    private function isTwoFactorToken(TokenInterface|null $token): bool
     {
         return $token instanceof TwoFactorTokenInterface;
     }

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

@@ -14,14 +14,14 @@ class TwoFactorProviderNotFoundException extends AuthenticationException
     public const MESSAGE_KEY = 'Two-factor provider not found.';
 
     /** @psalm-suppress PropertyNotSetInConstructor */
-    private ?string $provider;
+    private string|null $provider;
 
     public function getMessageKey(): string
     {
         return self::MESSAGE_KEY;
     }
 
-    public function getProvider(): ?string
+    public function getProvider(): string|null
     {
         return $this->provider;
     }
@@ -53,6 +53,7 @@ public function __serialize(): array
     public function __unserialize(array $data): void
     {
         [$this->provider, $parentData] = $data;
+
         parent::__unserialize($parentData);
     }
 }

src/bundle/Security/Authentication/Token/TwoFactorToken.php

@@ -9,7 +9,6 @@
 use RuntimeException;
 use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Exception\UnknownTwoFactorProviderException;
 use Scheb\TwoFactorBundle\Security\UsernameHelper;
-use Stringable;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use function array_key_exists;
@@ -22,34 +21,26 @@
 use function sprintf;
 use function unserialize;
 
-class TwoFactorToken implements TwoFactorTokenInterface, Stringable
+class TwoFactorToken implements TwoFactorTokenInterface
 {
-    private TokenInterface $authenticatedToken;
-
     /** @var array<string,mixed> */
     private array $attributes = [];
 
-    /** @var string[] */
-    private array $twoFactorProviders;
-
     /** @var bool[] */
     private array $preparedProviders = [];
 
     /**
      * @param string[] $twoFactorProviders
      */
     public function __construct(
-        TokenInterface $authenticatedToken,
-        private ?string $credentials,
+        private TokenInterface $authenticatedToken,
+        private string|null $credentials,
         private string $firewallName,
-        array $twoFactorProviders,
+        private array $twoFactorProviders,
     ) {
         if (null === $authenticatedToken->getUser()) {
             throw new InvalidArgumentException('The authenticated token must have a user object set.');
         }
-
-        $this->authenticatedToken = $authenticatedToken;
-        $this->twoFactorProviders = $twoFactorProviders;
     }
 
     public function getUser(): UserInterface
@@ -98,7 +89,7 @@ public function getRoles(): array
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function getRoleNames(): array
     {
@@ -117,7 +108,7 @@ public function createWithCredentials(string $credentials): TwoFactorTokenInterf
         return $credentialsToken;
     }
 
-    public function getCredentials(): ?string
+    public function getCredentials(): string|null
     {
         return $this->credentials;
     }
@@ -133,7 +124,7 @@ public function getAuthenticatedToken(): TokenInterface
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function getTwoFactorProviders(): array
     {
@@ -146,7 +137,7 @@ public function preferTwoFactorProvider(string $preferredProvider): void
         array_unshift($this->twoFactorProviders, $preferredProvider);
     }
 
-    public function getCurrentTwoFactorProvider(): ?string
+    public function getCurrentTwoFactorProvider(): string|null
     {
         $first = reset($this->twoFactorProviders);
 

src/bundle/Security/Authentication/Token/TwoFactorTokenInterface.php

@@ -51,7 +51,7 @@ public function preferTwoFactorProvider(string $preferredProvider): void;
     /**
      * Return the alias of the two-factor provider, which is currently active.
      */
-    public function getCurrentTwoFactorProvider(): ?string;
+    public function getCurrentTwoFactorProvider(): string|null;
 
     /**
      * Flag a two-factor provider as complete. The provider's alias is passed as the argument.

src/bundle/Security/Authorization/TwoFactorAccessDecider.php

@@ -56,13 +56,13 @@ public function isAccessible(Request $request, TokenInterface $token): bool
         // sorting the LogoutListener in programmatically. When a lazy firewall is used, the LogoutListener is executed
         // last, because all other listeners are encapsulated into LazyFirewallContext, which is invoked first.
         $logoutPath = $this->removeQueryParameters(
-            $this->makeRelativeToBaseUrl($this->logoutUrlGenerator->getLogoutPath(), $request)
+            $this->makeRelativeToBaseUrl($this->logoutUrlGenerator->getLogoutPath(), $request),
         );
 
         return $this->httpUtils->checkRequestPath($request, $logoutPath); // Let the logout route pass
     }
 
-    private function isPubliclyAccessAttribute(?array $attributes): bool
+    private function isPubliclyAccessAttribute(array|null $attributes): bool
     {
         if (null === $attributes) {
             // No access control at all is treated "non-public" by 2fa

src/bundle/Security/Authorization/Voter/TwoFactorInProgressVoter.php

@@ -18,7 +18,7 @@ class TwoFactorInProgressVoter implements VoterInterface
     public const IS_AUTHENTICATED_2FA_IN_PROGRESS = 'IS_AUTHENTICATED_2FA_IN_PROGRESS';
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function vote(TokenInterface $token, mixed $subject, array $attributes): int
     {

src/bundle/Security/Http/Authenticator/Passport/Credentials/TwoFactorCodeCredentials.php

@@ -17,7 +17,7 @@ class TwoFactorCodeCredentials implements CredentialsInterface
 
     public function __construct(
         private TwoFactorTokenInterface $twoFactorToken,
-        private ?string $code,
+        private string|null $code,
     ) {
     }
 

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

@@ -50,12 +50,12 @@ public function __construct(
         private AuthenticationFailureHandlerInterface $failureHandler,
         private AuthenticationRequiredHandlerInterface $authenticationRequiredHandler,
         private EventDispatcherInterface $eventDispatcher,
-        ?LoggerInterface $logger = null
+        LoggerInterface|null $logger = null,
     ) {
         $this->logger = $logger ?? new NullLogger();
     }
 
-    public function supports(Request $request): ?bool
+    public function supports(Request $request): bool|null
     {
         return $this->twoFactorFirewallConfig->isCheckPathRequest($request);
     }
@@ -142,7 +142,7 @@ private function isAuthenticationComplete(TwoFactorTokenInterface $token): bool
         return !$this->twoFactorFirewallConfig->isMultiFactor() || $token->allTwoFactorProvidersAuthenticated();
     }
 
-    public function onAuthenticationSuccess(Request $request, TokenInterface $token, string $firewallName): ?Response
+    public function onAuthenticationSuccess(Request $request, TokenInterface $token, string $firewallName): Response|null
     {
         $this->logger->info('User has been two-factor authenticated successfully.', ['username' => UsernameHelper::getTokenUsername($token)]);
         $this->dispatchTwoFactorAuthenticationEvent(TwoFactorAuthenticationEvents::SUCCESS, $request, $token);
@@ -159,7 +159,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token,
         return $this->successHandler->onAuthenticationSuccess($request, $token);
     }
 
-    public function onAuthenticationFailure(Request $request, AuthenticationException $exception): ?Response
+    public function onAuthenticationFailure(Request $request, AuthenticationException $exception): Response|null
     {
         $currentToken = $this->tokenStorage->getToken();
         assert($currentToken instanceof TwoFactorTokenInterface);

src/bundle/Security/Http/EventListener/CheckTwoFactorCodeListener.php

@@ -20,7 +20,7 @@ class CheckTwoFactorCodeListener extends AbstractCheckCodeListener
 
     public function __construct(
         PreparationRecorderInterface $preparationRecorder,
-        private TwoFactorProviderRegistry $providerRegistry
+        private TwoFactorProviderRegistry $providerRegistry,
     ) {
         parent::__construct($preparationRecorder);
     }
@@ -44,7 +44,7 @@ protected function isValidCode(string $providerName, object $user, string $code)
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public static function getSubscribedEvents(): array
     {

src/bundle/Security/Http/EventListener/SuppressRememberMeListener.php

@@ -39,7 +39,7 @@ public function onSuccessfulLogin(LoginSuccessEvent $event): void
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public static function getSubscribedEvents(): array
     {