Skip to content

Commit b32d9ff

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: [Framework] Add missing configuration keys
2 parents 53f3666 + 235c163 commit b32d9ff

File tree

1 file changed

+60
-25
lines changed

1 file changed

+60
-25
lines changed

reference/configuration/framework.rst

Lines changed: 60 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,6 +1579,41 @@ The directory where routing information will be cached. Can be set to
15791579

15801580
The ``cache_dir`` setting was introduced in Symfony 6.2.
15811581

1582+
secrets
1583+
~~~~~~~
1584+
1585+
enabled
1586+
.......
1587+
1588+
**type**: ``boolean`` **default**: ``true``
1589+
1590+
Whether to enable or not secrets managements.
1591+
1592+
decryption_env_var
1593+
..................
1594+
1595+
**type**: ``string`` **default**: ``base64:default::SYMFONY_DECRYPTION_SECRET``
1596+
1597+
The env var name that contains the vault decryption secret. By default, this
1598+
value will be decoded from base64.
1599+
1600+
local_dotenv_file
1601+
.................
1602+
1603+
**type**: ``string`` **default**: ``%kernel.project_dir%/.env.%kernel.environment%.local``
1604+
1605+
The path to the local ``.env`` file. This file must contain the vault
1606+
decryption key, given by the ``decryption_env_var`` option.
1607+
1608+
vault_directory
1609+
...............
1610+
1611+
**type**: ``string`` **default**: ``%kernel.project_dir%/config/secrets/%kernel.runtime_environment%``
1612+
1613+
The directory to store the secret vault. By default, the path includes the value
1614+
of the :ref:`kernel.runtime_environment <configuration-kernel-runtime-environment>`
1615+
parameter.
1616+
15821617
.. _config-framework-session:
15831618

15841619
session
@@ -1903,6 +1938,16 @@ This specifies if the session ID is stored on the client side using cookies or
19031938
not. By default, it will use the value defined in the ``php.ini`` with the
19041939
``session.use_cookies`` directive.
19051940

1941+
ssi
1942+
~~~
1943+
1944+
enabled
1945+
.......
1946+
1947+
**type**: ``boolean`` **default**: ``false``
1948+
1949+
Whether to enable or not SSI support in your application.
1950+
19061951
assets
19071952
~~~~~~
19081953

@@ -2794,31 +2839,6 @@ annotation changes). For performance reasons, it is recommended to disable
27942839
debug mode in production, which will happen automatically if you use the
27952840
default value.
27962841

2797-
2798-
secrets
2799-
~~~~~~~
2800-
2801-
decryption_env_var
2802-
..................
2803-
2804-
**type**: ``string`` **default**: ``base64:default::SYMFONY_DECRYPTION_SECRET``
2805-
2806-
The environment variable that contains the decryption key.
2807-
2808-
local_dotenv_file
2809-
.................
2810-
2811-
**type**: ``string`` **default**: ``%kernel.project_dir%/.env.%kernel.environment%.local``
2812-
2813-
Path to an dotenv file that holds secrets. This is primarily used for testing.
2814-
2815-
vault_directory
2816-
...............
2817-
2818-
**type**: ``string`` **default**: ``%kernel.project_dir%/config/secrets/%kernel.environment%``
2819-
2820-
The directory where the vault of secrets is stored.
2821-
28222842
.. _configuration-framework-serializer:
28232843

28242844
serializer
@@ -3498,6 +3518,21 @@ header name and value the header value.
34983518

34993519
For more information, see :ref:`Configuring Emails Globally <mailer-configure-email-globally>`
35003520

3521+
messenger
3522+
~~~~~~~~~
3523+
3524+
enabled
3525+
.......
3526+
3527+
**type**: ``boolean`` **default**: ``true``
3528+
3529+
Whether to enable or not Messenger.
3530+
3531+
.. seealso::
3532+
3533+
For more details, see the :doc:`Messenger component </messenger>`
3534+
documentation.
3535+
35013536
web_link
35023537
~~~~~~~~
35033538

0 commit comments

Comments
 (0)