8000 Merge branch '5.1' into 5.x · symfony/symfony-docs@ab17d09 · GitHub
[go: up one dir, main page]
Skip to content

Commit ab17d09

Browse files
OskarStarkOskarStark
committed
Merge branch '5.1' into 5.x
* 5.1: Use integer type instead of int & boolean instead of bool Replace bool by boolean Use integer typehint instead int Use int type instead integer
2 parents 59139b9 + 85ff85e commit ab17d09

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
lines changed

‎reference/configuration/framework.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ outgoing network interface.
860860
buffer
861861
......
862862

863-
**type**: ``bool`` | ``Closure``
863+
**type**: ``boolean`` | ``Closure``
864864

865865
Buffering the response means that you can access its content multiple times
866866
without performing the request again. Buffering is enabled by default when the
@@ -3045,7 +3045,7 @@ Name of the workflow you want to create.
30453045
audit_trail
30463046
"""""""""""
30473047

3048-
**type**: ``bool``
3048+
**type**: ``boolean``
30493049

30503050
If set to ``true``, the :class:`Symfony\\Component\\Workflow\\EventListener\\AuditTrailListener`
30513051
will be enabled.

‎reference/configuration/twig.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ no specific character is passed as argument to the ``number_format`` filter.
294294
optimizations
295295
~~~~~~~~~~~~~
296296

297-
**type**: ``int`` **default**: ``-1``
297+
**type**: ``integer`` **default**: ``-1``
298298

299299
Twig includes an extension called ``optimizer`` which is enabled by default in
300300
Symfony applications. This extension analyzes the templates to optimize them

‎reference/constraints/AtLeastOneOf.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ has to be satisfied in order for the validation to succeed.
163163
includeInternalMessages
164164
~~~~~~~~~~~~~~~~~~~~~~~
165165

166-
**type**: ``bool`` **default**: ``true``
166+
**type**: ``boolean`` **default**: ``true``
167167

168168
If set to ``true``, the message that is shown if the validation fails,
169169
will include the list of messages for the internal constraints. See option

‎reference/constraints/Hostname.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Parameter Description
122122
``requireTld``
123123
~~~~~~~~~~~~~~
124124

125-
**type**: ``bool`` **default**: ``true``
125+
**type**: ``boolean`` **default**: ``true``
126126

127127
By default, hostnames are considered valid only when they are fully qualified
128128
and include their TLDs (top-level domain names). For instance, ``example.com``

‎reference/constraints/NotBlank.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Options
8585
allowNull
8686
~~~~~~~~~
8787

88-
**type**: ``bool`` **default**: ``false``
88+
**type**: ``boolean`` **default**: ``false``
8989

9090
If set to ``true``, ``null`` values are considered valid and won't trigger a
9191
constraint violation.

‎reference/constraints/Traverse.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ The ``groups`` option is not available for this constraint.
146146
``traverse``
147147
~~~~~~~~~~~~
148148

149-
**type**: ``bool`` **default**: ``true``
149+
**type**: ``boolean`` **default**: ``true``
150150

151151
Instances of ``\Traversable`` are traversed by default, use this option to
152152
disable validating:

‎reference/forms/types/color.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Field Options
4949
html5
5050
~~~~~
5151

52-
**type**: ``bool`` **default**: ``false``
52+
**type**: ``boolean`` **default**: ``false``
5353

5454
.. versionadded:: 5.1
5555

‎reference/forms/types/options/help_html.rst.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
help_html
22
~~~~~~~~~
33

4-
**type**: ``bool`` **default**: ``false``
4+
**type**: ``boolean`` **default**: ``false``
55

66
By default, the contents of the ``help`` option are escaped before rendering
77
them in the template. Set this option to ``true`` to not escape them, which is

‎reference/forms/types/options/label_html.rst.inc

Lines changed: 1 addition & 1 deletion
< 4AB3 tr class="diff-line-row">
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
``label_html``
22
~~~~~~~~~~~~~~
33

4-
**type**: ``bool`` **default**: ``false``
4+
**type**: ``boolean`` **default**: ``false``
55

66
.. versionadded:: 5.1
77

0 commit comments

Comments
 (0)
0