Merge branch '6.0' into 6.1

javiereguiluz · javiereguiluz · commit ec0d80bc2d14 · 2022-05-16T17:36:42.000+02:00
* 6.0:
  Remove some unneeded versionadded directives
  Use PHP-DSL `env()` configurator when possible
diff --git a/configuration.rst b/configuration.rst
@@ -617,6 +617,8 @@ 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(),
                 ],
             ]);
         };
diff --git a/configuration/env_var_processors.rst b/configuration/env_var_processors.rst
@@ -50,6 +50,8 @@ 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())
             ;
         };
@@ -236,7 +238,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)``
diff --git a/configuration/secrets.rst b/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'))
             ;
         };
 
diff --git a/doctrine/multiple_entity_managers.rst b/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');
diff --git a/lock.rst b/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'])
diff --git a/mailer.rst b/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'),
                 ],
             ]);
         };
@@ -1110,8 +1110,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'))
             ;
         };
 
@@ -1183,7 +1183,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')
diff --git a/messenger.rst b/messenger.rst
@@ -198,12 +198,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([])
             ;
         };
@@ -593,11 +593,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']);
@@ -807,7 +807,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)
@@ -1007,7 +1007,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
@@ -1095,7 +1095,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]);
         };
 
diff --git a/notifier.rst b/notifier.rst
@@ -141,7 +141,7 @@ configure the ``texter_transports``:
 
         return static function (FrameworkConfig $framework) {
             $framework->notifier()
-                ->texterTransport('twilio', '%env(TWILIO_DSN)%')
+                ->texterTransport('twilio', env('TWILIO_DSN'))
             ;
         };
 
@@ -219,7 +219,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'))
             ;
         };
 
@@ -283,7 +283,7 @@ notification emails:
 
         return static function (FrameworkConfig $framework) {
             $framework->mailer()
-                ->dsn('%env(MAILER_DSN)%')
+                ->dsn(env('MAILER_DSN'))
                 ->envelope()
                     ->sender('notifications@example.com')
             ;
@@ -350,7 +350,7 @@ configure the ``texter_transports``:
 
         return static function (FrameworkConfig $framework) {
             $framework->notifier()
-                ->texterTransport('expo', '%env(EXPO_DSN)%')
+                ->texterTransport('expo', env('EXPO_DSN'))
             ;
         };
 
@@ -414,10 +414,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'))
             ;
         };
 
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -3067,7 +3067,7 @@ the name as key and DSN as value:
 
         return static function (FrameworkConfig $framework) {
             $framework->lock()
-                ->resource('default', ['%env(LOCK_DSN)%']);
+                ->resource('default', [env('LOCK_DSN')]);
         };
 
 .. seealso::
diff --git a/security/access_control.rst b/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')])
             ;
         };
 
diff --git a/session/database.rst b/session/database.rst
@@ -229,7 +229,7 @@ first register a new handler service with your database credentials:
 
             $services->set(PdoSessionHandler::class)
                 ->args([
-                    '%env(DATABASE_URL)%',
+                    env('DATABASE_URL'),
                     // you can also use PDO configuration, but requires passing two arguments:
                     // 'mysql:dbname=mydatabase; host=myhost; port=myport',
                     // ['db_username' => 'myuser', 'db_password' => 'mypassword'],
@@ -329,7 +329,7 @@ passed to the ``PdoSessionHandler`` service:
 
             $services->set(PdoSessionHandler::class)
                 ->args([
-                    '%env(DATABASE_URL)%',
+                    env('DATABASE_URL'),
                     ['db_table' => 'customer_session', 'db_id_col' => 'guid'],
                 ])
             ;
diff --git a/translation.rst b/translation.rst
@@ -699,7 +699,7 @@ configure the ``providers`` option:
             'translator' => [
                 'providers' => [
                     'loco' => [
-                        'dsn' => '%env(LOCO_DSN)%',
+                        'dsn' => env('LOCO_DSN'),
                         'domains' => ['messages'],
                         'locales' => ['en', 'fr'],
                     ],

Original file line number	Diff line number	Diff line change
@@ -145,7 +145,7 @@ If you stored a ``DATABASE_PASSWORD`` secret, you can reference it by:
`145`	`145`	`return static function (DoctrineConfig $doctrine) {`
`146`	`146`	`$doctrine->dbal()`
`147`	`147`	`->connection('default')`
`148`		`- ->password('%env(DATABASE_PASSWORD)%')`
	`148`	`+ ->password(env('DATABASE_PASSWORD'))`
`149`	`149`	`;`
`150`	`150`	`};`
`151`	`151`
Original file line number	Diff line number	Diff line change
@@ -120,12 +120,12 @@ Take the following ``access_control`` entries as an example:
`120`	`120`	`$security->accessControl()`
`121`	`121`	`->path('^/admin')`
`122`	`122`	`->roles(['ROLE_USER_IP'])`
`123`		`- ->ips(['%env(TRUSTED_IPS)%'])`
	`123`	`+ ->ips([env('TRUSTED_IPS')])`
`124`	`124`	`;`
`125`	`125`	`$security->accessControl()`
`126`	`126`	`->path('^/admin')`
`127`	`127`	`->roles(['ROLE_USER_IP'])`
`128`		`- ->ips(['127.0.0.1', '::1', '%env(TRUSTED_IPS)%'])`
	`128`	`+ ->ips(['127.0.0.1', '::1', env('TRUSTED_IPS')])`
`129`	`129`	`;`
`130`	`130`	`};`
`131`	`131`