Fix qa errors

Author: johanib

ci/qa/phpstan-baseline.php

@@ -607,18 +607,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/../../src/Surfnet/StepupRa/RaBundle/Exception/AssertionFailedException.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method Surfnet\\\\StepupRa\\\\RaBundle\\\\Exception\\\\AssertionFailedException\\:\\:getPropertyPath\\(\\) has no return type specified\\.$#',
-	'identifier' => 'missingType.return',
-	'count' => 1,
-	'path' => __DIR__ . '/../../src/Surfnet/StepupRa/RaBundle/Exception/AssertionFailedException.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method Surfnet\\\\StepupRa\\\\RaBundle\\\\Exception\\\\AssertionFailedException\\:\\:getValue\\(\\) has no return type specified\\.$#',
-	'identifier' => 'missingType.return',
-	'count' => 1,
-	'path' => __DIR__ . '/../../src/Surfnet/StepupRa/RaBundle/Exception/AssertionFailedException.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method Surfnet\\\\StepupRa\\\\RaBundle\\\\Form\\\\Extension\\\\RaRoleChoiceList\\:\\:buildChoices\\(\\) return type has no value type specified in iterable type array\\.$#',
 	'identifier' => 'missingType.iterableValue',
@@ -679,12 +667,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/../../src/Surfnet/StepupRa/RaBundle/Security/AuthenticatedIdentity.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method Surfnet\\\\StepupRa\\\\RaBundle\\\\Security\\\\AuthenticatedIdentity\\:\\:eraseCredentials\\(\\) return type has no value type specified in iterable type array\\.$#',
-	'identifier' => 'missingType.iterableValue',
-	'count' => 1,
-	'path' => __DIR__ . '/../../src/Surfnet/StepupRa/RaBundle/Security/AuthenticatedIdentity.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method Surfnet\\\\StepupRa\\\\RaBundle\\\\Security\\\\Authentication\\\\AuthenticatedSessionStateHandler\\:\\:setCurrentRequestUri\\(\\) has no return type specified\\.$#',
 	'identifier' => 'missingType.return',

src/Surfnet/StepupRa/RaBundle/Logger/ProcedureAwareLogger.php

@@ -19,6 +19,7 @@
 namespace Surfnet\StepupRa\RaBundle\Logger;
 
 use Psr\Log\LoggerInterface;
+use Stringable;
 use Surfnet\StepupRa\RaBundle\Exception\RuntimeException;
 
 /**
@@ -40,47 +41,47 @@ public function forProcedure(string $procedure): ProcedureAwareLogger
         return $logger;
     }
 
-    public function emergency($message, array $context = []): void
+    public function emergency(string|Stringable $message, array $context = []): void
     {
         $this->logger->emergency($message, $this->enrichContext($context));
     }
 
-    public function alert($message, array $context = []): void
+    public function alert(string|Stringable $message, array $context = []): void
     {
         $this->logger->alert($message, $this->enrichContext($context));
     }
 
-    public function critical($message, array $context = []): void
+    public function critical(string|Stringable $message, array $context = []): void
     {
         $this->logger->critical($message, $this->enrichContext($context));
     }
 
-    public function error($message, array $context = []): void
+    public function error(string|Stringable $message, array $context = []): void
     {
         $this->logger->error($message, $this->enrichContext($context));
     }
 
-    public function warning($message, array $context = []): void
+    public function warning(string|Stringable $message, array $context = []): void
     {
         $this->logger->warning($message, $this->enrichContext($context));
     }
 
-    public function notice($message, array $context = []): void
+    public function notice(string|Stringable $message, array $context = []): void
     {
         $this->logger->notice($message, $this->enrichContext($context));
     }
 
-    public function info($message, array $context = []): void
+    public function info(string|Stringable $message, array $context = []): void
     {
         $this->logger->info($message, $this->enrichContext($context));
     }
 
-    public function debug($message, array $context = []): void
+    public function debug(string|Stringable $message, array $context = []): void
     {
         $this->logger->debug($message, $this->enrichContext($context));
     }
 
-    public function log($level, $message, array $context = []): void
+    public function log($level, string|Stringable $message, array $context = []): void
     {
         $this->logger->log($level, $message, $this->enrichContext($context));
     }

src/Surfnet/StepupRa/RaBundle/Security/AuthenticatedIdentity.php

@@ -20,6 +20,7 @@
 
 namespace Surfnet\StepupRa\RaBundle\Security;
 
+use LogicException;
 use Surfnet\StepupBundle\Value\Loa;
 use Surfnet\StepupMiddlewareClientBundle\Identity\Dto\Identity;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -95,9 +96,8 @@ public function getSalt(): ?string
     /**
      * @inheritDoc
      */
-    public function eraseCredentials(): array
+    public function eraseCredentials(): void
     {
-        return [];
     }
 
     /**
@@ -111,6 +111,12 @@ public function getOriginalIdentity(): Identity
     public function getUserIdentifier(): string
     {
         $parts = explode(':', $this->originalIdentity->nameId);
-        return end($parts);
+        $identifier = end($parts);
+
+        if ($identifier === false || $identifier === '') {
+            throw new LogicException('Cannot determine user identifier from nameId');
+        }
+
+        return $identifier;
     }
 }

src/Surfnet/StepupRa/RaBundle/Security/Authentication/Handler/FailureHandler.php

@@ -49,7 +49,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
             $exception->getMessageKey(),
             $exception->getMessage(),
         );
-        $this->logger->notice($message);
+        $this->logger?->notice($message);
         // The exception controller is used to show the failed authentication
         return $this->exceptionController->show($request, $exception);
     }

src/Surfnet/StepupRa/RaBundle/Twig/Extensions/Extension/SecondFactorType.php

@@ -19,13 +19,12 @@
 namespace Surfnet\StepupRa\RaBundle\Twig\Extensions\Extension;
 
 use Surfnet\StepupBundle\Service\SecondFactorTypeTranslationService;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
+use Twig\Attribute\AsTwigFilter;
 
-final class SecondFactorType extends AbstractExtension
+final readonly class SecondFactorType
 {
     public function __construct(
-        private readonly SecondFactorTypeTranslationService $translator,
+        private SecondFactorTypeTranslationService $translator,
     ) {
     }
 
@@ -34,13 +33,7 @@ public function getName(): string
         return 'ra.twig.second_factor_type';
     }
 
-    public function getFilters(): array
-    {
-        return [
-            new TwigFilter('trans_second_factor_type', $this->translateSecondFactorType(...)),
-        ];
-    }
-
+    #[AsTwigFilter(name: 'trans_second_factor_type')]
     public function translateSecondFactorType($secondFactorType): string
     {
         return $this->translator->translate($secondFactorType, 'ra.second_factor.search.type.%s');