Merge pull request #3076 from stof/prepare_major_version

Prepare the major version

composer.json

@@ -62,7 +62,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.x-dev"
+            "dev-master": "4.x-dev"
         }
     },
     "autoload": {

docs/index.rst

@@ -216,44 +216,6 @@ this to start:
         }
     }
 
-c) CouchDB User class
-.....................
-
-.. note::
-    Support for the CouchDB ODM is deprecated as the Doctrine CouchDB ODM is unmaintained.
-
-If you're persisting your users via the Doctrine CouchDB ODM, then your ``User``
-class should live in the ``CouchDocument`` namespace of your bundle and look
-like this to start:
-
-.. code-block:: php
-
-    <?php
-    // src/AppBundle/CouchDocument/User.php
-
-    namespace AppBundle\CouchDocument;
-
-    use FOS\UserBundle\Model\User as BaseUser;
-    use Doctrine\ODM\CouchDB\Mapping\Annotations as CouchDB;
-
-    /**
-     * @CouchDB\Document
-     */
-    class User extends BaseUser
-    {
-        /**
-         * @CouchDB\Id
-         */
-        protected $id;
-
-        public function __construct()
-        {
-            parent::__construct();
-            // your own logic
-        }
-    }
-
-
 Step 4: Configure your application's security.yml
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -351,7 +313,7 @@ of datastore you are using.
 
         # app/config/config.yml
         fos_user:
-            db_driver: orm # other valid values are 'mongodb', 'couchdb' and 'custom'
+            db_driver: orm # other valid values are 'mongodb' and 'custom'
             firewall_name: main
             user_class: AppBundle\Entity\User
             from_email:
@@ -362,7 +324,7 @@ of datastore you are using.
 
         <!-- app/config/config.xml -->
 
-        <!-- other valid 'db-driver' values are 'mongodb', 'couchdb' and 'custom' -->
+        <!-- other valid 'db-driver' values are 'mongodb' and 'custom' -->
         <fos_user:config
             db-driver="orm"
             firewall-name="main"
@@ -371,7 +333,7 @@ of datastore you are using.
 
 Only four configuration's nodes are required to use the bundle:
 
-* The type of datastore you are using (``orm``, ``mongodb``, ``couchdb`` or ``custom```).
+* The type of datastore you are using (``orm``, ``mongodb`` or ``custom```).
 * The firewall name which you configured in Step 4.
 * The fully qualified class name (FQCN) of the ``User`` class which you created in Step 3.
 * The default email address to use when the bundle send a registration confirmation to the user.

docs/user_manager.rst

@@ -13,9 +13,6 @@ of ``FOS\UserBundle\Doctrine\UserManager``.
 If you configure the ``db_driver`` option to ``mongodb``, this service is an
 instance of ``FOS\UserBundle\Doctrine\UserManager``.
 
-If you configure the ``db_driver`` option to ``couchdb``, this service is an
-instance of ``FOS\UserBundle\Doctrine\UserManager``.
-
 Accessing the User Manager service
 ----------------------------------
 
@@ -148,8 +145,3 @@ SecurityBundle integration
 
 The bundle provides several implementation of ``Symfony\Component\Security\Core\UserProviderInterface``
 on top of the ``UserManagerInterface``.
-
-Although the built-in user managers also implement
-``Symfony\Component\Security\Core\User\UserProviderInterface``, using the
-UserManager as user provider is deprecated and will tbe removed in future
-versions. Use ``FOS\UserBundle\Security\UserProvider`` instead.

src/Command/ActivateUserCommand.php

@@ -24,11 +24,9 @@
  * @author Antoine Hérault <[email protected]>
  *
  * @internal
- *
- * @final
  */
 #[AsCommand(name: 'fos:user:activate', description: 'Activate a user')]
