Merge branch '4.4' into 5.0

* 4.4:
  Resolve the DATABASE_URL env var in config examples

Author: javiereguiluz

configuration.rst

@@ -453,7 +453,7 @@ This example shows how you could configure the database connection using an env
         doctrine:
             dbal:
                 # by convention the env var names are always uppercase
-                url: '%env(DATABASE_URL)%'
+                url: '%env(resolve:DATABASE_URL)%'
             # ...
 
     .. code-block:: xml
@@ -470,7 +470,7 @@ This example shows how you could configure the database connection using an env
 
             <doctrine:config>
                 <!-- by convention the env var names are always uppercase -->
-                <doctrine:dbal url="%env(DATABASE_URL)%"/>
+                <doctrine:dbal url="%env(resolve:DATABASE_URL)%"/>
             </doctrine:config>
 
         </container>
@@ -481,7 +481,7 @@ This example shows how you could configure the database connection using an env
         $container->loadFromExtension('doctrine', [
             'dbal' => [
                 // by convention the env var names are always uppercase
-                'url' => '%env(DATABASE_URL)%',
+                'url' => '%env(resolve:DATABASE_URL)%',
             ]
         ]);
 

doctrine/multiple_entity_managers.rst

@@ -34,13 +34,13 @@ The following configuration code shows how you can configure two entity managers
                 connections:
                     default:
                         # configure these for your database server
-                        url: '%env(DATABASE_URL)%'
+                        url: '%env(resolve:DATABASE_URL)%'
                         driver: 'pdo_mysql'
                         server_version: '5.7'
                         charset: utf8mb4
                     customer:
                         # configure these for your database server
-                        url: '%env(DATABASE_CUSTOMER_URL)%'
+                        url: '%env(resolve:DATABASE_CUSTOMER_URL)%'
                         driver: 'pdo_mysql'
                         server_version: '5.7'
                         charset: utf8mb4
@@ -83,15 +83,15 @@ The following configuration code shows how you can configure two entity managers
                 <doctrine:dbal default-connection="default">
                     <!-- configure these for your database server -->
                     <doctrine:connection name="default"
-                        url="%env(DATABASE_URL)%"
+                        url="%env(resolve:DATABASE_URL)%"
                         driver="pdo_mysql"
                         server_version="5.7"
                         charset="utf8mb4"
                     />
 
                     <!-- configure these for your database server -->
                     <doctrine:connection name="customer"
-                        url="%env(DATABASE_CUSTOMER_URL)%"
+                        url="%env(resolve:DATABASE_CUSTOMER_URL)%"
                         driver="pdo_mysql"
                         server_version="5.7"
                         charset="utf8mb4"
@@ -133,14 +133,14 @@ The following configuration code shows how you can configure two entity managers
                 'connections' => [
                     // configure these for your database server
                     'default' => [
-                        'url'            => '%env(DATABASE_URL)%',
+                        'url'            => '%env(resolve:DATABASE_URL)%',
                         'driver'         => 'pdo_mysql',
                         'server_version' => '5.7',
                         'charset'        => 'utf8mb4',
                     ],
                     // configure these for your database server
                     'customer' => [
-                        'url'            => '%env(DATABASE_CUSTOMER_URL)%',
+                        'url'            => '%env(resolve:DATABASE_CUSTOMER_URL)%',
                         'driver'         => 'pdo_mysql',
                         'server_version' => '5.7',
                         'charset'        => 'utf8mb4',

reference/configuration/framework.rst

@@ -1218,7 +1218,7 @@ You can also configure the session handler with a DSN. For example:
                 # ...
                 handler_id: 'redis://localhost'
                 handler_id: '%env(REDIS_URL)%'
-                handler_id: '%env(DATABASE_URL)%'
+                handler_id: '%env(resolve:DATABASE_URL)%'
                 handler_id: 'file://%kernel.project_dir%/var/sessions'
 
     .. code-block:: xml
@@ -1236,7 +1236,7 @@ You can also configure the session handler with a DSN. For example:
                 <framework:session enabled="true"
                     handler-id="redis://localhost"
                     handler-id="%env(REDIS_URL)%"
-                    handler-id="%env(DATABASE_URL)%"
+                    handler-id="%env(resolve:DATABASE_URL)%"
                     handler-id="file://%kernel.project_dir%/var/sessions"/>
             </framework:config>
         </container>
@@ -1249,7 +1249,7 @@ You can also configure the session handler with a DSN. For example:
                 // ...
                 'handler_id' => 'redis://localhost',
                 'handler_id' => '%env(REDIS_URL)%',
-                'handler_id' => '%env(DATABASE_URL)%',
+                'handler_id' => '%env(resolve:DATABASE_URL)%',
                 'handler_id' => 'file://%kernel.project_dir%/var/sessions',
             ],
         ]);