Merge pull request #3008 from stof/remove_unmaintained_deps

Remove support for unmaintained versions

Author: stof

.gitattributes

@@ -1,7 +1,7 @@
 /.github         export-ignore
 /.gitattributes   export-ignore
 /.gitignore       export-ignore
-/.php_cs.dist	    export-ignore
+/.php-cs-fixer.dist.php export-ignore
 /.travis.yml      export-ignore
 /Changelog.md     export-ignore
 /Makefile         export-ignore

.github/workflows/ci.yaml

@@ -14,24 +14,16 @@ jobs:
             fail-fast: false
             matrix:
                 php:
-                    - '5.5'
-                    - '5.6'
                     - '7.1'
                     - '7.2'
                     - '7.3'
                     - '7.4'
                     - '8.0'
                 symfony-versions: [false]
                 include:
-                    -   description: 'Symfony 2.*'
-                        php: '5.6'
-                        symfony-versions: '^2.8'
-                    -   description: 'Symfony 3.*'
-                        php: '7.4'
-                        symfony-versions: '^3.0'
                     -   description: 'Symfony 4.*'
                         php: '7.4'
-                        symfony-versions: '^4.0'
+                        symfony-versions: '^4.4'
         name: PHP ${{ matrix.php }} ${{ matrix.description }}
         steps:
             - name: Checkout

.github/workflows/static-analysis.yaml

@@ -3,7 +3,7 @@ name: Code style and composer validate
 on:
     pull_request:
     push:
-        branches: [ master ]
+        branches: [ master, 2.x ]
 
 jobs:
     composer-validate:

.gitignore

@@ -1,5 +1,5 @@
-.php_cs
-.php_cs.cache
+.php-cs-fixer.php
+.php-cs-fixer.cache
 composer.lock
 phpunit.xml
 vendor/

.php_cs.dist .php-cs-fixer.dist.php.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -9,7 +9,7 @@
 file that was distributed with this source code.
 EOF;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@Symfony' => true,
         'array_syntax' => ['syntax' => 'short'],

DependencyInjection/Configuration.php

@@ -32,12 +32,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('fos_user');
-
-        if (method_exists($treeBuilder, 'getRootNode')) {
-            $rootNode = $treeBuilder->getRootNode();
-        } else {
-            $rootNode = $treeBuilder->root('fos_user');
-        }
+        $rootNode = $treeBuilder->getRootNode();
 
         $supportedDrivers = ['orm', 'mongodb', 'couchdb', 'custom'];
 

Doctrine/UserListener.php

@@ -12,10 +12,10 @@
 namespace FOS\UserBundle\Doctrine;
 
 use Doctrine\Common\EventSubscriber;
-use Doctrine\Persistence\Event\LifecycleEventArgs;
-use Doctrine\Persistence\ObjectManager;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ORM\EntityManager;
+use Doctrine\Persistence\Event\LifecycleEventArgs;
+use Doctrine\Persistence\ObjectManager;
 use FOS\UserBundle\Model\UserInterface;
 use FOS\UserBundle\Util\CanonicalFieldsUpdater;
 use FOS\UserBundle\Util\PasswordUpdaterInterface;

FOSUserEvents.php

@@ -23,7 +23,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\GetResponseUserEvent")
      */
-    const CHANGE_PASSWORD_INITIALIZE = 'fos_user.change_password.edit.initialize';
+    public const CHANGE_PASSWORD_INITIALIZE = 'fos_user.change_password.edit.initialize';
 
     /**
      * The CHANGE_PASSWORD_SUCCESS event occurs when the change password form is submitted successfully.
@@ -32,7 +32,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FormEvent")
      */
-    const CHANGE_PASSWORD_SUCCESS = 'fos_user.change_password.edit.success';
+    public const CHANGE_PASSWORD_SUCCESS = 'fos_user.change_password.edit.success';
 
     /**
      * The CHANGE_PASSWORD_COMPLETED event occurs after saving the user in the change password process.
@@ -41,7 +41,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FilterUserResponseEvent")
      */
-    const CHANGE_PASSWORD_COMPLETED = 'fos_user.change_password.edit.completed';
+    public const CHANGE_PASSWORD_COMPLETED = 'fos_user.change_password.edit.completed';
 
     /**
      * The GROUP_CREATE_INITIALIZE event occurs when the group creation process is initialized.
@@ -50,7 +50,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\GroupEvent")
      */
-    const GROUP_CREATE_INITIALIZE = 'fos_user.group.create.initialize';
+    public const GROUP_CREATE_INITIALIZE = 'fos_user.group.create.initialize';
 
     /**
      * The GROUP_CREATE_SUCCESS event occurs when the group creation form is submitted successfully.
@@ -59,7 +59,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FormEvent")
      */
-    const GROUP_CREATE_SUCCESS = 'fos_user.group.create.success';
+    public const GROUP_CREATE_SUCCESS = 'fos_user.group.create.success';
 
     /**
      * The GROUP_CREATE_COMPLETED event occurs after saving the group in the group creation process.
@@ -68,7 +68,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FilterGroupResponseEvent")
      */