-class ActivateUserCommand extends Command
+final class ActivateUserCommand extends Command
 {
     // BC with Symfony <5.3
     protected static $defaultName = 'fos:user:activate';

src/Command/ChangePasswordCommand.php

@@ -22,11 +22,9 @@
 
 /**
  * @internal
- *
- * @final
  */
 #[AsCommand(name: 'fos:user:change-password', description: 'Change the password of a user.')]
-class ChangePasswordCommand extends Command
+final class ChangePasswordCommand extends Command
 {
     // BC with Symfony <5.3
     protected static $defaultName = 'fos:user:change-password';

src/Command/CreateUserCommand.php

@@ -27,11 +27,9 @@
  * @author Luis Cordova <[email protected]>
  *
  * @internal
- *
- * @final
  */
 #[AsCommand(name: 'fos:user:create', description: 'Create a user.')]
-class CreateUserCommand extends Command
+final class CreateUserCommand extends Command
 {
     // BC with Symfony <5.3
     protected static $defaultName = 'fos:user:create';

src/Command/DeactivateUserCommand.php

@@ -24,11 +24,9 @@
  * @author Antoine Hérault <[email protected]>
  *
  * @internal
- *
- * @final
  */
 #[AsCommand(name: 'fos:user:deactivate', description: 'Deactivate a user')]
-class DeactivateUserCommand extends Command
+final class DeactivateUserCommand extends Command
 {
     // BC with Symfony <5.3
     protected static $defaultName = 'fos:user:deactivate';

src/Command/DemoteUserCommand.php

@@ -20,11 +20,9 @@
  * @author Lenar Lõhmus <[email protected]>
  *
  * @internal
- *
- * @final
  */
 #[AsCommand(name: 'fos:user:demote', description: 'Demote a user by removing a role')]
-class DemoteUserCommand extends RoleCommand
+final class DemoteUserCommand extends RoleCommand
 {
     // BC with Symfony <5.3
     protected static $defaultName = 'fos:user:demote';

src/Command/PromoteUserCommand.php

@@ -22,11 +22,9 @@
  * @author Lenar Lõhmus <[email protected]>
  *
  * @internal
- *
- * @final
  */
 #[AsCommand(name: 'fos:user:promote', description: 'Promotes a user by adding a role')]
-class PromoteUserCommand extends RoleCommand
+final class PromoteUserCommand extends RoleCommand
 {
     // BC with Symfony <5.3
     protected static $defaultName = 'fos:user:promote';

src/Controller/ChangePasswordController.php

@@ -31,10 +31,8 @@
  *
  * @author Thibault Duplessis <[email protected]>
  * @author Christophe Coevoet <[email protected]>
- *
- * @final
  */
-class ChangePasswordController extends AbstractController
+final class ChangePasswordController extends AbstractController
 {
     private $eventDispatcher;
     private $formFactory;

src/Controller/ProfileController.php

@@ -30,10 +30,8 @@
  * Controller managing the user profile.
  *
  * @author Christophe Coevoet <[email protected]>
- *
- * @final
  */
-class ProfileController extends AbstractController
+final class ProfileController extends AbstractController
 {
     private $eventDispatcher;
     private $formFactory;

src/Controller/RegistrationController.php

@@ -33,10 +33,8 @@
  *
  * @author Thibault Duplessis <[email protected]>
  * @author Christophe Coevoet <[email protected]>
- *
- * @final
  */
-class RegistrationController extends AbstractController
+final class RegistrationController extends AbstractController
 {
     private $eventDispatcher;
     private $formFactory;

src/Controller/ResettingController.php

@@ -32,10 +32,8 @@
  *
  * @author Thibault Duplessis <[email protected]>
  * @author Christophe Coevoet <[email protected]>
- *
- * @final
  */
-class ResettingController extends AbstractController
+final class ResettingController extends AbstractController
 {
     private $eventDispatcher;
     private $formFactory;

src/Controller/SecurityController.php

@@ -21,10 +21,8 @@
  *
  * @author Thibault Duplessis <[email protected]>
  * @author Christophe Coevoet <[email protected]>
- *
- * @final
  */
-class SecurityController extends AbstractController
+final class SecurityController extends AbstractController
 {
     private $authenticationUtils;
     private $tokenManager;

src/DependencyInjection/Compiler/CheckForSessionPass.php

@@ -21,10 +21,8 @@
  * @author Ryan Weaver <[email protected]>
  *
  * @internal
- *
- * @final
  */
-class CheckForSessionPass implements CompilerPassInterface
+final class CheckForSessionPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {

src/DependencyInjection/Compiler/CheckForSwiftMailerPass.php

@@ -21,10 +21,8 @@
  * @author Ryan Weaver <[email protected]>
  *
  * @internal
- *
- * @final
  */
-class CheckForSwiftMailerPass implements CompilerPassInterface
+final class CheckForSwiftMailerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {

src/DependencyInjection/Compiler/InjectRememberMeServicesPass.php

@@ -21,10 +21,8 @@
  * @author Vasily Khayrulin <[email protected]>
  *
  * @internal
- *
- * @final
  */
-class InjectRememberMeServicesPass implements CompilerPassInterface
+final class InjectRememberMeServicesPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {

src/DependencyInjection/Compiler/InjectUserCheckerPass.php

@@ -21,10 +21,8 @@
  * @author Gocha Ossinkine <[email protected]>
  *
  * @internal
- *
- * @final
  */
-class InjectUserCheckerPass implements CompilerPassInterface
+final class InjectUserCheckerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {

src/DependencyInjection/Compiler/ValidationPass.php

@@ -20,10 +20,8 @@
  * @author Christophe Coevoet <[email protected]>
  *
  * @internal
- *
- * @final
  */
-class ValidationPass implements CompilerPassInterface
+final class ValidationPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {

src/DependencyInjection/Configuration.php

@@ -25,17 +25,15 @@
  * @author Christophe Coevoet <[email protected]>
  *
  * @internal
- *
- * @final
  */
-class Configuration implements ConfigurationInterface
+final class Configuration implements ConfigurationInterface
 {
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('fos_user');
         $rootNode = $treeBuilder->getRootNode();
 
-        $supportedDrivers = ['orm', 'mongodb', 'couchdb', 'custom'];
+        $supportedDrivers = ['orm', 'mongodb', 'custom'];
 
         $rootNode
             ->children()
@@ -44,14 +42,6 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->ifNotInArray($supportedDrivers)
                         ->thenInvalid('The driver %s is not supported. Please choose one of '.json_encode($supportedDrivers))
                     ->end()
-                    ->validate()
-                        ->ifInArray(['couchdb'])
-                        ->then(function ($v) {
-                            trigger_deprecation('friendsofsymfony/user-bundle', '3.3.0', 'The CouchDB ODM integration is deprecated because the CouchDB ODM itself is unmaintained.');
-
-                            return $v;
-                        })
-                    ->end()
                     ->cannotBeOverwritten()
                     ->isRequired()
                     ->cannotBeEmpty()

src/DependencyInjection/FOSUserExtension.php

@@ -16,19 +16,17 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
  * @internal
- *
- * @final
  */
-class FOSUserExtension extends Extension
+final class FOSUserExtension extends Extension
 {
     /**
-     * @var array<string, array{registry: string, tag: string, listener_class?: string}>
+     * @var array<string, array{registry: string, tag: string}>
      */
     private static $doctrineDrivers = [
         'orm' => [
@@ -39,11 +37,6 @@ class FOSUserExtension extends Extension
             'registry' => 'doctrine_mongodb',
             'tag' => 'doctrine_mongodb.odm.event_listener',
         ],
-        'couchdb' => [
-            'registry' => 'doctrine_couchdb',
-            'tag' => 'doctrine_couchdb.event_listener',
-            'listener_class' => 'FOS\UserBundle\Doctrine\CouchDB\UserListener',
-        ],
     ];
 
     private bool $mailerNeeded = false;
@@ -99,9 +92,6 @@ public function load(array $configs, ContainerBuilder $container): void
             $listenerDefinition = $container->getDefinition('fos_user.user_listener');
             $listenerDefinition->addTag(self::$doctrineDrivers[$config['db_driver']]['tag'], ['event' => 'prePersist']);
             $listenerDefinition->addTag(self::$doctrineDrivers[$config['db_driver']]['tag'], ['event' => 'preUpdate']);
-            if (isset(self::$doctrineDrivers[$config['db_driver']]['listener_class'])) {
-                $listenerDefinition->setClass(self::$doctrineDrivers[$config['db_driver']]['listener_class']);
-            }
         }
 
         if ($config['use_username_form_type']) {