Address Plsam errors

scheb · Apr 19, 2024 · c9bf792 · c9bf792
1 parent 00567fa
commit c9bf792
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 8 deletions.
diff --git a/src/bundle/DependencyInjection/Factory/Security/TwoFactorServicesFactory.php b/src/bundle/DependencyInjection/Factory/Security/TwoFactorServicesFactory.php
@@ -71,6 +71,7 @@ public function createAuthenticationRequiredHandler(ContainerBuilder $container,
      */
     public function getCsrfTokenManagerId(array $config): string
     {
+        /** @psalm-suppress RiskyTruthyFalsyComparison */
         return $config['enable_csrf'] ?? false
             ? 'scheb_two_factor.csrf_token_manager'
             : 'scheb_two_factor.null_csrf_token_manager';

diff --git a/src/bundle/Security/Http/EventListener/AbstractCheckCodeListener.php b/src/bundle/Security/Http/EventListener/AbstractCheckCodeListener.php
@@ -38,7 +38,7 @@ public function checkPassport(CheckPassportEvent $event): void
         assert($credentialsBadge instanceof TwoFactorCodeCredentials);
         $token = $credentialsBadge->getTwoFactorToken();
         $providerName = $token->getCurrentTwoFactorProvider();
-        if (!$providerName) {
+        if (null === $providerName || !$providerName) {
             throw new AuthenticationException('There is no active two-factor provider.');
         }
 

diff --git a/src/bundle/Security/TwoFactor/Provider/TwoFactorProviderInitiator.php b/src/bundle/Security/TwoFactor/Provider/TwoFactorProviderInitiator.php
@@ -62,7 +62,7 @@ private function setPreferredProvider(TwoFactorTokenInterface $token, object $us
         }
 
         $preferredProvider = $user->getPreferredTwoFactorProvider();
-        if (!$preferredProvider) {
+        if (null === $preferredProvider || !$preferredProvider) {
             return;
         }
 

diff --git a/src/email/Mailer/SymfonyAuthCodeMailer.php b/src/email/Mailer/SymfonyAuthCodeMailer.php
@@ -23,7 +23,7 @@ public function __construct(
     ) {
         if (null !== $senderEmail && null !== $senderName) {
             $this->senderAddress = new Address($senderEmail, $senderName);
-        } elseif ($senderEmail) {
+        } elseif (null !== $senderEmail && $senderEmail) {
             $this->senderAddress = $senderEmail;
         }
     }

diff --git a/src/google-authenticator/Security/TwoFactor/Provider/Google/GoogleAuthenticator.php b/src/google-authenticator/Security/TwoFactor/Provider/Google/GoogleAuthenticator.php
@@ -20,7 +20,7 @@ public function __construct(
         /** @var 0|positive-int */
         private int $window,
         /** @var 0|positive-int|null */
-        private null|int $leeway,
+        private int|null $leeway,
     ) {
     }
 

diff --git a/src/google-authenticator/Security/TwoFactor/Provider/Google/GoogleTotpFactory.php b/src/google-authenticator/Security/TwoFactor/Provider/Google/GoogleTotpFactory.php
@@ -32,10 +32,11 @@ public function createTotpForUser(TwoFactorInterface $user): TOTPInterface
         /** @psalm-suppress ArgumentTypeCoercion */
         $totp = TOTP::create($secret, 30, 'sha1', $this->digits);
 
+        /** @psalm-suppress RiskyTruthyFalsyComparison */
         $userAndHost = $user->getGoogleAuthenticatorUsername().($this->server ? '@'.$this->server : '');
         $totp->setLabel($userAndHost);
 
-        if ($this->issuer) {
+        if (null !== $this->issuer && $this->issuer) {
             $totp->setIssuer($this->issuer);
         }
 

diff --git a/src/totp/Security/TwoFactor/Provider/Totp/TotpAuthenticator.php b/src/totp/Security/TwoFactor/Provider/Totp/TotpAuthenticator.php
@@ -20,7 +20,7 @@ public function __construct(
         /** @var 0|positive-int */
         private int $window,
         /** @var 0|positive-int|null */
-        private null|int $leeway,
+        private int|null $leeway,
     ) {
     }
 

diff --git a/src/totp/Security/TwoFactor/Provider/Totp/TotpFactory.php b/src/totp/Security/TwoFactor/Provider/Totp/TotpFactory.php
@@ -45,10 +45,11 @@ public function createTotpForUser(TwoFactorInterface $user): TOTPInterface
             $totpConfiguration->getDigits()
         );
 
+        /** @psalm-suppress RiskyTruthyFalsyComparison */
         $userAndHost = $user->getTotpAuthenticationUsername().($this->server ? '@'.$this->server : '');
         $totp->setLabel($userAndHost);
 
-        if ($this->issuer) {
+        if (null !== $this->issuer && $this->issuer) {
             $totp->setIssuer($this->issuer);
         }
 

diff --git a/src/trusted-device/Security/TwoFactor/Trusted/TrustedDeviceTokenStorage.php b/src/trusted-device/Security/TwoFactor/Trusted/TrustedDeviceTokenStorage.php
@@ -118,7 +118,7 @@ private function getTrustedTokenList(): array
     private function readTrustedTokenList(): array
     {
         $cookie = $this->readCookieValue();
-        if (!$cookie) {
+        if (null === $cookie || !$cookie) {
             return [];
         }