Skip to content

Commit df4152f

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: [Validator] Add missing backticks for constraint option names
2 parents d4ab0d6 + 3110a67 commit df4152f

30 files changed

+260
-260
lines changed

reference/constraints/Bic.rst

+8-8
Original file line numberDiff line numberDiff line change
@@ -100,22 +100,22 @@ Available Options
100100

101101
.. include:: /reference/constraints/_groups-option.rst.inc
102102

103-
iban
104-
~~~~
103+
``iban``
104+
~~~~~~~~
105105

106106
**type**: ``string`` **default**: ``null``
107107

108108
An IBAN value to validate that its country code is the same as the BIC's one.
109109

110-
ibanMessage
111-
~~~~~~~~~~~
110+
``ibanMessage``
111+
~~~~~~~~~~~~~~~
112112

113113
**type**: ``string`` **default**: ``This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.``
114114

115115
The default message supplied when the value does not pass the combined BIC/IBAN check.
116116

117-
ibanPropertyPath
118-
~~~~~~~~~~~~~~~~
117+
``ibanPropertyPath``
118+
~~~~~~~~~~~~~~~~~~~~
119119

120120
**type**: ``string`` **default**: ``null``
121121

@@ -125,8 +125,8 @@ For example, if you want to compare the ``$bic`` property of some object
125125
with regard to the ``$iban`` property of the same object, use
126126
``ibanPropertyPath="iban"`` in the comparison constraint of ``$bic``.
127127

128-
message
129-
~~~~~~~
128+
``message``
129+
~~~~~~~~~~~
130130

131131
**type**: ``string`` **default**: ``This is not a valid Business Identifier Code (BIC).``
132132

reference/constraints/CardScheme.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ Available Options
115115

116116
.. include:: /reference/constraints/_groups-option.rst.inc
117117

118-
message
119-
~~~~~~~
118+
``message``
119+
~~~~~~~~~~~
120120

121121
**type**: ``string`` **default**: ``Unsupported card type or invalid card number.``
122122

@@ -137,8 +137,8 @@ Parameter Description
137137

138138
.. include:: /reference/constraints/_payload-option.rst.inc
139139

140-
schemes
141-
~~~~~~~
140+
``schemes``
141+
~~~~~~~~~~~
142142

143143
**type**: ``mixed`` [:ref:`default option <validation-default-option>`]
144144

reference/constraints/Choice.rst

+18-18
Original file line numberDiff line numberDiff line change
@@ -320,17 +320,17 @@ you can pass the class name and the method as an array.
320320
Available Options
321321
-----------------
322322

323-
callback
324-
~~~~~~~~
323+
``callback``
324+
~~~~~~~~~~~~
325325

326326
**type**: ``string|array|Closure``
327327

328328
This is a callback method that can be used instead of the `choices`_ option
329329
to return the choices array. See
330330
`Supplying the Choices with a Callback Function`_ for details on its usage.
331331

332-
choices
333-
~~~~~~~
332+
``choices``
333+
~~~~~~~~~~~
334334

335335
**type**: ``array`` [:ref:`default option <validation-default-option>`]
336336

@@ -340,8 +340,8 @@ will be matched against this array.
340340

341341
.. include:: /reference/constraints/_groups-option.rst.inc
342342

343-
max
344-
~~~
343+
``max``
344+
~~~~~~~
345345

346346
**type**: ``integer``
347347

@@ -350,8 +350,8 @@ to force no more than XX number of values to be selected. For example, if
350350
``max`` is 3, but the input array contains 4 valid items, the validation
351351
will fail.
352352

353-
maxMessage
354-
~~~~~~~~~~
353+
``maxMessage``
354+
~~~~~~~~~~~~~~
355355

356356
**type**: ``string`` **default**: ``You must select at most {{ limit }} choices.``
357357

@@ -367,8 +367,8 @@ Parameter Description
367367
``{{ value }}`` The current (invalid) value
368368
================= ============================================================
369369

370-
message
371-
~~~~~~~
370+
``message``
371+
~~~~~~~~~~~
372372

373373
**type**: ``string`` **default**: ``The value you selected is not a valid choice.``
374374

@@ -385,8 +385,8 @@ Parameter Description
385385
``{{ value }}`` The current (invalid) value
386386
================= ============================================================
387387

388-
min
389-
~~~
388+
``min``
389+
~~~~~~~
390390

391391
**type**: ``integer``
392392

@@ -395,8 +395,8 @@ to force at least XX number of values to be selected. For example, if
395395
``min`` is 3, but the input array only contains 2 valid items, the validation
396396
will fail.
397397

398-
minMessage
399-
~~~~~~~~~~
398+
``minMessage``
399+
~~~~~~~~~~~~~~
400400

401401
**type**: ``string`` **default**: ``You must select at least {{ limit }} choices.``
402402

@@ -412,8 +412,8 @@ Parameter Description
412412
``{{ value }}`` The current (invalid) value
413413
================= ============================================================
414414

415-
multiple
416-
~~~~~~~~
415+
``multiple``
416+
~~~~~~~~~~~~
417417

418418
**type**: ``boolean`` **default**: ``false``
419419

