Merge branch '3.3' into 3.4

fabpot · fabpot · commit 40a4f38e1f00 · 2017-12-31T07:07:31.000+01:00
* 3.3:
  fixed some deprecation messages
  fixed some deprecation messages
  fixed some deprecation messages
  fixed some deprecation messages
  [2.7][DX] Use constant message contextualisation for deprecations
diff --git a/Constraints/ChoiceValidator.php b/Constraints/ChoiceValidator.php
@@ -59,7 +59,7 @@ public function validate($value, Constraint $constraint)
         }
 
         if (true !== $constraint->strict) {
-            @trigger_error('Not setting the strict option of the Choice constraint to true is deprecated since version 3.4 and will throw an exception in 4.0.', E_USER_DEPRECATED);
+            @trigger_error('Not setting the strict option of the Choice constraint to true is deprecated since Symfony 3.4 and will throw an exception in 4.0.', E_USER_DEPRECATED);
         }
 
         if ($constraint->multiple) {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function validate($value, Constraint $constraint)`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`if (true !== $constraint->strict) {`
`62`		`- @trigger_error('Not setting the strict option of the Choice constraint to true is deprecated since version 3.4 and will throw an exception in 4.0.', E_USER_DEPRECATED);`
	`62`	`+ @trigger_error('Not setting the strict option of the Choice constraint to true is deprecated since Symfony 3.4 and will throw an exception in 4.0.', E_USER_DEPRECATED);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`if ($constraint->multiple) {`