Merge branch '5.4' into 6.0

* 5.4:
  Replaced doctrine annotations with attributes
  Showing how to pass options

Author: javiereguiluz

components/options_resolver.rst

@@ -381,15 +381,15 @@ returns ``true`` for acceptable values and ``false`` for invalid values::
 .. tip::
 
     You can even use the :doc:`Validator </validation>` component to validate the
-    input by using the :method:`Symfony\\Component\\Validator\\Validation::createValidCallable`
+    input by using the :method:`Symfony\\Component\\Validator\\Validation::createIsValidCallable`
     method::
 
         use Symfony\Component\OptionsResolver\OptionsResolver;
         use Symfony\Component\Validator\Constraints\Length;
         use Symfony\Component\Validator\Validation;
 
         // ...
-        $resolver->setAllowedValues('transport', Validation::createValidCallable(
+        $resolver->setAllowedValues('transport', Validation::createIsValidCallable(
             new Length(['min' => 10 ])
         ));
 

reference/constraints/Traverse.rst

@@ -94,30 +94,27 @@ that all have constraints on their properties.
         // src/Entity/BookCollection.php
         namespace App\Entity;
 
+        use App\Entity\Book;
         use Doctrine\Common\Collections\ArrayCollection;
-        use Doctrine\Common\Collections\Collection
+        use Doctrine\Common\Collections\Collection;
         use Doctrine\ORM\Mapping as ORM;
         use Symfony\Component\Validator\Constraints as Assert;
 
-        /**
-         * @ORM\Entity
-         */
+        #[ORM\Entity]
         #[Assert\Traverse]
         class BookCollection implements \IteratorAggregate
         {
             /**
              * @var string
-             *
-             * @ORM\Column
              */
+            #[ORM\Column]
             #[Assert\NotBlank]
             protected $name = '';
 
             /**
              * @var Collection|Book[]
-             *
-             * @ORM\ManyToMany(targetEntity="App\Entity\Book")
              */
+            #[ORM\ManyToMany(targetEntity: Book::class)] 
             protected $books;
 
             // some other properties

validation.rst

@@ -244,7 +244,7 @@ when :ref:`validating OptionsResolver values <optionsresolver-validate-value>`):
 :method:`Symfony\\Component\\Validator\\Validation::createCallable`
     This returns a closure that throws ``ValidationFailedException`` when the
     constraints aren't matched.
-:method:`Symfony\\Component\\Validator\\Validation::createValidCallable`
+:method:`Symfony\\Component\\Validator\\Validation::createIsValidCallable`
     This returns a closure that returns ``false`` when the constraints aren't matched.
 
 .. index::

validation/custom_constraint.rst

@@ -29,6 +29,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
         }
 
     .. code-block:: php-attributes
@@ -45,8 +46,7 @@ First you need to create a Constraint class and extend :class:`Symfony\\Componen
         }
 
 Add ``@Annotation`` or ``#[\Attribute]`` to the constraint class if you want to
-use it as an annotation/attribute in other classes. If the constraint has
-configuration options, define them as public properties on the constraint class.
+use it as an annotation/attribute in other classes.
 
 Creating the Validator itself
 -----------------------------
@@ -97,6 +97,11 @@ The validator class only has one required method ``validate()``::
                 // separate multiple types using pipes
                 // throw new UnexpectedValueException($value, 'string|int');
             }
+            
+            // access your configuration options like this:
+            if ('strict' === $constraint->mode) {
+                // ...
+            }
 
             if (!preg_match('/^[a-zA-Z0-9]+$/', $value, $matches)) {
                 // the argument must be a string or an object implementing __toString()
@@ -135,7 +140,7 @@ You can use custom validators like the ones provided by Symfony itself:
 
             /**
              * @Assert\NotBlank
-             * @AcmeAssert\ContainsAlphanumeric
+             * @AcmeAssert\ContainsAlphanumeric(mode="loose")
              */
             protected $name;
 
@@ -155,7 +160,7 @@ You can use custom validators like the ones provided by Symfony itself:
             // ...
 
             #[Assert\NotBlank]
-            #[AcmeAssert\ContainsAlphanumeric]
+            #[AcmeAssert\ContainsAlphanumeric(options: ['mode' => 'loose'])]
             protected $name;
 
             // ...