-    const GROUP_CREATE_COMPLETED = 'fos_user.group.create.completed';
+    public const GROUP_CREATE_COMPLETED = 'fos_user.group.create.completed';
 
     /**
      * The GROUP_DELETE_COMPLETED event occurs after deleting the group.
@@ -77,7 +77,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FilterGroupResponseEvent")
      */
-    const GROUP_DELETE_COMPLETED = 'fos_user.group.delete.completed';
+    public const GROUP_DELETE_COMPLETED = 'fos_user.group.delete.completed';
 
     /**
      * The GROUP_EDIT_INITIALIZE event occurs when the group editing process is initialized.
@@ -86,7 +86,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\GetResponseGroupEvent")
      */
-    const GROUP_EDIT_INITIALIZE = 'fos_user.group.edit.initialize';
+    public const GROUP_EDIT_INITIALIZE = 'fos_user.group.edit.initialize';
 
     /**
      * The GROUP_EDIT_SUCCESS event occurs when the group edit form is submitted successfully.
@@ -95,7 +95,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FormEvent")
      */
-    const GROUP_EDIT_SUCCESS = 'fos_user.group.edit.success';
+    public const GROUP_EDIT_SUCCESS = 'fos_user.group.edit.success';
 
     /**
      * The GROUP_EDIT_COMPLETED event occurs after saving the group in the group edit process.
@@ -104,7 +104,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FilterGroupResponseEvent")
      */
-    const GROUP_EDIT_COMPLETED = 'fos_user.group.edit.completed';
+    public const GROUP_EDIT_COMPLETED = 'fos_user.group.edit.completed';
 
     /**
      * The PROFILE_EDIT_INITIALIZE event occurs when the profile editing process is initialized.
@@ -113,7 +113,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\GetResponseUserEvent")
      */
-    const PROFILE_EDIT_INITIALIZE = 'fos_user.profile.edit.initialize';
+    public const PROFILE_EDIT_INITIALIZE = 'fos_user.profile.edit.initialize';
 
     /**
      * The PROFILE_EDIT_SUCCESS event occurs when the profile edit form is submitted successfully.
@@ -122,7 +122,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FormEvent")
      */
-    const PROFILE_EDIT_SUCCESS = 'fos_user.profile.edit.success';
+    public const PROFILE_EDIT_SUCCESS = 'fos_user.profile.edit.success';
 
     /**
      * The PROFILE_EDIT_COMPLETED event occurs after saving the user in the profile edit process.
@@ -131,7 +131,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FilterUserResponseEvent")
      */
-    const PROFILE_EDIT_COMPLETED = 'fos_user.profile.edit.completed';
+    public const PROFILE_EDIT_COMPLETED = 'fos_user.profile.edit.completed';
 
     /**
      * The REGISTRATION_INITIALIZE event occurs when the registration process is initialized.
@@ -140,7 +140,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\UserEvent")
      */
-    const REGISTRATION_INITIALIZE = 'fos_user.registration.initialize';
+    public const REGISTRATION_INITIALIZE = 'fos_user.registration.initialize';
 
     /**
      * The REGISTRATION_SUCCESS event occurs when the registration form is submitted successfully.
@@ -149,7 +149,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FormEvent")
      */
-    const REGISTRATION_SUCCESS = 'fos_user.registration.success';
+    public const REGISTRATION_SUCCESS = 'fos_user.registration.success';
 
     /**
      * The REGISTRATION_FAILURE event occurs when the registration form is not valid.
@@ -159,7 +159,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FormEvent")
      */
-    const REGISTRATION_FAILURE = 'fos_user.registration.failure';
+    public const REGISTRATION_FAILURE = 'fos_user.registration.failure';
 
     /**
      * The REGISTRATION_COMPLETED event occurs after saving the user in the registration process.
@@ -168,7 +168,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FilterUserResponseEvent")
      */
-    const REGISTRATION_COMPLETED = 'fos_user.registration.completed';
+    public const REGISTRATION_COMPLETED = 'fos_user.registration.completed';
 
     /**
      * The REGISTRATION_CONFIRM event occurs just before confirming the account.
@@ -177,7 +177,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\GetResponseUserEvent")
      */
-    const REGISTRATION_CONFIRM = 'fos_user.registration.confirm';
+    public const REGISTRATION_CONFIRM = 'fos_user.registration.confirm';
 
     /**
      * The REGISTRATION_CONFIRMED event occurs after confirming the account.
@@ -186,7 +186,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FilterUserResponseEvent")
      */
-    const REGISTRATION_CONFIRMED = 'fos_user.registration.confirmed';
+    public const REGISTRATION_CONFIRMED = 'fos_user.registration.confirmed';
 
     /**
      * The RESETTING_RESET_REQUEST event occurs when a user requests a password reset of the account.
@@ -196,7 +196,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\GetResponseUserEvent")
      */
