Merge branch '4.4' into 5.0

* 4.4:
  [RememberMe] add doctrine migration note

Author: javiereguiluz

messenger.rst

@@ -889,12 +889,30 @@ up manually by calling the ``messenger:setup-transports`` command.
     To avoid tools like Doctrine Migrations from trying to remove this table because
     it's not part of your normal schema, you can set the ``schema_filter`` option:
 
-    .. code-block:: yaml
+    .. configuration-block::
+
+        .. code-block:: yaml
+
+            # config/packages/doctrine.yaml
+            doctrine:
+                dbal:
+                    schema_filter: '~^(?!messenger_messages)~'
+
+        .. code-block:: xml
 
-        # config/packages/doctrine.yaml
-        doctrine:
-            dbal:
-                schema_filter: '~^(?!messenger_messages)~'
+            # config/packages/doctrine.xml
+            <doctrine:dbal schema-filter="~^(?!messenger_messages)~" .../>
+
+        .. code-block:: php
+
+            # config/packages/doctrine.php
+            $container->loadFromExtension('doctrine', [
+                'dbal' => [
+                    'schema_filter'  => '~^(?!messenger_messages)~',
+                    // ...
+                ],
+                // ...
+            ]);
 
 The transport has a number of options:
 

security/remember_me.rst

@@ -247,6 +247,36 @@ so ``DoctrineTokenProvider`` can store the tokens:
         `username` varchar(200) NOT NULL
     );
 
+.. note::
+
+    If you use DoctrineMigrationsBundle to manage your database migrations, you
+    will need to tell Doctrine to ignore this new ``rememberme_token`` table:
+
+    .. configuration-block::
+
+        .. code-block:: yaml
+
+            # config/packages/doctrine.yaml
+            doctrine:
+                dbal:
+                    schema_filter: ~^(?!rememberme_token)~
+
+        .. code-block:: xml
+
+            # config/packages/doctrine.xml
+            <doctrine:dbal schema-filter="~^(?!rememberme_token)~" .../>
+
+        .. code-block:: php
+
+            # config/packages/doctrine.php
+            $container->loadFromExtension('doctrine', [
+                'dbal' => [
+                    'schema_filter'  => '~^(?!rememberme_token)~',
+                    // ...
+                ],
+                // ...
+            ]);
+
 Finally, set the ``token_provider`` option of the ``remember_me`` config to the
 service you just created: