Skip to content

Commit 8253781

Browse files
committed
Merge branch '5.4' into 6.2
* 5.4: Not add quote in default values
2 parents a9a1dcb + 245dd26 commit 8253781

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

reference/configuration/framework.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ is disabled. This can be either a template name or the content itself.
741741
path
742742
....
743743

744-
**type**: ``string`` **default**: ``'/_fragment'``
744+
**type**: ``string`` **default**: ``/_fragment``
745745

746746
The path prefix for fragments. The fragment listener will only be executed
747747
when the request starts with this path.
@@ -1328,7 +1328,7 @@ requests (and not on the subrequests).
13281328
dsn
13291329
...
13301330

1331-
**type**: ``string`` **default**: ``'file:%kernel.cache_dir%/profiler'``
1331+
**type**: ``string`` **default**: ``file:%kernel.cache_dir%/profiler``
13321332

13331333
The DSN where to store the profiling information.
13341334

@@ -1542,7 +1542,7 @@ session
15421542
storage_factory_id
15431543
..................
15441544

1545-
**type**: ``string`` **default**: ``'session.storage.factory.native'``
1545+
**type**: ``string`` **default**: ``session.storage.factory.native``
15461546

15471547
The service ID used for creating the ``SessionStorageInterface`` that stores
15481548
the session. This service is available in the Symfony application via the
@@ -1559,7 +1559,7 @@ To see a list of all available storages, run:
15591559
handler_id
15601560
..........
15611561

1562-
**type**: ``string`` **default**: ``'session.handler.native_file'``
1562+
**type**: ``string`` **default**: ``session.handler.native_file``
15631563

15641564
The service id used for session storage. The default value ``'session.handler.native_file'``
15651565
will let Symfony manage the sessions itself using files to store the session metadata.
@@ -1598,7 +1598,7 @@ use ``/``.
15981598
cache_limiter
15991599
.............
16001600

1601-
**type**: ``string`` or ``int`` **default**: ``''``
1601+
**type**: ``string`` or ``int`` **default**: (an empty string)
16021602

16031603
If set to ``0``, Symfony won't set any particular header related to the cache
16041604
and it will rely on the cache control method configured in the
@@ -1642,7 +1642,7 @@ Unlike the other session options, ``cache_limiter`` is set as a regular
16421642
cookie_domain
16431643
.............
16441644

1645-
**type**: ``string`` **default**: ``''``
1645+
**type**: ``string`` **default**: (an empty string)``''``
16461646

16471647
This determines the domain to set in the session cookie. By default, it's
16481648
blank, meaning the host name of the server which generated the cookie according
@@ -1651,7 +1651,7 @@ to the cookie specification.
16511651
cookie_samesite
16521652
...............
16531653

1654-
**type**: ``string`` or ``null`` **default**: ``'lax'``
1654+
**type**: ``string`` or ``null`` **default**: ``lax``
16551655

16561656
It controls the way cookies are sent when the HTTP request did not originate
16571657
from the same domain that is associated with the cookies. Setting this option is
@@ -1681,7 +1681,7 @@ The possible values for this option are:
16811681
cookie_secure
16821682
.............
16831683

1684-
**type**: ``boolean`` or ``'auto'`` **default**: ``'auto'``
1684+
**type**: ``boolean`` or ``'auto'`` **default**: ``auto``
16851685

16861686
This determines whether cookies should only be sent over secure connections. In
16871687
addition to ``true`` and ``false``, there's a special ``'auto'`` value that
@@ -2650,7 +2650,7 @@ annotations
26502650
cache
26512651
.....
26522652

2653-
**type**: ``string`` **default**: ``'php_array'``
2653+
**type**: ``string`` **default**: ``php_array``
26542654

26552655
This option can be one of the following values:
26562656

@@ -2664,7 +2664,7 @@ none
26642664
file_cache_dir
26652665
..............
26662666

2667-
**type**: ``string`` **default**: ``'%kernel.cache_dir%/annotations'``
2667+
**type**: ``string`` **default**: ``%kernel.cache_dir%/annotations``
26682668

26692669
The directory to store cache files for annotations, in case
26702670
``annotations.cache`` is set to ``'file'``.
@@ -3483,7 +3483,7 @@ marking_store
34833483

34843484
Each marking store can define any of these options:
34853485