-    const RESETTING_RESET_REQUEST = 'fos_user.resetting.reset.request';
+    public const RESETTING_RESET_REQUEST = 'fos_user.resetting.reset.request';
 
     /**
      * The RESETTING_RESET_INITIALIZE event occurs when the resetting process is initialized.
@@ -205,7 +205,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\GetResponseUserEvent")
      */
-    const RESETTING_RESET_INITIALIZE = 'fos_user.resetting.reset.initialize';
+    public const RESETTING_RESET_INITIALIZE = 'fos_user.resetting.reset.initialize';
 
     /**
      * The RESETTING_RESET_SUCCESS event occurs when the resetting form is submitted successfully.
@@ -214,7 +214,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FormEvent ")
      */
-    const RESETTING_RESET_SUCCESS = 'fos_user.resetting.reset.success';
+    public const RESETTING_RESET_SUCCESS = 'fos_user.resetting.reset.success';
 
     /**
      * The RESETTING_RESET_COMPLETED event occurs after saving the user in the resetting process.
@@ -223,7 +223,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\FilterUserResponseEvent")
      */
-    const RESETTING_RESET_COMPLETED = 'fos_user.resetting.reset.completed';
+    public const RESETTING_RESET_COMPLETED = 'fos_user.resetting.reset.completed';
 
     /**
      * The SECURITY_IMPLICIT_LOGIN event occurs when the user is logged in programmatically.
@@ -232,7 +232,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\UserEvent")
      */
-    const SECURITY_IMPLICIT_LOGIN = 'fos_user.security.implicit_login';
+    public const SECURITY_IMPLICIT_LOGIN = 'fos_user.security.implicit_login';
 
     /**
      * The RESETTING_SEND_EMAIL_INITIALIZE event occurs when the send email process is initialized.
@@ -242,7 +242,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\GetResponseNullableUserEvent")
      */
-    const RESETTING_SEND_EMAIL_INITIALIZE = 'fos_user.resetting.send_email.initialize';
+    public const RESETTING_SEND_EMAIL_INITIALIZE = 'fos_user.resetting.send_email.initialize';
 
     /**
      * The RESETTING_SEND_EMAIL_CONFIRM event occurs when all prerequisites to send email are
@@ -253,7 +253,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\GetResponseUserEvent")
      */
-    const RESETTING_SEND_EMAIL_CONFIRM = 'fos_user.resetting.send_email.confirm';
+    public const RESETTING_SEND_EMAIL_CONFIRM = 'fos_user.resetting.send_email.confirm';
 
     /**
      * The RESETTING_SEND_EMAIL_COMPLETED event occurs after the email is sent.
@@ -263,7 +263,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\GetResponseUserEvent")
      */
-    const RESETTING_SEND_EMAIL_COMPLETED = 'fos_user.resetting.send_email.completed';
+    public const RESETTING_SEND_EMAIL_COMPLETED = 'fos_user.resetting.send_email.completed';
 
     /**
      * The USER_CREATED event occurs when the user is created with UserManipulator.
@@ -272,7 +272,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\UserEvent")
      */
-    const USER_CREATED = 'fos_user.user.created';
+    public const USER_CREATED = 'fos_user.user.created';
 
     /**
      * The USER_PASSWORD_CHANGED event occurs when the user is created with UserManipulator.
@@ -281,7 +281,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\UserEvent")
      */
-    const USER_PASSWORD_CHANGED = 'fos_user.user.password_changed';
+    public const USER_PASSWORD_CHANGED = 'fos_user.user.password_changed';
 
     /**
      * The USER_ACTIVATED event occurs when the user is created with UserManipulator.
@@ -290,7 +290,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\UserEvent")
      */
-    const USER_ACTIVATED = 'fos_user.user.activated';
+    public const USER_ACTIVATED = 'fos_user.user.activated';
 
     /**
      * The USER_DEACTIVATED event occurs when the user is created with UserManipulator.
@@ -299,7 +299,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\UserEvent")
      */
-    const USER_DEACTIVATED = 'fos_user.user.deactivated';
+    public const USER_DEACTIVATED = 'fos_user.user.deactivated';
 
     /**
      * The USER_PROMOTED event occurs when the user is created with UserManipulator.
@@ -308,7 +308,7 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\UserEvent")
      */
-    const USER_PROMOTED = 'fos_user.user.promoted';
+    public const USER_PROMOTED = 'fos_user.user.promoted';
 
     /**
      * The USER_DEMOTED event occurs when the user is created with UserManipulator.
@@ -317,5 +317,5 @@ final class FOSUserEvents
      *
      * @Event("FOS\UserBundle\Event\UserEvent")
      */
-    const USER_DEMOTED = 'fos_user.user.demoted';
+    public const USER_DEMOTED = 'fos_user.user.demoted';
 }

Form/Type/ChangePasswordFormType.php

@@ -85,16 +85,6 @@ public function configureOptions(OptionsResolver $resolver)
         ]);
     }
 
-    // BC for SF < 3.0
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return $this->getBlockPrefix();
-    }
-
     /**
      * {@inheritdoc}
      */