Skip to content

Commit 8ca4d1b

Browse files
committed
Merge branch '5.4' into 6.2
* 5.4: Fix non-working examples of `json` and `csv` env var processors (closes symfony/symfony#50341).
2 parents 9e84697 + 4a3d72b commit 8ca4d1b

File tree

1 file changed

+14
-18
lines changed

1 file changed

+14
-18
lines changed

configuration/env_var_processors.rst

+14-18
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,8 @@ Symfony provides the following env var processors:
251251
252252
# config/packages/framework.yaml
253253
parameters:
254-
env(TRUSTED_HOSTS): '["10.0.0.1", "10.0.0.2"]'
255-
framework:
256-
trusted_hosts: '%env(json:TRUSTED_HOSTS)%'
254+
env(ALLOWED_LANGUAGES): '["en","de","es"]'
255+
app_allowed_languages: '%env(json:ALLOWED_LANGUAGES)%'
257256
258257
.. code-block:: xml
259258
@@ -268,10 +267,9 @@ Symfony provides the following env var processors:
268267
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
269268
270269
<parameters>
271-
<parameter key="env(TRUSTED_HOSTS)">["10.0.0.1", "10.0.0.2"]</parameter>
270+
<parameter key="env(ALLOWED_LANGUAGES)">["en","de","es"]</parameter>
271+
<parameter key="app_allowed_languages">%env(json:ALLOWED_LANGUAGES)%</parameter>
272272
</parameters>
273-
274-
<framework:config trusted-hosts="%env(json:TRUSTED_HOSTS)%"/>
275273
</container>
276274
277275
.. code-block:: php
@@ -282,9 +280,9 @@ Symfony provides the following env var processors:
282280
use Symfony\Component\DependencyInjection\ContainerBuilder;
283281
use Symfony\Config\FrameworkConfig;
284282
285-
return static function (ContainerBuilder $container, FrameworkConfig $framework) {
286-
$container->setParameter('env(TRUSTED_HOSTS)', '["10.0.0.1", "10.0.0.2"]');
287-
$framework->trustedHosts(env('TRUSTED_HOSTS')->json());
283+
return static function (ContainerBuilder $container) {
284+
$container->setParameter('env(ALLOWED_LANGUAGES)', '["en","de","es"]');
285+
$container->setParameter('app_allowed_languages', '%env(json:ALLOWED_LANGUAGES)%');
288286
};
289287
290288
``env(resolve:FOO)``
@@ -337,9 +335,8 @@ Symfony provides the following env var processors:
337335
338336
# config/packages/framework.yaml
339337
parameters:
340-
env(TRUSTED_HOSTS): "10.0.0.1,10.0.0.2"
341-
framework:
342-
trusted_hosts: '%env(csv:TRUSTED_HOSTS)%'
338+
env(ALLOWED_LANGUAGES): "en,de,es"
339+
app_allowed_languages: '%env(csv:ALLOWED_LANGUAGES)%'
343340
344341
.. code-block:: xml
345342
@@ -354,10 +351,9 @@ Symfony provides the following env var processors:
354351
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
355352
356353
<parameters>
357-
<parameter key="env(TRUSTED_HOSTS)">10.0.0.1,10.0.0.2</parameter>
354+
<parameter key="env(ALLOWED_LANGUAGES)">en,de,es</parameter>
355+
<parameter key="app_allowed_languages">%env(csv:ALLOWED_LANGUAGES)%</parameter>
358356
</parameters>
359-
360-
<framework:config trusted-hosts="%env(csv:TRUSTED_HOSTS)%"/>
361357
</container>
362358
363359
.. code-block:: php
@@ -368,9 +364,9 @@ Symfony provides the following env var processors:
368364
use Symfony\Component\DependencyInjection\ContainerBuilder;
369365
use Symfony\Config\FrameworkConfig;
370366
371-
return static function (ContainerBuilder $container, FrameworkConfig $framework) {
372-
$container->setParameter('env(TRUSTED_HOSTS)', '10.0.0.1,10.0.0.2');
373-
$framework->trustedHosts(env('TRUSTED_HOSTS')->csv());
367+
return static function (ContainerBuilder $container) {
368+
$container->setParameter('env(ALLOWED_LANGUAGES)', 'en,de,es');
369+
$container->setParameter('app_allowed_languages', '%env(csv:ALLOWED_LANGUAGES)%');
374370
};
375371
376372
``env(shuffle:FOO)``

0 commit comments

Comments
 (0)