3486-
* ``property`` (**type**: ``string`` **default**: ``'marking'``)
3486+
* ``property`` (**type**: ``string`` **default**: ``marking``)
34873487
* ``service`` (**type**: ``string``)
34883488
* ``type`` (**type**: ``string`` **allow value**: ``'method'``)
34893489

reference/configuration/security.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ option if you need to use a custom CSRF token generator.
475475
csrf_parameter
476476
..............
477477

478-
**type**: ``string`` **default**: ``'_csrf_token'``
478+
**type**: ``string`` **default**: ``_csrf_token``
479479

480480
The name of the parameter that stores the CSRF token value.
481481

@@ -490,7 +490,7 @@ default service whose ID is ``security.csrf.token_manager``.
490490
csrf_token_id
491491
.............
492492

493-
**type**: ``string`` **default**: ``'logout'``
493+
**type**: ``string`` **default**: ``logout``
494494

495495
An arbitrary string used to identify the token (and check its validity afterwards).
496496

reference/configuration/twig.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ autoescape
4141
This option is deprecated since Symfony 6.1. If required, use the
4242
``autoescape_service`` or ``autoescape_service_method`` option instead.
4343

44-
**type**: ``boolean`` or ``string`` **default**: ``'name'``
44+
**type**: ``boolean`` or ``string`` **default**: ``name``
4545

4646
If set to ``false``, automatic escaping is disabled (you can still escape each content
4747
individually in the templates).
@@ -88,7 +88,7 @@ called to determine the default escaping applied to the template.
8888
base_template_class
8989
~~~~~~~~~~~~~~~~~~~
9090

91-
**type**: ``string`` **default**: ``'Twig\Template'``
91+
**type**: ``string`` **default**: ``Twig\Template``
9292

9393
Twig templates are compiled into PHP classes before using them to render
9494
contents. This option defines the base class from which all the template classes
@@ -98,7 +98,7 @@ application harder to maintain.
9898
cache
9999
~~~~~
100100

101-
**type**: ``string`` | ``false`` **default**: ``'%kernel.cache_dir%/twig'``
101+
**type**: ``string`` | ``false`` **default**: ``%kernel.cache_dir%/twig``
102102

103103
Before using the Twig templates to render some contents, they are compiled into
104104
regular PHP code. Compilation is a costly process, so the result is cached in
@@ -112,7 +112,7 @@ compiled again.
112112
charset
113113
~~~~~~~
114114

115-
**type**: ``string`` **default**: ``'%kernel.charset%'``
115+
**type**: ``string`` **default**: ``%kernel.charset%``
116116

117117
The charset used by the template files. By default it's the same as the value of
118118
the :ref:`kernel.charset container parameter <configuration-kernel-charset>`,
@@ -165,7 +165,7 @@ If this option is ``false``, the ``dump()`` function doesn't output any contents
165165
default_path
166166
~~~~~~~~~~~~
167167

168-
**type**: ``string`` **default**: ``'%kernel.project_dir%/templates'``
168+
**type**: ``string`` **default**: ``%kernel.project_dir%/templates``
169169

170170
The path to the directory where Symfony will look for the application Twig
171171
templates by default. If you store the templates in more than one directory, use

reference/configuration/web_profiler.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Configuration
3030
excluded_ajax_paths
3131
~~~~~~~~~~~~~~~~~~~
3232

33-
**type**: ``string`` **default**: ``'^/((index|app(_[\w]+)?)\.php/)?_wdt'``
33+
**type**: ``string`` **default**: ``^/((index|app(_[\w]+)?)\.php/)?_wdt``
3434

3535
When the toolbar logs AJAX requests, it matches their URLs against this regular
3636
expression. If the URL matches, the request is not displayed in the toolbar. This

reference/forms/types/collection.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ on whether you are adding a new entry or editing an existing entry::
225225
entry_type
226226
~~~~~~~~~~
227227

228-
**type**: ``string`` **default**: ``'Symfony\Component\Form\Extension\Core\Type\TextType'``
228+
**type**: ``string`` **default**: ``Symfony\Component\Form\Extension\Core\Type\TextType``
229229

230230
This is the field type for each item in this collection (e.g. ``TextType``,
231231
``ChoiceType``, etc). For example, if you have an array of email addresses,

0 commit comments

Comments
 (0)