Merge branch '5.4' into 6.0

* 5.4:
  Use PHP-DSL `env()` configurator when possible

Author: javiereguiluz

configuration.rst

@@ -639,10 +639,18 @@ This example shows how you could configure the database connection using an env
                 'dbal' => [
                     // by convention the env var names are always uppercase
                     'url' => '%env(resolve:DATABASE_URL)%',
+                    // or
+                    'url' => env('DATABASE_URL')->resolve(),
                 ],
             ]);
         };
 
+.. versionadded:: 5.3
+
+    The ``env()`` configurator syntax was introduced in 5.3.
+    In ``PHP`` configuration files, it will allow to autocomplete methods based
+    on processors name (i.e. ``env('SOME_VAR')->default('foo')``).
+
 .. seealso::
 
     The values of env vars can only be strings, but Symfony includes some

configuration/env_var_processors.rst

@@ -50,10 +50,18 @@ processor to turn the value of the ``HTTP_PORT`` env var into an integer:
 
         return static function (FrameworkConfig $framework) {
             $framework->router()
+                ->httpPort('%env(int:HTTP_PORT)%')
+                // or
                 ->httpPort(env('HTTP_PORT')->int())
             ;
         };
 
+.. versionadded:: 5.3
+
+    The ``env()`` configurator syntax was introduced in 5.3.
+    In ``PHP`` configuration files, it will allow to autocomplete methods based
+    on processors name (i.e. ``env('SOME_VAR')->default('foo')``).
+
 Built-In Environment Variable Processors
 ----------------------------------------
 
@@ -236,7 +244,7 @@ Symfony provides the following env var processors:
                 $container->setParameter('env(HEALTH_CHECK_METHOD)', 'Symfony\Component\HttpFoundation\Request::METHOD_HEAD');
                 $security->accessControl()
                     ->path('^/health-check$')
-                    ->methods(['%env(const:HEALTH_CHECK_METHOD)%']);
+                    ->methods([env('HEALTH_CHECK_METHOD')->const()]);
             };
 
 ``env(base64:FOO)``

configuration/secrets.rst

@@ -145,7 +145,7 @@ If you stored a ``DATABASE_PASSWORD`` secret, you can reference it by:
         return static function (DoctrineConfig $doctrine) {
             $doctrine->dbal()
                 ->connection('default')
-                    ->password('%env(DATABASE_PASSWORD)%')
+                    ->password(env('DATABASE_PASSWORD'))
             ;
         };
 

doctrine/multiple_entity_managers.rst

@@ -136,15 +136,15 @@ The following configuration code shows how you can configure two entity managers
             // configure these for your database server
             $doctrine->dbal()
                 ->connection('default')
-                ->url('%env(resolve:DATABASE_URL)%')
+                ->url(env('DATABASE_URL')->resolve())
                 ->driver('pdo_mysql')
                 ->serverVersion('5.7')
                 ->charset('utf8mb4');
 
             // configure these for your database server
             $doctrine->dbal()
                 ->connection('customer')
-                ->url('%env(resolve:DATABASE_CUSTOMER_URL)%')
+                ->url(env('DATABASE_CUSTOMER_URL')->resolve())
                 ->driver('pdo_mysql')
                 ->serverVersion('5.7')
                 ->charset('utf8mb4');

lock.rst

@@ -149,7 +149,7 @@ this behavior by using the ``lock`` key like:
                 ->resource('default', ['sqlsrv:server=127.0.0.1;Database=app'])
                 ->resource('default', ['oci:host=127.0.0.1;dbname=app'])
                 ->resource('default', ['mongodb://127.0.0.1/app?collection=lock'])
-                ->resource('default', ['%env(LOCK_DSN)%'])
+                ->resource('default', [env('LOCK_DSN')])
 
                 // named locks
                 ->resource('invoice', ['semaphore', 'redis://r2.docker'])

mailer.rst

