Merge branch '5.4' into 6.0

* 5.4:
  [Cache] Deprecate the DoctrineProvider class
  [Form] Document using TranslatableMessage in form help
  [Security] Add deprecation notices about Guard authenticators

Author: javiereguiluz

cache.rst

@@ -187,6 +187,11 @@ will create pools with service IDs that follow the pattern ``cache.[type]``.
             ;
         };
 
+.. deprecated:: 5.4
+
+    The ``default_doctrine_provider`` option was deprecated in Symfony 5.4 and
+    it will be removed in Symfony 6.0.
+
 .. _cache-create-pools:
 
 Creating Custom (Namespaced) Pools

components/cache/adapters/doctrine_adapter.rst

@@ -39,4 +39,9 @@ third parameters::
     A :class:`Symfony\\Component\\Cache\\DoctrineProvider` class is also provided by the
     component to use any PSR6-compatible implementations with Doctrine-compatible classes.
 
+    .. deprecated:: 5.4
+
+        The ``DoctrineProvider`` class was deprecated in Symfony 5.4 and it will
+        be removed in Symfony 6.0.
+
 .. _`Doctrine Cache`: https://github.com/doctrine/cache

reference/forms/types/options/help.rst.inc

@@ -1,11 +1,25 @@
 help
 ~~~~
 
-**type**: ``string`` **default**: null
+**type**: ``string`` or ``TranslatableMessage`` **default**: null
 
 Allows you to define a help message for the form field, which by default is
 rendered below the field::
 
-    $builder->add('zipCode', null, [
-        'help' => 'The ZIP/Postal code for your credit card\'s billing address.',
-    ]);
+    use Symfony\Component\Translation\TranslatableMessage;
+
+    $builder
+        ->add('zipCode', null, [
+            'help' => 'The ZIP/Postal code for your credit card\'s billing address.',
+        ])
+
+        // ...
+
+        ->add('status', null, [
+            'help' => new TranslatableMessage('order.status', ['%order_id%' => $order->getId()], 'store'),
+        ])
+    ;
+
+.. versionadded:: 5.4
+
+    Support for passing ``TranslatableMessage`` objects was introduced in Symfony 5.4.

security.rst

@@ -462,6 +462,11 @@ you to control *every* part of the authentication process (see the next section)
 Guard Authenticators
 ~~~~~~~~~~~~~~~~~~~~
 
+.. deprecated:: 5.3
+
+    Guard authenticators are deprecated since Symfony 5.3 in favor of the
+    :doc:`new authenticator-based system </security/authenticator_manager>`.
+
 A Guard authenticator is a class that gives you *complete* control over your
 authentication process. There are many different ways to build an authenticator;
 here are a few common use-cases:

security/auth_providers.rst

@@ -1,9 +1,9 @@
 Built-in Authentication Providers
 =================================
 
-If you need to add authentication to your app, we recommend using
-:doc:`Guard authentication </security/guard_authentication>` because it gives you
-full control over the process.
+If you need to add authentication to your app, we recommend using the
+:doc:`new authenticator-based system </security/authenticator_manager>` because
+it gives you full control over the process.
 
 But, Symfony also offers a number of built-in authentication providers: systems
 that are easier to implement, but harder to customize. If your authentication

security/custom_authentication_provider.rst

@@ -7,10 +7,8 @@ How to Create a custom Authentication Provider
 .. caution::
 
     Creating a custom authentication system is hard, and almost definitely
-    **not** needed. Instead, see :doc:`/security/guard_authentication` for a
-    simple way to create an authentication system you will love. Do **not**
-    keep reading unless you want to learn the lowest level details of
-    authentication.
+    **not** needed. Instead, see the
+    :doc:`new authenticator-based system </security/authenticator_manager>`
 
 Symfony provides support for the most
 :doc:`common authentication mechanisms </security/auth_providers>`. However, your

security/guard_authentication.rst

@@ -4,6 +4,11 @@
 Custom Authentication System with Guard (API Token Example)
 ===========================================================
 
+.. deprecated:: 5.3
+
+    Guard authenticators are deprecated since Symfony 5.3 in favor of the
+    :doc:`new authenticator-based system </security/authenticator_manager>`.
+
 Guard authentication can be used to:
 
 * :doc:`Build a Login Form </security/form_login_setup>`
@@ -14,11 +19,6 @@ Guard authentication can be used to:
 and many more. In this example, we'll build an API token authentication
 system, so we can learn more about Guard in detail.
 
-.. tip::
-
-    A :doc:`new authenticator-based system </security/authenticator_manager>`
-    was introduced in Symfony 5.1, which will eventually replace Guards in Symfony 6.0.
-
 Step 1) Prepare your User Class
 -------------------------------
 

security/multiple_guard_authenticators.rst

@@ -1,6 +1,11 @@
 How to Use Multiple Guard Authenticators
 ========================================
 
+.. deprecated:: 5.3
+
+    Guard authenticators are deprecated since Symfony 5.3 in favor of the
+    :doc:`new authenticator-based system </security/authenticator_manager>`.
+
 The Guard authentication component allows you to use many different
 authenticators at a time.