Merge pull request #3092 from stof/avoid_deprecation

Fix Symfony deprecations

Author: stof

src/Form/Type/ChangePasswordFormType.php

@@ -36,12 +36,10 @@ public function __construct($class)
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $constraintsOptions = [
-            'message' => 'fos_user.current_password.invalid',
-        ];
+        $groups = null;
 
         if (!empty($options['validation_groups'])) {
-            $constraintsOptions['groups'] = [reset($options['validation_groups'])];
+            $groups = [reset($options['validation_groups'])];
         }
 
         $builder->add('current_password', PasswordType::class, [
@@ -50,7 +48,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'mapped' => false,
             'constraints' => [
                 new NotBlank(),
-                new UserPassword($constraintsOptions),
+                new UserPassword(message: 'fos_user.current_password.invalid', groups: $groups),
             ],
             'attr' => [
                 'autocomplete' => 'current-password',

src/Form/Type/ProfileFormType.php

@@ -38,12 +38,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $this->buildUserForm($builder, $options);
 
-        $constraintsOptions = [
-            'message' => 'fos_user.current_password.invalid',
-        ];
+        $groups = null;
 
         if (!empty($options['validation_groups'])) {
-            $constraintsOptions['groups'] = [reset($options['validation_groups'])];
+            $groups = [reset($options['validation_groups'])];
         }
 
         $builder->add('current_password', PasswordType::class, [
@@ -52,7 +50,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'mapped' => false,
             'constraints' => [
                 new NotBlank(),
-                new UserPassword($constraintsOptions),
+                new UserPassword(message: 'fos_user.current_password.invalid', groups: $groups),
             ],
             'attr' => [
                 'autocomplete' => 'current-password',

src/Security/UserChecker.php

@@ -12,6 +12,7 @@
 namespace FOS\UserBundle\Security;
 
 use FOS\UserBundle\Model\UserInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\DisabledException;
 use Symfony\Component\Security\Core\User\UserCheckerInterface;
 use Symfony\Component\Security\Core\User\UserInterface as BaseUserInterface;
@@ -20,6 +21,8 @@
  * UserChecker checks the user account flags.
  *
  * @author Julian Finkler (Devtronic) <julian@developer-heaven.de>
+ *
+ * @final
  */
 class UserChecker implements UserCheckerInterface
 {
@@ -32,7 +35,7 @@ public function checkPreAuth(BaseUserInterface $user): void
         }
     }
 
-    public function checkPostAuth(BaseUserInterface $user): void
+    public function checkPostAuth(BaseUserInterface $user, ?TokenInterface $token = null): void
     {
     }
 }

src/Util/HashingPasswordUpdater.php

@@ -50,6 +50,6 @@ public function hashPassword(UserInterface $user): void
         }
 
         $user->setPassword($hashedPassword);
-        $user->eraseCredentials();
+        $user->setPlainPassword(null);
     }
 }

tests/Command/ActivateUserCommandTest.php

@@ -67,7 +67,7 @@ private function createCommandTester(UserManipulator $manipulator, ?Application
 
         $command = new ActivateUserCommand($manipulator);
 
-        $application->add($command);
+        $application->addCommands([$command]);
 
         return new CommandTester($application->find('fos:user:activate'));
     }

tests/Command/ChangePasswordCommandTest.php

@@ -68,7 +68,7 @@ private function createCommandTester(UserManipulator $userManipulator, ?Applicat
 
         $command = new ChangePasswordCommand($userManipulator);
 
-        $application->add($command);
+        $application->addCommands([$command]);
 
         return new CommandTester($application->find('fos:user:change-password'));
     }

tests/Command/CreateUserCommandTest.php

@@ -71,7 +71,7 @@ private function createCommandTester(UserManipulator $manipulator, ?Application
 
         $command = new CreateUserCommand($manipulator);
 
-        $application->add($command);
+        $application->addCommands([$command]);
 
         return new CommandTester($application->find('fos:user:create'));
     }

tests/Command/DeactivateUserCommandTest.php

@@ -67,7 +67,7 @@ private function createCommandTester(UserManipulator $manipulator, ?Application
 
         $command = new DeactivateUserCommand($manipulator);
 
-        $application->add($command);
+        $application->addCommands([$command]);
 
         return new CommandTester($application->find('fos:user:deactivate'));
     }

tests/Command/DemoteUserCommandTest.php

@@ -68,7 +68,7 @@ private function createCommandTester(UserManipulator $manipulator, ?Application
 
         $command = new DemoteUserCommand($manipulator);
 
-        $application->add($command);
+        $application->addCommands([$command]);
 
         return new CommandTester($application->find('fos:user:demote'));
     }

tests/Command/PromoteUserCommandTest.php

@@ -68,7 +68,7 @@ private function createCommandTester(UserManipulator $manipulator, ?Application
 
         $command = new PromoteUserCommand($manipulator);
 
-        $application->add($command);
+        $application->addCommands([$command]);
 
         return new CommandTester($application->find('fos:user:promote'));
     }