Merge branch '5.2' into 5.x

* 5.2:
  [Validator] Add missing backticks for constraint option names
  [#13492] satisfy the linter
  [Validator] Added grouped constraints in `Collection` reference
  [#15074] fix typo
  Update rate_limiter.rst

Author: javiereguiluz

rate_limiter.rst

@@ -167,14 +167,15 @@ the number of requests to the API::
     namespace App\Controller;
 
     use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+    use Symfony\Component\HttpFoundation\Request;
     use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException;
     use Symfony\Component\RateLimiter\RateLimiterFactory;
 
     class ApiController extends AbstractController
     {
         // if you're using service autowiring, the variable name must be:
         // "rate limiter name" (in camelCase) + "Limiter" suffix
-        public function index(RateLimiterFactory $anonymousApiLimiter)
+        public function index(Request $request, RateLimiterFactory $anonymousApiLimiter)
         {
             // create a limiter based on a unique identifier of the client
             // (e.g. the client's IP address, a username/email, an API key, etc.)
@@ -272,12 +273,13 @@ the :class:`Symfony\\Component\\RateLimiter\\Reservation` object returned by the
     namespace App\Controller;
 
     use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+    use Symfony\Component\HttpFoundation\Request;
     use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\RateLimiter\RateLimiterFactory;
 
     class ApiController extends AbstractController
     {
-        public function index(RateLimiterFactory $anonymousApiLimiter)
+        public function index(Request $request, RateLimiterFactory $anonymousApiLimiter)
         {
             $limiter = $anonymousApiLimiter->create($request->getClientIp());
             $limit = $limiter->consume();

reference/constraints/Bic.rst

@@ -100,22 +100,22 @@ Available Options
 
 .. include:: /reference/constraints/_groups-option.rst.inc
 
-iban
-~~~~
+``iban``
+~~~~~~~~
 
 **type**: ``string`` **default**: ``null``
 
 An IBAN value to validate that its country code is the same as the BIC's one.
 
-ibanMessage
-~~~~~~~~~~~
+``ibanMessage``
+~~~~~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.``
 
 The default message supplied when the value does not pass the combined BIC/IBAN check.
 
-ibanPropertyPath
-~~~~~~~~~~~~~~~~
+``ibanPropertyPath``
+~~~~~~~~~~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``null``
 
@@ -125,8 +125,8 @@ For example, if you want to compare the ``$bic`` property of some object
 with regard to the ``$iban`` property of the same object, use
 ``ibanPropertyPath="iban"`` in the comparison constraint of ``$bic``.
 
-message
-~~~~~~~
+``message``
+~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``This is not a valid Business Identifier Code (BIC).``
 

reference/constraints/CardScheme.rst

@@ -115,8 +115,8 @@ Available Options
 
 .. include:: /reference/constraints/_groups-option.rst.inc
 
-message
-~~~~~~~
+``message``
+~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``Unsupported card type or invalid card number.``
 
@@ -137,8 +137,8 @@ Parameter        Description
 
 .. include:: /reference/constraints/_payload-option.rst.inc
 
-schemes
-~~~~~~~
+``schemes``
+~~~~~~~~~~~
 
 **type**: ``mixed`` [:ref:`default option <validation-default-option>`]
 

reference/constraints/Choice.rst

@@ -320,17 +320,17 @@ you can pass the class name and the method as an array.
 Available Options
 -----------------
 
-callback
-~~~~~~~~
+``callback``
+~~~~~~~~~~~~
 
 **type**: ``string|array|Closure``
 
 This is a callback method that can be used instead of the `choices`_ option
 to return the choices array. See
 `Supplying the Choices with a Callback Function`_ for details on its usage.
 
-choices
-~~~~~~~
+``choices``
+~~~~~~~~~~~
 
 **type**: ``array`` [:ref:`default option <validation-default-option>`]
 
@@ -340,8 +340,8 @@ will be matched against this array.
 
 .. include:: /reference/constraints/_groups-option.rst.inc
 
-max
-~~~
+``max``
+~~~~~~~
 
 **type**: ``integer``
 
@@ -350,8 +350,8 @@ to force no more than XX number of values to be selected. For example, if
 ``max`` is 3, but the input array contains 4 valid items, the validation
 will fail.
 
-maxMessage
-~~~~~~~~~~
+``maxMessage``
+~~~~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``You must select at most {{ limit }} choices.``
 
@@ -367,8 +367,8 @@ Parameter          Description
 ``{{ value }}``    The current (invalid) value
 =================  ============================================================
 
-message
-~~~~~~~
+``message``
+~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``The value you selected is not a valid choice.``
 
@@ -385,8 +385,8 @@ Parameter          Description
 ``{{ value }}``    The current (invalid) value
 =================  ============================================================
 
-min
-~~~
+``min``
+~~~~~~~
 
 **type**: ``integer``
 
@@ -395,8 +395,8 @@ to force at least XX number of values to be selected. For example, if
 ``min`` is 3, but the input array only contains 2 valid items, the validation
 will fail.
 
-minMessage
-~~~~~~~~~~
+``minMessage``
+~~~~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``You must select at least {{ limit }} choices.``
 
@@ -412,8 +412,8 @@ Parameter          Description
 ``{{ value }}``    The current (invalid) value
 =================  ============================================================
 
-multiple
-~~~~~~~~
+``multiple``
+~~~~~~~~~~~~
 
 **type**: ``boolean`` **default**: ``false``
 
@@ -422,8 +422,8 @@ of a single, scalar value. The constraint will check that each value of
 the input array can be found in the array of valid choices. If even one
 of the input values cannot be found, the validation will fail.
 
-multipleMessage
-~~~~~~~~~~~~~~~
+``multipleMessage``
+~~~~~~~~~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``One or more of the given values is invalid.``
 

reference/constraints/Collection.rst

@@ -289,6 +289,40 @@ However, if the ``personal_email`` field does not exist in the array,
 the ``NotBlank`` constraint will still be applied (since it is wrapped in
 ``Required``) and you will receive a constraint violation.
 
+When you define groups in nested constraints they are automatically added to
+the ``Collection`` constraint itself so it can be traversed for all nested
+groups. Take the following example::
+
+    use Symfony\Component\Validator\Constraints as Assert;
+
+    $constraint = new Assert\Collection([
+        'fields' => [
+            'name' => new Assert\NotBlank(['groups' => 'basic']),
+            'email' => new Assert\NotBlank(['groups' => 'contact']),
+        ],
+    ]);
+
+This will result in the following configuration::
+
+    $constraint = new Assert\Collection([
+        'fields' => [
+            'name' => new Assert\Required([
+                'constraints' => new Assert\NotBlank(['groups' => 'basic']),
+                'groups' => ['basic', 'strict'],
+            ]),
+            'email' => new Assert\Required([
+                "constraints" => new Assert\NotBlank(['groups' => 'contact']),
+                'groups' => ['basic', 'strict'],
+            ]),
+        ],
+        'groups' => ['basic', 'strict'],
+    ]);
+
+The default ``allowMissingFields`` option requires the fields in all groups.
+So when validating in ``contact`` group, ``$name`` can be empty but the key is
+still required. If this is not the intended behavior, use the ``Optional``
+constraint explicitly instead of ``Required``.
+
 Options
 -------
 

reference/constraints/Count.rst

@@ -121,8 +121,8 @@ you might add the following:
 Options
 -------
 
-divisibleBy
-~~~~~~~~~~~
+``divisibleBy``
+~~~~~~~~~~~~~~~
 
 **type**: ``integer`` **default**: null
 
@@ -139,8 +139,8 @@ a certain number.
     are divisible by a certain number, use the
     :doc:`DivisibleBy </reference/constraints/DivisibleBy>` constraint.
 
-divisibleByMessage
-~~~~~~~~~~~~~~~~~~
+``divisibleByMessage``
+~~~~~~~~~~~~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``The number of elements in this collection should be a multiple of {{ compared_value }}.``
 
@@ -159,8 +159,8 @@ Parameter                 Description
 ``{{ compared_value }}``  The number configured in the ``divisibleBy`` option
 ========================  ===================================================
 
-exactMessage
-~~~~~~~~~~~~
+``exactMessage``
+~~~~~~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``This collection should contain exactly {{ limit }} elements.``
 
@@ -178,8 +178,8 @@ Parameter        Description
 
 .. include:: /reference/constraints/_groups-option.rst.inc
 
-max
-~~~
+``max``
+~~~~~~~
 
 **type**: ``integer``
 
@@ -188,8 +188,8 @@ collection elements count is **greater** than this max value.
 
 This option is required when the ``min`` option is not defined.
 
-maxMessage
-~~~~~~~~~~
+``maxMessage``
+~~~~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``This collection should contain {{ limit }} elements or less.``
 
@@ -205,8 +205,8 @@ Parameter        Description
 ``{{ limit }}``  The upper limit
 ===============  ==============================================================
 
-min
-~~~
+``min``
+~~~~~~~
 
 **type**: ``integer``
 
@@ -215,8 +215,8 @@ collection elements count is **less** than this min value.
 
 This option is required when the ``max`` option is not defined.
 
-minMessage
-~~~~~~~~~~
+``minMessage``
+~~~~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``This collection should contain {{ limit }} elements or more.``
 

reference/constraints/DateTime.rst

@@ -100,8 +100,8 @@ Basic Usage
 Options
 -------
 
-format
-~~~~~~
+``format``
+~~~~~~~~~~
 
 **type**: ``string`` **default**: ``Y-m-d H:i:s``
 

reference/constraints/DivisibleBy.rst

@@ -128,8 +128,8 @@ Options
 
 .. include:: /reference/constraints/_groups-option.rst.inc
 
-message
-~~~~~~~
+``message``
+~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``This value should be a multiple of {{ compared_value }}.``
 

reference/constraints/Email.rst

@@ -103,8 +103,8 @@ Options
 
 .. include:: /reference/constraints/_groups-option.rst.inc
 
-message
-~~~~~~~
+``message``
+~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``This value is not a valid email address.``
 
@@ -123,8 +123,8 @@ Parameter        Description
 
     The ``{{ label }}`` parameter was introduced in Symfony 5.2.
 
-mode
-~~~~
+``mode``
+~~~~~~~~
 
 **type**: ``string`` **default**: ``loose``
 
@@ -135,20 +135,20 @@ Valid values are:
 * ``strict``
 * ``html5``
 
-loose
-.....
+``loose``
+.........
 
 A simple regular expression. Allows all values with an "@" symbol in, and a "."
 in the second host part of the email address.
 
-strict
-......
+``strict``
+..........
 
 Uses the `egulias/email-validator`_ library to perform an RFC compliant
 validation. You will need to install that library to use this mode.
 
-html5
-.....
+``html5``
+.........
 
 This matches the pattern used for the `HTML5 email input element`_.
 

reference/constraints/Expression.rst

@@ -305,8 +305,8 @@ Parameter        Description
 
 .. include:: /reference/constraints/_payload-option.rst.inc
 
-values
-~~~~~~
+``values``
+~~~~~~~~~~
 
 **type**: ``array`` **default**: ``[]``