Skip to content

Commit 6b2291f

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

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

reference/configuration/framework.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2234,7 +2234,7 @@ php_errors
22342234
log
22352235
...
22362236

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

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

reference/constraints/UniqueEntity.rst

Lines changed: 1 addition & 1 deletion
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)