Merge pull request #3077 from stof/bump_min_version

stof · web-flow · commit b020a018ea62 · 2024-06-24T19:43:46.000+02:00
Bump min versions to Symfony 6.4 and PHP 8.1
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,19 +15,11 @@ jobs:
             fail-fast: false
             matrix:
                 php:
-                    - '7.4'
-                    - '8.0'
                     - '8.1'
                     - '8.2'
                     - '8.3'
                 symfony-versions: [false]
                 include:
-                    -   description: 'Symfony 4.*'
-                        php: '7.4'
-                        symfony-versions: '^4.4'
-                    -   description: 'Symfony 5.*'
-                        php: '8.1'
-                        symfony-versions: '^5.4'
                     -   description: 'Symfony 6.*'
                         php: '8.2'
                         symfony-versions: '^6.4'
diff --git a/composer.json b/composer.json
@@ -21,41 +21,42 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.1",
         "ext-dom": "*",
         "ext-json": "*",
-        "symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/config": "^6.4 || ^7.0",
+        "symfony/dependency-injection": "^6.4 || ^7.0",
         "symfony/deprecation-contracts": "^2.5 || ^3.5",
-        "symfony/event-dispatcher": "^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/event-dispatcher": "^6.4 || ^7.0",
         "symfony/event-dispatcher-contracts": "^1.1 || ^2.0 || ^3.0",
