Skip to content

Commit 835ceb8

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: Fix some content with wrong RST syntax [Validator] avoid broken rendering of inline types in UniqueEntity
2 parents c33ab20 + 6b2291f commit 835ceb8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

reference/configuration/framework.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -2241,7 +2241,7 @@ php_errors
22412241
log
22422242
...
22432243

2244-
**type**: ``boolean`` | ``int`` | ``array<int, string>`` **default**: ``true``
2244+
**type**: ``boolean``, ``int`` or ``array<int, string>`` **default**: ``true``
22452245

22462246
Use the application logger instead of the PHP logger for logging PHP errors.
22472247
When an integer value is used, it defines a bitmask of PHP errors that will

reference/constraints/UniqueEntity.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ each with a single field.
277277
``ignoreNull``
278278
~~~~~~~~~~~~~~
279279

280-
**type**: ``boolean`` | ``string`` | ``array`` **default**: ``true``
280+
**type**: ``boolean``, ``string`` or ``array`` **default**: ``true``
281281

282282
If this option is set to ``true``, then the constraint will allow multiple
283283
entities to have a ``null`` value for a field without failing validation.

0 commit comments

Comments
 (0)