Code optimizations from Psalm

Author: scheb

Controller/FormController.php

@@ -64,6 +64,10 @@ public function form(Request $request): Response
         $this->setPreferredProvider($request, $token);
 
         $providerName = $token->getCurrentTwoFactorProvider();
+        if (null === $providerName) {
+            throw new AccessDeniedException('User is not in a two-factor authentication process.');
+        }
+
         $renderer = $this->providerRegistry->getProvider($providerName)->getFormRenderer();
         $templateVars = $this->getTemplateVars($request, $token);
 

DependencyInjection/Compiler/AuthenticationProviderDecoratorCompilerPass.php

@@ -15,6 +15,9 @@
  */
 class AuthenticationProviderDecoratorCompilerPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $authenticationManager = $container->getDefinition('security.authentication.manager');

DependencyInjection/Compiler/RememberMeServicesDecoratorCompilerPass.php

@@ -18,6 +18,9 @@ class RememberMeServicesDecoratorCompilerPass implements CompilerPassInterface
 {
     private const REMEMBER_ME_LISTENER_ID_PREFIX = 'security.authentication.listener.rememberme.';
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         // Find all remember-me listener definitions

DependencyInjection/Compiler/TwoFactorFirewallConfigCompilerPass.php

@@ -14,6 +14,9 @@
  */
 class TwoFactorFirewallConfigCompilerPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('scheb_two_factor.firewall_context')) {

DependencyInjection/Compiler/TwoFactorProviderCompilerPass.php

@@ -15,6 +15,9 @@
  */
 class TwoFactorProviderCompilerPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('scheb_two_factor.provider_registry')) {

DependencyInjection/Configuration.php

@@ -17,9 +17,14 @@ public function getConfigTreeBuilder()
             $rootNode = $treeBuilder->getRootNode();
         } else {
             // BC layer for symfony/config 4.1 and older
+            /** @psalm-suppress UndefinedMethod */
             $rootNode = $treeBuilder->root('scheb_two_factor');
         }
 
+        /**
+         * @psalm-suppress PossiblyNullReference
+         * @psalm-suppress PossiblyUndefinedMethod
+         */
         $rootNode
             ->children()
                 ->scalarNode('persister')->defaultNull()->end()

DependencyInjection/Factory/Security/TwoFactorFactory.php

@@ -50,10 +50,18 @@ class TwoFactorFactory implements SecurityFactoryInterface
     public const PROVIDER_PREPARATION_LISTENER_DEFINITION_ID = 'scheb_two_factor.security.provider_preparation_listener';
     public const AUTHENTICATION_SUCCESS_EVENT_SUPPRESSOR_ID = 'scheb_two_factor.security.authentication_success_event_suppressor';
 
+    /**
+     * @return void
+     */
     public function addConfiguration(NodeDefinition $node)
     {
         /** @var ArrayNodeDefinition $node */
         $builder = $node->children();
+
+        /**
+         * @psalm-suppress PossiblyNullReference
+         * @psalm-suppress PossiblyUndefinedMethod
+         */
         $builder
             ->scalarNode('check_path')->defaultValue(self::DEFAULT_CHECK_PATH)->end()
             ->scalarNode('auth_form_path')->defaultValue(self::DEFAULT_AUTH_FORM_PATH)->end()
@@ -75,13 +83,21 @@ public function addConfiguration(NodeDefinition $node)
         ;
     }
 
-    public function create(ContainerBuilder $container, $firewallName, $config, $userProvider, $defaultEntryPoint)
+    /**
+     * @param string $id
+     * @param array $config
+     * @param string $userProvider
+     * @param string|null $defaultEntryPoint
+     *
+     * @return array
+     */
+    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
     {
-        $providerId = $this->createAuthenticationProvider($container, $firewallName, $config);
-        $listenerId = $this->createAuthenticationListener($container, $firewallName, $config);
-        $this->createProviderPreparationListener($container, $firewallName, $config);
-        $this->createAuthenticationSuccessEventSuppressor($container, $firewallName, $config);
-        $this->createTwoFactorFirewallConfig($container, $firewallName, $config);
+        $providerId = $this->createAuthenticationProvider($container, $id, $config);
+        $listenerId = $this->createAuthenticationListener($container, $id, $config);
+        $this->createProviderPreparationListener($container, $id, $config);
+        $this->createAuthenticationSuccessEventSuppressor($container, $id);
+        $this->createTwoFactorFirewallConfig($container, $id, $config);
 
         return [$providerId, $listenerId, $defaultEntryPoint];
     }
@@ -213,7 +229,7 @@ private function createProviderPreparationListener(ContainerBuilder $container,
             ->addTag('kernel.event_listener', ['event' => 'kernel.finish_request', 'method' => 'onKernelFinishRequest']);
     }
 
-    private function createAuthenticationSuccessEventSuppressor(ContainerBuilder $container, string $firewallName, array $config): void
+    private function createAuthenticationSuccessEventSuppressor(ContainerBuilder $container, string $firewallName): void
     {
         $firewallConfigId = self::AUTHENTICATION_SUCCESS_EVENT_SUPPRESSOR_ID_PREFIX.$firewallName;
         $container

DependencyInjection/SchebTwoFactorExtension.php

@@ -14,6 +14,9 @@ class SchebTwoFactorExtension extends Extension
     const DEFAULT_TRUSTED_DEVICE_MANAGER = 'scheb_two_factor.default_trusted_device_manager';
     const DEFAULT_BACKUP_CODE_MANAGER = 'scheb_two_factor.default_backup_code_manager';
 
+    /**
+     * @return void
+     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();

Model/Persister/DoctrinePersisterFactory.php

@@ -15,7 +15,7 @@ class DoctrinePersisterFactory
     private $managerRegistry;
 
     /**
-     * @var string
+     * @var string|null
      */
     private $objectManagerName;
 
@@ -33,6 +33,10 @@ public function __construct(?ManagerRegistry $managerRegistry, ?string $objectMa
 
     public function getPersister(): PersisterInterface
     {
-        return new DoctrinePersister($this->managerRegistry->getManager($this->objectManagerName));
+        $objectManager = $this->managerRegistry->getManager($this->objectManagerName);
+        /** @psalm-suppress ArgumentTypeCoercion */
+        $persister = new DoctrinePersister($objectManager);
+
+        return $persister;
     }
 }

Model/Totp/TotpConfiguration.php

@@ -58,7 +58,8 @@ private static function isValidAlgorithm(string $algorithm): bool
                 self::ALGORITHM_SHA1,
                 self::ALGORITHM_SHA256,
                 self::ALGORITHM_SHA512,
-            ]
+            ],
+            true
         );
     }