-        "symfony/form": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/http-foundation": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/options-resolver": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/routing": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/security-bundle": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/security-core": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/translation": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/twig-bundle": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/validator": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "twig/twig": "^1.34 || ^2.4 || ^3.0"
+        "symfony/form": "^6.4 || ^7.0",
+        "symfony/framework-bundle": "^6.4 || ^7.0",
+        "symfony/http-foundation": "^6.4 || ^7.0",
+        "symfony/http-kernel": "^6.4 || ^7.0",
+        "symfony/options-resolver": "^6.4 || ^7.0",
+        "symfony/password-hasher": "^6.4 || ^7.0",
+        "symfony/routing": "^6.4 || ^7.0",
+        "symfony/security-bundle": "^6.4 || ^7.0",
+        "symfony/security-core": "^6.4 || ^7.0",
+        "symfony/translation": "^6.4 || ^7.0",
+        "symfony/twig-bundle": "^6.4 || ^7.0",
+        "symfony/validator": "^6.4 || ^7.0",
+        "twig/twig": "^2.13 || ^3.0"
     },
     "conflict": {
         "doctrine/doctrine-bundle": "<1.3",
         "doctrine/persistence": "<1.3",
-        "symfony/doctrine-bridge": "<4.4"
+        "symfony/doctrine-bridge": "<6.4"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^1.3 || ^2",
         "friendsofphp/php-cs-fixer": "^3.0.2, !=3.5.0",
         "swiftmailer/swiftmailer": "^4.3 || ^5.0 || ^6.0",
-        "symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/mailer": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/mime": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/phpunit-bridge": "^6.1",
-        "symfony/yaml": "^4.4 || ^5.0 || ^6.0 || ^7.0"
+        "symfony/console": "^6.4 || ^7.0",
+        "symfony/mailer": "^6.4 || ^7.0",
+        "symfony/mime": "^6.4 || ^7.0",
+        "symfony/phpunit-bridge": "^6.4 || ^7.0",
+        "symfony/yaml": "^6.4 || ^7.0"
     },
     "config": {
         "sort-packages": true
diff --git a/src/Command/ActivateUserCommand.php b/src/Command/ActivateUserCommand.php
@@ -28,9 +28,6 @@
 #[AsCommand(name: 'fos:user:activate', description: 'Activate a user')]
 final class ActivateUserCommand extends Command
 {
-    // BC with Symfony <5.3
-    protected static $defaultName = 'fos:user:activate';
-
     private $userManipulator;
 
     public function __construct(UserManipulator $userManipulator)
@@ -43,9 +40,6 @@ public function __construct(UserManipulator $userManipulator)
     protected function configure(): void
     {
         $this
-            // BC with Symfony <5.3
-            ->setName('fos:user:activate')
-            ->setDescription('Activate a user')
             ->setDefinition([
                 new InputArgument('username', InputArgument::REQUIRED, 'The username'),
             ])
diff --git a/src/Command/ChangePasswordCommand.php b/src/Command/ChangePasswordCommand.php
@@ -26,9 +26,6 @@
 #[AsCommand(name: 'fos:user:change-password', description: 'Change the password of a user.')]
 final class ChangePasswordCommand extends Command
 {
-    // BC with Symfony <5.3
-    protected static $defaultName = 'fos:user:change-password';
-
     private $userManipulator;
 
     public function __construct(UserManipulator $userManipulator)
@@ -41,9 +38,6 @@ public function __construct(UserManipulator $userManipulator)
     protected function configure(): void
     {
         $this
-            // BC with Symfony <5.3
-            ->setName('fos:user:change-password')
-            ->setDescription('Change the password of a user.')
             ->setDefinition([
                 new InputArgument('username', InputArgument::REQUIRED, 'The username'),
                 new InputArgument('password', InputArgument::REQUIRED, 'The password'),
diff --git a/src/Command/CreateUserCommand.php b/src/Command/CreateUserCommand.php
@@ -31,9 +31,6 @@
 #[AsCommand(name: 'fos:user:create', description: 'Create a user.')]
 final class CreateUserCommand extends Command
 {
-    // BC with Symfony <5.3
-    protected static $defaultName = 'fos:user:create';
-
     private $userManipulator;
 
     public function __construct(UserManipulator $userManipulator)
@@ -46,9 +43,6 @@ public function __construct(UserManipulator $userManipulator)
     protected function configure(): void
     {
         $this
-            // BC with Symfony <5.3
-            ->setName('fos:user:create')
-            ->setDescription('Create a user.')
             ->setDefinition([
                 new InputArgument('username', InputArgument::REQUIRED, 'The username'),
                 new InputArgument('email', InputArgument::REQUIRED, 'The email'),
diff --git a/src/Command/DeactivateUserCommand.php b/src/Command/DeactivateUserCommand.php
@@ -28,9 +28,6 @@
 #[AsCommand(name: 'fos:user:deactivate', description: 'Deactivate a user')]
 final class DeactivateUserCommand extends Command
 {
-    // BC with Symfony <5.3
-    protected static $defaultName = 'fos:user:deactivate';
-
     private $userManipulator;
 
     public function __construct(UserManipulator $userManipulator)
@@ -43,9 +40,6 @@ public function __construct(UserManipulator $userManipulator)
     protected function configure(): void
     {
         $this
-            // BC with Symfony <5.3
-            ->setName('fos:user:deactivate')
-            ->setDescription('Deactivate a user')
             ->setDefinition([
                 new InputArgument('username', InputArgument::REQUIRED, 'The username'),
             ])
diff --git a/src/Command/DemoteUserCommand.php b/src/Command/DemoteUserCommand.php
@@ -24,17 +24,11 @@
 #[AsCommand(name: 'fos:user:demote', description: 'Demote a user by removing a role')]
 final class DemoteUserCommand extends RoleCommand
 {
-    // BC with Symfony <5.3
-    protected static $defaultName = 'fos:user:demote';
-
     protected function configure(): void
     {
         parent::configure();
 
         $this
-            // BC with Symfony <5.3
-            ->setName('fos:user:demote')
-            ->setDescription('Demote a user by removing a role')
             ->setHelp(<<<'EOT'
 The <info>fos:user:demote</info> command demotes a user by removing a role
 
diff --git a/src/Command/PromoteUserCommand.php b/src/Command/PromoteUserCommand.php
@@ -26,17 +26,11 @@
 #[AsCommand(name: 'fos:user:promote', description: 'Promotes a user by adding a role')]
 final class PromoteUserCommand extends RoleCommand
 {
-    // BC with Symfony <5.3
-    protected static $defaultName = 'fos:user:promote';
-
     protected function configure(): void
     {
         parent::configure();
 
         $this
-            // BC with Symfony <5.3
-            ->setName('fos:user:promote')
-            ->setDescription('Promotes a user by adding a role')
             ->setHelp(<<<'EOT'
 The <info>fos:user:promote</info> command promotes a user by adding a role
 
diff --git a/src/CompatibilityUtil.php b/src/CompatibilityUtil.php
diff --git a/src/Controller/ChangePasswordController.php b/src/Controller/ChangePasswordController.php
@@ -11,7 +11,6 @@
 
 namespace FOS\UserBundle\Controller;
 
-use FOS\UserBundle\CompatibilityUtil;
 use FOS\UserBundle\Event\FilterUserResponseEvent;
 use FOS\UserBundle\Event\FormEvent;
 use FOS\UserBundle\Event\GetResponseUserEvent;
@@ -40,7 +39,7 @@ final class ChangePasswordController extends AbstractController
 
     public function __construct(EventDispatcherInterface $eventDispatcher, FactoryInterface $formFactory, UserManagerInterface $userManager)
     {
-        $this->eventDispatcher = CompatibilityUtil::upgradeEventDispatcher($eventDispatcher);
+        $this->eventDispatcher = $eventDispatcher;
         $this->formFactory = $formFactory;
         $this->userManager = $userManager;
     }
diff --git a/src/Controller/ProfileController.php b/src/Controller/ProfileController.php
@@ -11,7 +11,6 @@
 
 namespace FOS\UserBundle\Controller;
 
-use FOS\UserBundle\CompatibilityUtil;
 use FOS\UserBundle\Event\FilterUserResponseEvent;
 use FOS\UserBundle\Event\FormEvent;
 use FOS\UserBundle\Event\GetResponseUserEvent;
@@ -39,7 +38,7 @@ final class ProfileController extends AbstractController
 
     public function __construct(EventDispatcherInterface $eventDispatcher, FactoryInterface $formFactory, UserManagerInterface $userManager)
     {
-        $this->eventDispatcher = CompatibilityUtil::upgradeEventDispatcher($eventDispatcher);
+        $this->eventDispatcher = $eventDispatcher;
         $this->formFactory = $formFactory;
         $this->userManager = $userManager;
     }
diff --git a/src/Controller/RegistrationController.php b/src/Controller/RegistrationController.php
@@ -11,7 +11,6 @@
 
 namespace FOS\UserBundle\Controller;
 
-use FOS\UserBundle\CompatibilityUtil;
 use FOS\UserBundle\Event\FilterUserResponseEvent;
 use FOS\UserBundle\Event\FormEvent;
 use FOS\UserBundle\Event\GetResponseUserEvent;
@@ -43,7 +42,7 @@ final class RegistrationController extends AbstractController
 
     public function __construct(EventDispatcherInterface $eventDispatcher, FactoryInterface $formFactory, UserManagerInterface $userManager, TokenStorageInterface $tokenStorage)
     {
-        $this->eventDispatcher = CompatibilityUtil::upgradeEventDispatcher($eventDispatcher);
+        $this->eventDispatcher = $eventDispatcher;
         $this->formFactory = $formFactory;
         $this->userManager = $userManager;
         $this->tokenStorage = $tokenStorage;
@@ -178,9 +177,6 @@ private function getTargetUrlFromSession(SessionInterface $session): ?string
 
         if (method_exists($token, 'getFirewallName')) {
             $firewallName = $token->getFirewallName();
-        } elseif (method_exists($token, 'getProviderKey')) {
-            // BC with Symfony 5.x
-            $firewallName = $token->getProviderKey();
         } else {
             return null;
         }
diff --git a/src/Controller/ResettingController.php b/src/Controller/ResettingController.php
@@ -11,7 +11,6 @@
 
 namespace FOS\UserBundle\Controller;
 
-use FOS\UserBundle\CompatibilityUtil;
 use FOS\UserBundle\Event\FilterUserResponseEvent;
 use FOS\UserBundle\Event\FormEvent;
 use FOS\UserBundle\Event\GetResponseNullableUserEvent;
@@ -51,7 +50,7 @@ final class ResettingController extends AbstractController
      */
     public function __construct(EventDispatcherInterface $eventDispatcher, FactoryInterface $formFactory, UserManagerInterface $userManager, TokenGeneratorInterface $tokenGenerator, MailerInterface $mailer, $retryTtl)
     {
-        $this->eventDispatcher = CompatibilityUtil::upgradeEventDispatcher($eventDispatcher);
+        $this->eventDispatcher = $eventDispatcher;
         $this->formFactory = $formFactory;
         $this->userManager = $userManager;
         $this->tokenGenerator = $tokenGenerator;
diff --git a/src/DependencyInjection/Compiler/ConfigurePasswordHasherPass.php b/src/DependencyInjection/Compiler/ConfigurePasswordHasherPass.php
diff --git a/src/DependencyInjection/Compiler/InjectRememberMeServicesPass.php b/src/DependencyInjection/Compiler/InjectRememberMeServicesPass.php
@@ -32,10 +32,6 @@ public function process(ContainerBuilder $container): void
 
         if ($container->has('security.authenticator.remember_me_handler.'.$firewallName)) {
             $loginManager->replaceArgument(4, new Reference('security.authenticator.remember_me_handler.'.$firewallName));
-        } elseif ($container->hasDefinition('security.authentication.rememberme.services.persistent.'.$firewallName)) {
-            $loginManager->replaceArgument(4, new Reference('security.authentication.rememberme.services.persistent.'.$firewallName));
-        } elseif ($container->hasDefinition('security.authentication.rememberme.services.simplehash.'.$firewallName)) {
-            $loginManager->replaceArgument(4, new Reference('security.authentication.rememberme.services.simplehash.'.$firewallName));
         }
     }
 }
diff --git a/src/EventListener/AuthenticationListener.php b/src/EventListener/AuthenticationListener.php
@@ -11,7 +11,6 @@
 
 namespace FOS\UserBundle\EventListener;
 
-use FOS\UserBundle\CompatibilityUtil;
 use FOS\UserBundle\Event\FilterUserResponseEvent;
 use FOS\UserBundle\Event\UserEvent;
 use FOS\UserBundle\FOSUserEvents;
@@ -62,7 +61,6 @@ public static function getSubscribedEvents(): array
      */
     public function authenticate(FilterUserResponseEvent $event, $eventName, EventDispatcherInterface $eventDispatcher)
     {
-        $eventDispatcher = CompatibilityUtil::upgradeEventDispatcher($eventDispatcher);
         try {
             $this->loginManager->logInUser($this->firewallName, $event->getUser(), $event->getResponse());
 
diff --git a/src/FOSUserBundle.php b/src/FOSUserBundle.php
@@ -15,7 +15,6 @@
 use Doctrine\Bundle\MongoDBBundle\DependencyInjection\Compiler\DoctrineMongoDBMappingsPass;
 use FOS\UserBundle\DependencyInjection\Compiler\CheckForSessionPass;
 use FOS\UserBundle\DependencyInjection\Compiler\CheckForSwiftMailerPass;
-use FOS\UserBundle\DependencyInjection\Compiler\ConfigurePasswordHasherPass;
 use FOS\UserBundle\DependencyInjection\Compiler\InjectRememberMeServicesPass;
 use FOS\UserBundle\DependencyInjection\Compiler\InjectUserCheckerPass;
 use FOS\UserBundle\DependencyInjection\Compiler\ValidationPass;
@@ -31,7 +30,6 @@ final class FOSUserBundle extends Bundle
     public function build(ContainerBuilder $container): void
     {
         parent::build($container);
-        $container->addCompilerPass(new ConfigurePasswordHasherPass());
         $container->addCompilerPass(new ValidationPass());
         $container->addCompilerPass(new InjectUserCheckerPass());
         $container->addCompilerPass(new InjectRememberMeServicesPass());
diff --git a/src/Model/UserInterface.php b/src/Model/UserInterface.php
diff --git a/src/Security/LoginManager.php b/src/Security/LoginManager.php
diff --git a/src/Util/UserManipulator.php b/src/Util/UserManipulator.php
diff --git a/tests/Util/CanonicalizerTest.php b/tests/Util/CanonicalizerTest.php
diff --git a/tests/Util/PasswordUpdaterTest.php b/tests/Util/PasswordUpdaterTest.php

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace FOS\UserBundle\Controller;`
`13`	`13`
`14`		`-use FOS\UserBundle\CompatibilityUtil;`
`15`	`14`	`use FOS\UserBundle\Event\FilterUserResponseEvent;`
`16`	`15`	`use FOS\UserBundle\Event\FormEvent;`
`17`	`16`	`use FOS\UserBundle\Event\GetResponseUserEvent;`
`@@ -40,7 +39,7 @@ final class ChangePasswordController extends AbstractController`
`40`	`39`
`41`	`40`	`public function __construct(EventDispatcherInterface $eventDispatcher, FactoryInterface $formFactory, UserManagerInterface $userManager)`
`42`	`41`	`{`
`43`		`- $this->eventDispatcher = CompatibilityUtil::upgradeEventDispatcher($eventDispatcher);`
	`42`	`+ $this->eventDispatcher = $eventDispatcher;`
`44`	`43`	`$this->formFactory = $formFactory;`
`45`	`44`	`$this->userManager = $userManager;`
`46`	`45`	`}`