Skip to content

Commit 29144ca

Browse files
committed
Merge branch '6.2' into 6.3
* 6.2: move the documentation of the match option to the right place
2 parents d10e4f9 + c3a15e0 commit 29144ca

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

reference/constraints/Choice.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,19 @@ Parameter Description
302302
``{{ value }}`` The current (invalid) value
303303
================= ============================================================
304304

305+
match
306+
~~~~~
307+
308+
**type**: ``boolean`` **default**: ``true``
309+
310+
When this option is ``false``, the constraint checks that the given value is
311+
not one of the values defined in the ``choices`` option. In practice, it makes
312+
the ``Choice`` constraint behave like a ``NotChoice`` constraint.
313+
314+
.. versionadded:: 6.2
315+
316+
The ``match`` option was introduced in Symfony 6.2.
317+
305318
``message``
306319
~~~~~~~~~~~
307320

reference/forms/types/choice.rst

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -195,19 +195,6 @@ correct types will be assigned to the model.
195195

196196
.. include:: /reference/forms/types/options/group_by.rst.inc
197197

198-
match
199-
~~~~~
200-
201-
**type**: ``boolean`` **default**: ``true``
202-
203-
When this option is ``false``, the constraint checks that the given value is
204-
not one of the values defined in the ``choices`` option. In practice, it makes
205-
the ``Choice`` constraint behave like a ``NotChoice`` constraint.
206-
207-
.. versionadded:: 6.2
208-
209-
The ``match`` option was introduced in Symfony 6.2.
210-
211198
.. include:: /reference/forms/types/options/multiple.rst.inc
212199

213200
.. include:: /reference/forms/types/options/placeholder.rst.inc

0 commit comments

Comments
 (0)