Merge branch '6.1' into 6.2

* 6.1:
  [Form] Example of customizing EnumType labels
  Add the examples for XML and PHP config
  Update database.rst
  validator - replace expressionLanguageSyntax with new expressionSyntax

Author: javiereguiluz

reference/constraints.rst

@@ -14,7 +14,6 @@ Validation Constraints Reference
    constraints/Type
 
    constraints/Email
-   constraints/ExpressionLanguageSyntax (deprecated)
    constraints/ExpressionSyntax
    constraints/Length
    constraints/Url

reference/constraints/map.rst.inc

@@ -16,7 +16,7 @@ String Constraints
 ~~~~~~~~~~~~~~~~~~
 
 * :doc:`Email </reference/constraints/Email>`
-* :doc:`ExpressionLanguageSyntax </reference/constraints/ExpressionLanguageSyntax>`
+* :doc:`ExpressionSyntax </reference/constraints/ExpressionSyntax>`
 * :doc:`Length </reference/constraints/Length>`
 * :doc:`Url </reference/constraints/Url>`
 * :doc:`Regex </reference/constraints/Regex>`

reference/forms/types/enum.rst

@@ -34,9 +34,9 @@ short) defined somewhere in your application. This enum has to be of type
 
     enum TextAlign: string
     {
-        case Left = 'Left/Start aligned';
-        case Center = 'Center/Middle aligned';
-        case Right = 'Right/End aligned';
+        case Left = 'Left aligned';
+        case Center = 'Center aligned';
+        case Right = 'Right aligned';
     }
 
 Instead of using the values of the enumeration in a ``choices`` option, the
@@ -52,6 +52,20 @@ This will display a ``<select>`` tag with the three possible values defined in
 the ``TextAlign`` enum. Use the `expanded`_ and `multiple`_ options to display
 these values as ``<input type="checkbox">`` or ``<input type="radio">``.
 
+The label displayed in the ``<option>`` elements of the ``<select>`` is the enum
+name. PHP defines some strict rules for these names (e.g. they can't contain
+dots or spaces). If you need more flexibility for these labels, use the
+``choice_label`` option and define a function that returns the custom label::
+
+    ->add('textAlign', EnumType::class, [
+        'class' => TextAlign::class,
+        'choice_label' => match ($choice) {
+            TextAlign::Left => 'text_align.left.label',
+            TextAlign::Center => 'text_align.center.label',
+            TextAlign::Right  => 'text_align.right.label',
+        },
+    ]);
+
 Field Options
 -------------
 

session/database.rst

@@ -50,6 +50,10 @@ First, define a Symfony service for the connection to the Redis server:
                     # uncomment the following if your Redis server requires a password
                     # - auth:
                     #     - '%env(REDIS_PASSWORD)%'
+                    
+                    # uncomment the following if your Redis server requires a user and a password (when user is not default)
+                    # - auth:
+                    #     - ['%env(REDIS_USER)%','%env(REDIS_PASSWORD)%']
 
     .. code-block:: xml
 
@@ -70,6 +74,12 @@ First, define a Symfony service for the connection to the Redis server:
                     <call method="auth">
                         <argument>%env(REDIS_PASSWORD)%</argument>
                     </call> -->
+
+                    <!-- uncomment the following if your Redis server requires a user and a password (when user is not default):
+                    <call method="auth">
+                        <argument>%env(REDIS_USER)%</argument>
+                        <argument>%env(REDIS_PASSWORD)%</argument>
+                    </call> -->
                 </service>
             </services>
         </container>
@@ -83,6 +93,8 @@ First, define a Symfony service for the connection to the Redis server:
             ->addMethodCall('connect', ['%env(REDIS_HOST)%', '%env(int:REDIS_PORT)%'])
             // uncomment the following if your Redis server requires a password:
             // ->addMethodCall('auth', ['%env(REDIS_PASSWORD)%'])
+            // uncomment the following if your Redis server requires a user and a password (when user is not default):
+            // ->addMethodCall('auth', ['%env(REDIS_USER)%', '%env(REDIS_PASSWORD)%'])
         ;
 
 Now pass this ``\Redis`` connection as an argument of the service associated to the