Fix non-critical phpstan issues

nucleos · Mar 10, 2024 · 311868b · 311868b
1 parent 3cfd230
commit 311868b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -35,6 +35,9 @@
         'phpdoc_types_order' => [
             'null_adjustment' => 'always_last',
         ],
+        'phpdoc_to_comment' => [
+            'ignored_tags' => ['psalm-suppress'],
+        ],
         'php_unit_internal_class' => false,
         'php_unit_test_class_requires_covers' => false,
         'no_superfluous_phpdoc_tags' => [

diff --git a/src/Action/ResetAction.php b/src/Action/ResetAction.php
@@ -115,11 +115,15 @@ public function __invoke(Request $request, string $token): Response
 
     private function changePassword(UserInterface $user, Resetting $formModel): void
     {
-        $user->setPlainPassword($formModel->getPlainPassword());
+        $password = $formModel->getPlainPassword();
+
+        \assert(null !== $password);
+
+        $user->setPlainPassword($password);
         $this->userManager->updateUser($user);
 
         if (null !== $this->userManipulator) {
-            $this->userManipulator->changePassword($user->getUsername(), $formModel->getPlainPassword());
+            $this->userManipulator->changePassword($user->getUsername(), $password);
         }
     }
 }
diff --git a/src/DependencyInjection/NucleosUserExtension.php b/src/DependencyInjection/NucleosUserExtension.php
@@ -31,7 +31,7 @@
 final class NucleosUserExtension extends Extension implements PrependExtensionInterface
 {
     /**
-     * @var array<string, array<string, string>>
+     * @var array<array{registry: string, tag: string, events: string[]}>
      */
     private static array $doctrineDrivers = [
         'orm'     => [
@@ -103,10 +103,6 @@ public function load(array $configs, ContainerBuilder $container): void
 
         if ($config['use_listener'] && isset(self::$doctrineDrivers[$config['db_driver']])) {
             $listenerDefinition = $container->getDefinition('nucleos_user.user_listener');
-            if (isset(self::$doctrineDrivers[$config['db_driver']]['listener_class'])) {
-                $listenerDefinition->setClass(self::$doctrineDrivers[$config['db_driver']]['listener_class']);
-            }
-
             foreach (self::$doctrineDrivers[$config['db_driver']]['events'] as $event) {
                 $listenerDefinition->addTag(self::$doctrineDrivers[$config['db_driver']]['tag'], ['event' => $event]);
             }

diff --git a/src/NucleosUserBundle.php b/src/NucleosUserBundle.php
@@ -39,8 +39,8 @@ private function addRegisterMappingsPass(ContainerBuilder $container): void
         if (class_exists(DoctrineOrmMappingsPass::class)) {
             $container->addCompilerPass(DoctrineOrmMappingsPass::createXmlMappingDriver($mappings, ['nucleos_user.model_manager_name'], 'nucleos_user.backend_type_orm'));
         }
-
         if (class_exists(DoctrineMongoDBMappingsPass::class)) {
+            /** @psalm-suppress InternalClass, InternalMethod */
             $container->addCompilerPass(DoctrineMongoDBMappingsPass::createXmlMappingDriver($mappings, ['nucleos_user.model_manager_name'], 'nucleos_user.backend_type_mongodb'));
         }
     }

diff --git a/src/Validator/Constraints/Pattern.php b/src/Validator/Constraints/Pattern.php
@@ -43,8 +43,6 @@ final class Pattern extends Constraint
 
     /**
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     *
-     * @param array<string, mixed> $options
      */
     public function __construct(
         mixed $options = null,