Merge branch '3.4' into 4.2

* 3.4:
  [Validator] Explained how to use array constant in annotation

reference/constraints/Choice.rst

@@ -43,13 +43,17 @@ If your valid choice list is simple, you can pass them in directly via the
 
         class Author
         {
+            const GENRES = ['fiction', 'non-fiction'];
+
             /**
              * @Assert\Choice({"New York", "Berlin", "Tokyo"})
              */
             protected $city;
 
             /**
-             * @Assert\Choice(choices={"fiction", "non-fiction"}, message="Choose a valid genre.")
+             * You can also directly provide an array constant to the "choices" option in the annotation
+             *
+             * @Assert\Choice(choices=Author::GENRES, message="Choose a valid genre.")
              */
             protected $genre;
         }
@@ -203,7 +207,7 @@ constraint.
             }
         }
 
-If the callback is stored in a different class and is static, for example ``App\Entity\Genre``,
+If the callback is defined in a different class and is static, for example ``App\Entity\Genre``,
 you can pass the class name and the method as an array.
 
 .. configuration-block::