@@ -60,7 +60,7 @@ over SMTP by configuring the DSN in your ``.env`` file (the ``user``,
         return static function (ContainerConfigurator $containerConfigurator): void {
             $containerConfigurator->extension('framework', [
                 'mailer' => [
-                    'dsn' => '%env(MAILER_DSN)%',
+                    'dsn' => env('MAILER_DSN'),
                 ],
             ]);
         };
@@ -1102,8 +1102,8 @@ This can be configured by replacing the ``dsn`` configuration entry with a
 
         return static function (FrameworkConfig $framework) {
             $framework->mailer()
-                ->transport('main', '%env(MAILER_DSN)%')
-                ->transport('alternative', '%env(MAILER_DSN_IMPORTANT)%')
+                ->transport('main', env('MAILER_DSN'))
+                ->transport('alternative', env('MAILER_DSN_IMPORTANT'))
             ;
         };
 
@@ -1175,7 +1175,7 @@ you have a transport called ``async``, you can route the message there:
 
         return static function (FrameworkConfig $framework) {
             $framework->messenger()
-                ->transport('async')->dsn('%env(MESSENGER_TRANSPORT_DSN)%');
+                ->transport('async')->dsn(env('MESSENGER_TRANSPORT_DSN'));
 
             $framework->messenger()
                 ->routing('Symfony\Component\Mailer\Messenger\SendEmailMessage')

messenger.rst

@@ -188,12 +188,12 @@ that uses this configuration:
         return static function (FrameworkConfig $framework) {
             $framework->messenger()
                 ->transport('async')
-                    ->dsn('%env(MESSENGER_TRANSPORT_DSN)%')
+                    ->dsn(env('MESSENGER_TRANSPORT_DSN'))
             ;
 
             $framework->messenger()
                 ->transport('async')
-                    ->dsn('%env(MESSENGER_TRANSPORT_DSN)%')
+                    ->dsn(env('MESSENGER_TRANSPORT_DSN'))
                     ->options([])
             ;
         };
@@ -583,11 +583,11 @@ different messages to them. For example:
             $messenger = $framework->messenger();
 
             $messenger->transport('async_priority_high')
-                ->dsn('%env(MESSENGER_TRANSPORT_DSN)%')
+                ->dsn(env('MESSENGER_TRANSPORT_DSN'))
                 ->options(['queue_name' => 'high']);
 
             $messenger->transport('async_priority_low')
-                ->dsn('%env(MESSENGER_TRANSPORT_DSN)%')
+                ->dsn(env('MESSENGER_TRANSPORT_DSN'))
                 ->options(['queue_name' => 'low']);
 
             $messenger->routing('App\Message\SmsNotification')->senders(['async_priority_low']);
@@ -781,7 +781,7 @@ this is configurable for each transport:
             $messenger = $framework->messenger();
 
             $messenger->transport('async_priority_high')
-                ->dsn('%env(MESSENGER_TRANSPORT_DSN)%')
+                ->dsn(env('MESSENGER_TRANSPORT_DSN'))
                 // default configuration
                 ->retryStrategy()
                     ->maxRetries(3)
@@ -981,7 +981,7 @@ override the failure transport for only specific transports:
             $messenger->failureTransport('failed_default');
 
             $messenger->transport('async_priority_high')
-                ->dsn('%env(MESSENGER_TRANSPORT_DSN)%')
+                ->dsn(env('MESSENGER_TRANSPORT_DSN'))
                 ->failureTransport('failed_high_priority');
 
             // since no failed transport is configured, the one used will be
@@ -1069,7 +1069,7 @@ options. Options can be passed to the transport via a DSN string or configuratio
             $messenger = $framework->messenger();
 
             $messenger->transport('my_transport')
-                ->dsn('%env(MESSENGER_TRANSPORT_DSN)%')
+                ->dsn(env('MESSENGER_TRANSPORT_DSN'))
                 ->options(['auto_setup' => false]);
         };
 

notifier.rst

@@ -132,7 +132,7 @@ configure the ``texter_transports``:
 
         return static function (FrameworkConfig $framework) {
             $framework->notifier()
-                ->texterTransport('twilio', '%env(TWILIO_DSN)%')
+                ->texterTransport('twilio', env('TWILIO_DSN'))
             ;
         };
 
@@ -210,7 +210,7 @@ Chatters are configured using the ``chatter_transports`` setting:
 
         return static function (FrameworkConfig $framework) {
             $framework->notifier()
-                ->chatterTransport('slack', '%env(SLACK_DSN)%')
+                ->chatterTransport('slack', env('SLACK_DSN'))
             ;
         };
 
@@ -274,7 +274,7 @@ notification emails:
 
         return static function (FrameworkConfig $framework) {
             $framework->mailer()
-                ->dsn('%env(MAILER_DSN)%')
+                ->dsn(env('MAILER_DSN'))
                 ->envelope()
                     ->sender('notifications@example.com')
             ;
@@ -341,7 +341,7 @@ configure the ``texter_transports``:
 
         return static function (FrameworkConfig $framework) {
             $framework->notifier()
-                ->texterTransport('expo', '%env(EXPO_DSN)%')
+                ->texterTransport('expo', env('EXPO_DSN'))
             ;
         };
 
@@ -405,10 +405,10 @@ transport:
             $framework->notifier()
                 // Send notifications to Slack and use Telegram if
                 // Slack errored
-                ->chatterTransport('main', '%env(SLACK_DSN)% || %env(TELEGRAM_DSN)%')
+                ->chatterTransport('main', env('SLACK_DSN').' || '.env('TELEGRAM_DSN'))
 
                 // Send notifications to the next scheduled transport calculated by round robin
-                ->chatterTransport('roundrobin', '%env(SLACK_DSN)% && %env(TELEGRAM_DSN)%')
+                ->chatterTransport('roundrobin', env('SLACK_DSN').' && '.env('TELEGRAM_DSN'))
             ;
         };
 

reference/configuration/framework.rst

@@ -285,7 +285,7 @@ some environment variable that stores the name of the IDE/editor:
 
         return static function (FrameworkConfig $framework) {
             // the env var stores the IDE/editor name (e.g. 'phpstorm', 'vscode', etc.)
-            $framework->ide('%env(resolve:CODE_EDITOR)%');
+            $framework->ide(env('CODE_EDITOR')->resolve());
         };
 
 Another alternative is to set the ``xdebug.file_link_format`` option in your
@@ -566,14 +566,14 @@ can also :ref:`disable CSRF protection on individual forms <form-csrf-customizat
 .. configuration-block::
 
     .. code-block:: yaml
-    
+
         # config/packages/framework.yaml
         framework:
             # ...
             csrf_protection: true
-            
+
     .. code-block:: xml
-    
+
         <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
@@ -587,9 +587,9 @@ can also :ref:`disable CSRF protection on individual forms <form-csrf-customizat
                 <framework:csrf-protection enabled="true"/>
             </framework:config>
         </container>
-        
+
     .. code-block:: php
-    
+
         // config/packages/framework.php
         use Symfony\Config\FrameworkConfig;
         return static function (FrameworkConfig $framework) {
@@ -3072,7 +3072,7 @@ A list of lock stores to be created by the framework extension.
 
         return static function (FrameworkConfig $framework) {
             $framework->lock()
-                ->resource('default', ['%env(LOCK_DSN)%']);
+                ->resource('default', [env('LOCK_DSN')]);
         };
 
 .. seealso::

security/access_control.rst

@@ -120,12 +120,12 @@ Take the following ``access_control`` entries as an example:
             $security->accessControl()
                 ->path('^/admin')
                 ->roles(['ROLE_USER_IP'])
-                ->ips(['%env(TRUSTED_IPS)%'])
+                ->ips([env('TRUSTED_IPS')])
             ;
             $security->accessControl()
                 ->path('^/admin')
                 ->roles(['ROLE_USER_IP'])
-                ->ips(['127.0.0.1', '::1', '%env(TRUSTED_IPS)%'])
+                ->ips(['127.0.0.1', '::1', env('TRUSTED_IPS')])
             ;
         };