Skip to content

Commit dc82263

Browse files
committed
Merge branch '6.2' into 6.3
* 6.2: Not add quote in default values
2 parents 528b4cf + 8253781 commit dc82263

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
@@ -753,7 +753,7 @@ is disabled. This can be either a template name or the content itself.
753753
path
754754
....
755755

756-
**type**: ``string`` **default**: ``'/_fragment'``
756+
**type**: ``string`` **default**: ``/_fragment``
757757

758758
The path prefix for fragments. The fragment listener will only be executed
759759
when the request starts with this path.
@@ -1352,7 +1352,7 @@ requests (and not on the subrequests).
13521352
dsn
13531353
...
13541354

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

13571357
The DSN where to store the profiling information.
13581358

@@ -1566,7 +1566,7 @@ session
15661566
storage_factory_id
15671567
..................
15681568

1569-
**type**: ``string`` **default**: ``'session.storage.factory.native'``
1569+
**type**: ``string`` **default**: ``session.storage.factory.native``
15701570

15711571
The service ID used for creating the ``SessionStorageInterface`` that stores
15721572
the session. This service is available in the Symfony application via the
@@ -1583,7 +1583,7 @@ To see a list of all available storages, run:
15831583
handler_id
15841584
..........
15851585

1586-
**type**: ``string`` **default**: ``'session.handler.native_file'``
1586+
**type**: ``string`` **default**: ``session.handler.native_file``
15871587

15881588
The service id used for session storage. The default value ``'session.handler.native_file'``
15891589
will let Symfony manage the sessions itself using files to store the session metadata.
@@ -1622,7 +1622,7 @@ use ``/``.
16221622
cache_limiter
16231623
.............
16241624

1625-
**type**: ``string`` or ``int`` **default**: ``''``
1625+
**type**: ``string`` or ``int`` **default**: (an empty string)
16261626

16271627
If set to ``0``, Symfony won't set any particular header related to the cache
16281628
and it will rely on the cache control method configured in the
@@ -1666,7 +1666,7 @@ Unlike the other session options, ``cache_limiter`` is set as a regular
16661666
cookie_domain
16671667
.............
16681668

1669-
**type**: ``string`` **default**: ``''``
1669+
**type**: ``string`` **default**: (an empty string)``''``
16701670

16711671
This determines the domain to set in the session cookie. By default, it's
16721672
blank, meaning the host name of the server which generated the cookie according
@@ -1675,7 +1675,7 @@ to the cookie specification.
16751675
cookie_samesite
16761676
...............
16771677

1678-
**type**: ``string`` or ``null`` **default**: ``'lax'``
1678+
**type**: ``string`` or ``null`` **default**: ``lax``
16791679

16801680
It controls the way cookies are sent when the HTTP request did not originate
16811681
from the same domain that is associated with the cookies. Setting this option is
@@ -1705,7 +1705,7 @@ The possible values for this option are:
17051705
cookie_secure
17061706
.............
17071707

1708-
**type**: ``boolean`` or ``'auto'`` **default**: ``'auto'``
1708+
**type**: ``boolean`` or ``'auto'`` **default**: ``auto``
17091709

17101710
This determines whether cookies should only be sent over secure connections. In
17111711
addition to ``true`` and ``false``, there's a special ``'auto'`` value that
@@ -2682,7 +2682,7 @@ annotations
26822682
cache
26832683
.....
26842684

2685-
**type**: ``string`` **default**: ``'php_array'``
2685+
**type**: ``string`` **default**: ``php_array``
26862686

26872687
This option can be one of the following values:
26882688

@@ -2696,7 +2696,7 @@ none
26962696
file_cache_dir
26972697
..............
26982698

2699-
**type**: ``string`` **default**: ``'%kernel.cache_dir%/annotations'``
2699+
**type**: ``string`` **default**: ``%kernel.cache_dir%/annotations``
27002700

27012701
The directory to store cache files for annotations, in case
27022702
``annotations.cache`` is set to ``'file'``.
@@ -3515,7 +3515,7 @@ marking_store
35153515

35163516
Each marking store can define any of these options:
35173517

3518-
* ``property`` (**type**: ``string`` **default**: ``'marking'``)
3518+
* ``property`` (**type**: ``string`` **default**: ``marking``)
35193519
* ``service`` (**type**: ``string``)
35203520
* ``type`` (**type**: ``string`` **allow value**: ``'method'``)
35213521

reference/configuration/security.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ option if you need to use a custom CSRF token manager.
547547
csrf_parameter
548548
..............
549549

550-
**type**: ``string`` **default**: ``'_csrf_token'``
550+
**type**: ``string`` **default**: ``_csrf_token``
551551

552552
The name of the parameter that stores the CSRF token value.
553553

@@ -562,7 +562,7 @@ default service whose ID is ``security.csrf.token_manager``.
562562
csrf_token_id
563563
.............
564564

565-
**type**: ``string`` **default**: ``'logout'``
565+
**type**: ``string`` **default**: ``logout``
566566

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

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)