@@ -422,8 +422,8 @@ of a single, scalar value. The constraint will check that each value of
422422
the input array can be found in the array of valid choices. If even one
423423
of the input values cannot be found, the validation will fail.
424424

425-
multipleMessage
426-
~~~~~~~~~~~~~~~
425+
``multipleMessage``
426+
~~~~~~~~~~~~~~~~~~~
427427

428428
**type**: ``string`` **default**: ``One or more of the given values is invalid.``
429429

reference/constraints/Count.rst

+14-14
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ you might add the following:
121121
Options
122122
-------
123123

124-
divisibleBy
125-
~~~~~~~~~~~
124+
``divisibleBy``
125+
~~~~~~~~~~~~~~~
126126

127127
**type**: ``integer`` **default**: null
128128

@@ -139,8 +139,8 @@ a certain number.
139139
are divisible by a certain number, use the
140140
:doc:`DivisibleBy </reference/constraints/DivisibleBy>` constraint.
141141

142-
divisibleByMessage
143-
~~~~~~~~~~~~~~~~~~
142+
``divisibleByMessage``
143+
~~~~~~~~~~~~~~~~~~~~~~
144144

145145
**type**: ``string`` **default**: ``The number of elements in this collection should be a multiple of {{ compared_value }}.``
146146

@@ -159,8 +159,8 @@ Parameter Description
159159
``{{ compared_value }}`` The number configured in the ``divisibleBy`` option
160160
======================== ===================================================
161161

162-
exactMessage
163-
~~~~~~~~~~~~
162+
``exactMessage``
163+
~~~~~~~~~~~~~~~~
164164

165165
**type**: ``string`` **default**: ``This collection should contain exactly {{ limit }} elements.``
166166

@@ -178,8 +178,8 @@ Parameter Description
178178

179179
.. include:: /reference/constraints/_groups-option.rst.inc
180180

181-
max
182-
~~~
181+
``max``
182+
~~~~~~~
183183

184184
**type**: ``integer``
185185

@@ -188,8 +188,8 @@ collection elements count is **greater** than this max value.
188188

189189
This option is required when the ``min`` option is not defined.
190190

191-
maxMessage
192-
~~~~~~~~~~
191+
``maxMessage``
192+
~~~~~~~~~~~~~~
193193

194194
**type**: ``string`` **default**: ``This collection should contain {{ limit }} elements or less.``
195195

@@ -205,8 +205,8 @@ Parameter Description
205205
``{{ limit }}`` The upper limit
206206
=============== ==============================================================
207207

208-
min
209-
~~~
208+
``min``
209+
~~~~~~~
210210

211211
**type**: ``integer``
212212

@@ -215,8 +215,8 @@ collection elements count is **less** than this min value.
215215

216216
This option is required when the ``max`` option is not defined.
217217

218-
minMessage
219-
~~~~~~~~~~
218+
``minMessage``
219+
~~~~~~~~~~~~~~
220220

221221
**type**: ``string`` **default**: ``This collection should contain {{ limit }} elements or more.``
222222

reference/constraints/DateTime.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ Basic Usage
100100
Options
101101
-------
102102

103-
format
104-
~~~~~~
103+
``format``
104+
~~~~~~~~~~
105105

106106
**type**: ``string`` **default**: ``Y-m-d H:i:s``
107107

reference/constraints/DivisibleBy.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ Options
128128

129129
.. include:: /reference/constraints/_groups-option.rst.inc
130130

131-
message
132-
~~~~~~~
131+
``message``
132+
~~~~~~~~~~~
133133

134134
**type**: ``string`` **default**: ``This value should be a multiple of {{ compared_value }}.``
135135

reference/constraints/Email.rst

+10-10
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ Options
103103

104104
.. include:: /reference/constraints/_groups-option.rst.inc
105105

106-
message
107-
~~~~~~~
106+
``message``
107+
~~~~~~~~~~~
108108

109109
**type**: ``string`` **default**: ``This value is not a valid email address.``
110110

@@ -123,8 +123,8 @@ Parameter Description
123123

124124
The ``{{ label }}`` parameter was introduced in Symfony 5.2.
125125

126-
mode
127-
~~~~
126+
``mode``
127+
~~~~~~~~
128128

129129
**type**: ``string`` **default**: ``loose``
130130

@@ -135,20 +135,20 @@ Valid values are:
135135
* ``strict``
136136
* ``html5``
137137

138-
loose
139-
.....
138+
``loose``
139+
.........
140140

141141
A simple regular expression. Allows all values with an "@" symbol in, and a "."
142142
in the second host part of the email address.
143143

144-
strict
145-
......
144+
``strict``
145+
..........
146146

147147
Uses the `egulias/email-validator`_ library to perform an RFC compliant
148148
validation. You will need to install that library to use this mode.
149149

150-
html5
151-
.....
150+
``html5``
151+
.........
152152

153153
This matches the pattern used for the `HTML5 email input element`_.
154154

reference/constraints/Expression.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ Parameter Description
305305

306306
.. include:: /reference/constraints/_payload-option.rst.inc
307307

308-
values
309-
~~~~~~
308+
``values``
309+
~~~~~~~~~~
310310

311311
**type**: ``array`` **default**: ``[]``
312312

0 commit comments

Comments
 (0)