Added support for using the "{{ label }}" placeholder in constraint messages

a-menshchikov · javiereguiluz · commit e2989290cf3a · 2020-09-03T17:56:32.000+02:00
diff --git a/components/form.rst b/components/form.rst
@@ -728,6 +728,11 @@ and the errors will display next to the fields on error.
     For a list of all of the built-in validation constraints, see
     :doc:`/reference/constraints`.
 
+.. versionadded:: 5.2
+
+    Constraint message can contains ``{{ label }}`` placeholder that will be replaced
+    by corresponding form field label (in view of ``label_format`` option).
+
 Accessing Form Errors
 ~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/forms.rst b/forms.rst
@@ -548,6 +548,11 @@ corresponding errors printed out with the form. Read the
 :doc:`Symfony validation documentation </validation>` to learn more about this
 powerful feature.
 
+.. versionadded:: 5.2
+
+    Constraint message can contains ``{{ label }}`` placeholder that will be replaced
+    by corresponding form field label (in view of ``label_format`` option).
+
 Other Common Form Features
 --------------------------
 
diff --git a/reference/constraints/Blank.rst b/reference/constraints/Blank.rst
@@ -102,6 +102,11 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
diff --git a/reference/constraints/CardScheme.rst b/reference/constraints/CardScheme.rst
@@ -112,8 +112,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
 
 schemes
diff --git a/reference/constraints/Choice.rst b/reference/constraints/Choice.rst
@@ -392,6 +392,11 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
diff --git a/reference/constraints/Currency.rst b/reference/constraints/Currency.rst
@@ -94,8 +94,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
 
 .. _`3-letter ISO 4217`: https://en.wikipedia.org/wiki/ISO_4217
diff --git a/reference/constraints/Date.rst b/reference/constraints/Date.rst
@@ -98,6 +98,11 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
diff --git a/reference/constraints/DateTime.rst b/reference/constraints/DateTime.rst
@@ -107,6 +107,11 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
diff --git a/reference/constraints/Email.rst b/reference/constraints/Email.rst
@@ -101,8 +101,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 mode
 ~~~~
 
diff --git a/reference/constraints/Expression.rst b/reference/constraints/Expression.rst
@@ -260,8 +260,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
 
 values
diff --git a/reference/constraints/Hostname.rst b/reference/constraints/Hostname.rst
@@ -110,8 +110,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
 
 ``requireTld``
diff --git a/reference/constraints/Iban.rst b/reference/constraints/Iban.rst
@@ -108,8 +108,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
 
 .. _`International Bank Account Number (IBAN)`: https://en.wikipedia.org/wiki/International_Bank_Account_Number
diff --git a/reference/constraints/Ip.rst b/reference/constraints/Ip.rst
@@ -95,8 +95,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_normalizer-option.rst.inc
 
 .. include:: /reference/constraints/_payload-option.rst.inc
diff --git a/reference/constraints/IsFalse.rst b/reference/constraints/IsFalse.rst
@@ -125,6 +125,11 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
diff --git a/reference/constraints/IsNull.rst b/reference/constraints/IsNull.rst
@@ -96,6 +96,11 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
diff --git a/reference/constraints/IsTrue.rst b/reference/constraints/IsTrue.rst
@@ -129,6 +129,11 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
diff --git a/reference/constraints/Isbn.rst b/reference/constraints/Isbn.rst
@@ -109,8 +109,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_groups-option.rst.inc
 
 isbn10Message
@@ -127,8 +132,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 isbn13Message
 ~~~~~~~~~~~~~
 
@@ -143,8 +153,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 message
 ~~~~~~~
 
@@ -159,8 +174,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
 
 type
diff --git a/reference/constraints/Isin.rst b/reference/constraints/Isin.rst
@@ -92,8 +92,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
 
 .. _`International Securities Identification Number (ISIN)`: https://en.wikipedia.org/wiki/International_Securities_Identification_Number
diff --git a/reference/constraints/Issn.rst b/reference/constraints/Issn.rst
@@ -102,8 +102,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
 
 requireHyphen
diff --git a/reference/constraints/Language.rst b/reference/constraints/Language.rst
@@ -106,8 +106,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
 
 .. _`ISO 639-1`: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
diff --git a/reference/constraints/Locale.rst b/reference/constraints/Locale.rst
@@ -107,8 +107,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
 
 .. _`ICU format locale IDs`: http://userguide.icu-project.org/locale
diff --git a/reference/constraints/Luhn.rst b/reference/constraints/Luhn.rst
@@ -101,8 +101,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
 
 .. _`Luhn algorithm`: https://en.wikipedia.org/wiki/Luhn_algorithm
diff --git a/reference/constraints/NotBlank.rst b/reference/constraints/NotBlank.rst
@@ -105,8 +105,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_normalizer-option.rst.inc
 
 .. include:: /reference/constraints/_payload-option.rst.inc
diff --git a/reference/constraints/NotNull.rst b/reference/constraints/NotNull.rst
@@ -94,6 +94,11 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
diff --git a/reference/constraints/Range.rst b/reference/constraints/Range.rst
@@ -330,8 +330,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 max
 ~~~
 
diff --git a/reference/constraints/Regex.rst b/reference/constraints/Regex.rst
@@ -275,8 +275,13 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 pattern
 ~~~~~~~
 
diff --git a/reference/constraints/Time.rst b/reference/constraints/Time.rst
@@ -101,6 +101,11 @@ You can use the following parameters in this message:
 Parameter        Description
 ===============  ==============================================================
 ``{{ value }}``  The current (invalid) value
+``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. versionadded:: 5.2
+
+    The ``{{ label }}`` parameter was introduced in Symfony 5.2.
+
 .. include:: /reference/constraints/_payload-option.rst.inc
diff --git a/reference/constraints/Timezone.rst b/reference/constraints/Timezone.rst
diff --git a/reference/constraints/Type.rst b/reference/constraints/Type.rst
diff --git a/reference/constraints/UniqueEntity.rst b/reference/constraints/UniqueEntity.rst
diff --git a/reference/constraints/Url.rst b/reference/constraints/Url.rst
diff --git a/reference/constraints/Uuid.rst b/reference/constraints/Uuid.rst
