Merge branch '5.4' into 6.0

* 5.4:
  Update mercure.rst
  Adding missing `use`s

Author: javiereguiluz

form/create_custom_field_type.rst

@@ -148,7 +148,7 @@ These are the most important methods that a form type class can define:
 ``finishView()``
     When creating a form type that consists of many fields, this method allows
     to modify the "view" of any of those fields. For any other use case, it's
-    recommended to use instead the ``buildView()`` method.
+    recommended to use ``buildView()`` instead.
 
 ``getParent()``
     If your custom type is based on another type (i.e. they share some
@@ -467,6 +467,8 @@ defined by the form or be completely independent::
     namespace App\Form\Type;
 
     use Doctrine\ORM\EntityManagerInterface;
+    use Symfony\Component\Form\FormInterface;
+    use Symfony\Component\Form\FormView;
     // ...
 
     class PostalAddressType extends AbstractType

mercure.rst

@@ -107,7 +107,7 @@ the publicly available URL (e.g. ``https://example.com/.well-known/mercure``).
 The clients must also bear a `JSON Web Token`_ (JWT)
 to the Mercure Hub to be authorized to publish updates and, sometimes, to subscribe.
 
-This token must be signed with the same secret key as the one used by the Hub to verify the JWT (``!ChangeMe!`` in you use the Docker integration).
+This token must be signed with the same secret key as the one used by the Hub to verify the JWT (``!ChangeMe!`` if you use the Docker integration).
 This secret key must be stored in the ``MERCURE_JWT_SECRET`` environment variable.
 MercureBundle will use it to automatically generate and sign the needed JWTs.