Merge branch '6.0' into 6.1

* 6.0:
  [Validator] Add missing option to configs

Author: javiereguiluz

validation/custom_constraint.rst

@@ -43,6 +43,7 @@ First you need to create a Constraint class and extend :class:`Symfony\\Componen
         class ContainsAlphanumeric extends Constraint
         {
             public $message = 'The string "{{ string }}" contains an illegal character: it can only contain letters or numbers.';
+            public $mode = 'strict'; // If the constraint has configuration options, define them as public properties
         }
 
 Add ``@Annotation`` or ``#[\Attribute]`` to the constraint class if you want to
@@ -213,7 +214,7 @@ You can use custom validators like the ones provided by Symfony itself:
             // ...
 
             #[Assert\NotBlank]
-            #[AcmeAssert\ContainsAlphanumeric(options: ['mode' => 'loose'])]
+            #[AcmeAssert\ContainsAlphanumeric(mode: 'loose')]
             protected $name;
 
             // ...
@@ -226,7 +227,8 @@ You can use custom validators like the ones provided by Symfony itself:
             properties:
                 name:
                     - NotBlank: ~
-                    - App\Validator\ContainsAlphanumeric: ~
+                    - App\Validator\ContainsAlphanumeric:
+                        mode: 'loose'
 
     .. code-block:: xml
 
@@ -239,7 +241,9 @@ You can use custom validators like the ones provided by Symfony itself:
             <class name="App\Entity\AcmeEntity">
                 <property name="name">
                     <constraint name="NotBlank"/>
-                    <constraint name="App\Validator\ContainsAlphanumeric"/>
+                    <constraint name="App\Validator\ContainsAlphanumeric">
+                        <option name="mode">loose</option>
+                    </constraint>
                 </property>
             </class>
         </constraint-mapping>
@@ -260,7 +264,7 @@ You can use custom validators like the ones provided by Symfony itself:
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint('name', new NotBlank());
-                $metadata->addPropertyConstraint('name', new ContainsAlphanumeric());
+                $metadata->addPropertyConstraint('name', new ContainsAlphanumeric(['mode' => 'loose']));
             }
         }