Merge branch '5.4' into 6.2

* 5.4:
  [Doctrine] Cleaning up the config code samples
  Tweak
  Add a trailing slash to dir names
  Adding backticks
  [ExpressionLanguage] Mention the validator.expression_language service
  [Configuration] Add $_ENV and $_SERVER example with .env

Author: javiereguiluz

components/expression_language.rst

@@ -19,7 +19,11 @@ Installation
 .. include:: /components/require_autoload.rst.inc
 
 How can the Expression Engine Help Me?
---------------------------------------
+
+.. _how-can-the-expression-engine-help-me:
+
+How can the Expression Language Help Me?
+----------------------------------------
 
 The purpose of the component is to allow users to use expressions inside
 configuration for more complex logic. For some examples, the Symfony Framework

configuration.rst

@@ -619,6 +619,17 @@ This example shows how you could configure the application secret using an env v
             ]);
         };
 
+.. note::
+
+    Your env vars can also be accessed via the PHP super globals ``$_ENV`` and
+    ``$_SERVER`` (both are equivalent)::
+
+        $databaseUrl = $_ENV['DATABASE_URL']; // mysql://db_user:db_password@127.0.0.1:3306/db_name
+        $env = $_SERVER['APP_ENV']; // prod
+
+    However, in Symfony applications there's no need to use this, because the
+    configuration system provides a better way of working with env vars.
+
 .. seealso::
 
     The values of env vars can only be strings, but Symfony includes some

doctrine/multiple_entity_managers.rst

@@ -1,7 +1,7 @@
 .. index::
    single: Doctrine; Multiple entity managers
 
-How to Work with multiple Entity Managers and Connections
+How to Work with Multiple Entity Managers and Connections
 =========================================================
 
 You can use multiple Doctrine entity managers or connections in a Symfony
@@ -32,20 +32,12 @@ The following configuration code shows how you can configure two entity managers
         # config/packages/doctrine.yaml
         doctrine:
             dbal:
-                default_connection: default
                 connections:
                     default:
-                        # configure these for your database server
                         url: '%env(resolve:DATABASE_URL)%'
-                        driver: 'pdo_mysql'
-                        server_version: '5.7'
-                        charset: utf8mb4
                     customer:
-                        # configure these for your database server
-                        url: '%env(resolve:DATABASE_CUSTOMER_URL)%'
-                        driver: 'pdo_mysql'
-                        server_version: '5.7'
-                        charset: utf8mb4
+                        url: '%env(resolve:CUSTOMER_DATABASE_URL)%'
+                default_connection: default
             orm:
                 default_entity_manager: default
                 entity_managers:
@@ -82,20 +74,12 @@ The following configuration code shows how you can configure two entity managers
 
             <doctrine:config>
                 <doctrine:dbal default-connection="default">
-                    <!-- configure these for your database server -->
                     <doctrine:connection name="default"
                         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(resolve:DATABASE_CUSTOMER_URL)%"
-                        driver="pdo_mysql"
-                        server_version="5.7"
-                        charset="utf8mb4"
+                        url="%env(resolve:CUSTOMER_DATABASE_URL)%"
                     />
                 </doctrine:dbal>
 
@@ -131,37 +115,28 @@ The following configuration code shows how you can configure two entity managers
         use Symfony\Config\DoctrineConfig;
 
         return static function (DoctrineConfig $doctrine) {
-            $doctrine->dbal()->defaultConnection('default');
-
-            // configure these for your database server
+            // Connections:
             $doctrine->dbal()
                 ->connection('default')
-                ->url(env('DATABASE_URL')->resolve())
-                ->driver('pdo_mysql')
-                ->serverVersion('5.7')
-                ->charset('utf8mb4');
-
-            // configure these for your database server
+                ->url(env('DATABASE_URL')->resolve());
             $doctrine->dbal()
                 ->connection('customer')
-                ->url(env('DATABASE_CUSTOMER_URL')->resolve())
-                ->driver('pdo_mysql')
-                ->serverVersion('5.7')
-                ->charset('utf8mb4');
-
+                ->url(env('CUSTOMER_DATABASE_URL')->resolve());
+            $doctrine->dbal()->defaultConnection('default');
+            
+            // Entity Managers:
             $doctrine->orm()->defaultEntityManager('default');
-            $emDefault = $doctrine->orm()->entityManager('default');
-            $emDefault->connection('default');
-            $emDefault->mapping('Main')
+            $defaultEntityManager = $doctrine->orm()->entityManager('default');
+            $defaultEntityManager->connection('default');
+            $defaultEntityManager->mapping('Main')
                 ->isBundle(false)
                 ->type('annotation')
                 ->dir('%kernel.project_dir%/src/Entity/Main')
                 ->prefix('App\Entity\Main')
                 ->alias('Main');
-
-            $emCustomer = $doctrine->orm()->entityManager('customer');
-            $emCustomer->connection('customer');
-            $emCustomer->mapping('Customer')
+            $customerEntityManager = $doctrine->orm()->entityManager('customer');
+            $customerEntityManager->connection('customer');
+            $customerEntityManager->mapping('Customer')
                 ->isBundle(false)
                 ->type('annotation')
                 ->dir('%kernel.project_dir%/src/Entity/Customer')

reference/constraints/Expression.rst

@@ -217,6 +217,12 @@ For more information about the expression and what variables are available
 to you, see the :ref:`expression <reference-constraint-expression-option>`
 option details below.
 
+.. tip::
+
+    Internally, this expression validator constraint uses a service called
+    ``validator.expression_language`` to evaluate the expressions. You can
+    decorate or extend that service to fit your own needs.
+
 Options
 -------
 

setup/web_server_configuration.rst

@@ -16,9 +16,9 @@ When using Apache, you can configure PHP as an
 :ref:`PHP FPM <web-server-apache-fpm>`. FastCGI also is the preferred way
 to use PHP :ref:`with Nginx <web-server-nginx>`.
 
-.. sidebar:: The public directory
+.. sidebar:: The ``public/`` directory
 
-    The public directory is the home of all of your application's public and
+    The ``public/`` directory is the home of all of your application's public and
     static files, including images, stylesheets and JavaScript files. It is
     also where the front controller (``index.php``) lives.