Merge branch '6.1' into 6.2

* 6.1:
  Update mercure.rst
  [HttpKernel] Add UidValueResolver to the list of built-in value resolvers
  Adding missing `use`s

Author: javiereguiluz

controller/argument_value_resolver.rst

@@ -115,6 +115,32 @@ Symfony ships with the following value resolvers in the
     Will set the default value of the argument if present and the argument
     is optional.
 
+:class:`Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\UidValueResolver`
+    Attempts to convert any UID values from a route path parameter into UID objects.
+    Leads to a 404 Not Found response if the value isn't a valid UID.
+
+    For example, the following will convert the token parameter into a ``UuidV4`` object::
+
+        // src/Controller/DefaultController.php
+        namespace App\Controller;
+
+        use Symfony\Component\HttpFoundation\Response;
+        use Symfony\Component\Routing\Annotation\Route;
+        use Symfony\Component\Uid\UuidV4;
+
+        class DefaultController
+        {
+            #[Route('/share/{token}')]
+            public function share(UuidV4 $token): Response
+            {
+                // ...
+            }
+        }
+
+    .. versionadded:: 6.1
+
+        The ``UidValueResolver`` was introduced in Symfony 6.1.
+
 :class:`Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\VariadicValueResolver`
     Verifies if the request data is an array and will add all of them to the
     argument list. When the action is called, the last (variadic) argument will
@@ -137,7 +163,7 @@ PSR-7 Objects Resolver:
     Injects a Symfony HttpFoundation ``Request`` object created from a PSR-7 object
     of type :class:`Psr\\Http\\Message\\ServerRequestInterface`,
     :class:`Psr\\Http\\Message\\RequestInterface` or :class:`Psr\\Http\\Message\\MessageInterface`.
-    It requires installing :doc:`the PSR-7 Bridge </components/psr7>`_ component.
+    It requires installing :doc:`the PSR-7 Bridge </components/psr7>` component.
 
 Adding a Custom Value Resolver
 ------------------------------

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.
 

reference/forms/types/datetime.rst

@@ -13,7 +13,7 @@ the data can be a ``DateTime`` object, a string, a timestamp or an array.
 +---------------------------+-----------------------------------------------------------------------------+
 | Underlying Data Type      | can be ``DateTime``, string, timestamp, or array (see the ``input`` option) |
 +---------------------------+-----------------------------------------------------------------------------+
-| Rendered as               | single text box or five select fields                                      |
+| Rendered as               | single text box or five select fields                                       |
 +---------------------------+-----------------------------------------------------------------------------+
 | Default invalid message   | Please enter a valid date and time.                                         |
 +---------------------------+-----------------------------------------------------------------------------+