Add that the callable in the error message

Author: symfonyaml

src/Symfony/Component/Validator/Constraints/ChoiceValidator.php

@@ -56,7 +56,7 @@ public function validate($value, Constraint $constraint)
                 $choices = iterator_to_array($choices);
             }
             if (!\is_array($choices)) {
-                throw new ConstraintDefinitionException(\sprintf('The Choice constraint expects the callback to return an iterable value, got "%s".', get_debug_type($choices)));
+                throw new ConstraintDefinitionException(\sprintf('The Choice constraint expects the callback %s to return an iterable value, got "%s".', $this->formatValue($constraint->callback), get_debug_type($choices)));
             }
         } else {
             $choices = $constraint->choices;

src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php

@@ -39,7 +39,7 @@ public static function staticCallbackInvalid()
         return null;
     }
 
-    public static function staticCallbackIterable()
+    public static function staticCallbackTraversable()
     {
         yield 1;
         yield 2;
@@ -200,7 +200,7 @@ public function testInvalidChoice(Choice $constraint)
     public function testInvalidChoiceCallbackContextMethod()
     {
         $this->expectException(ConstraintDefinitionException::class);
-        $this->expectExceptionMessage('The Choice constraint expects the callback to return an iterable value, got "null".');
+        $this->expectExceptionMessage('The Choice constraint expects the callback "staticCallbackInvalid" to return an iterable value, got "null".');
         // search $this for "staticCallbackInvalid"
         $this->setObject($this);
 
@@ -209,12 +209,12 @@ public function testInvalidChoiceCallbackContextMethod()
         $this->validator->validate('bar', $constraint);
     }
 
-    public function testValidChoiceCallbackContextMethodIterable()
+    public function testValidChoiceCallbackContextMethodTraversable()
     {
-        // search $this for "staticCallbackIterable"
+        // search $this for "staticCallbackTraversable"
         $this->setObject($this);
 
-        $constraint = new Choice(['callback' => 'staticCallbackIterable']);
+        $constraint = new Choice(['callback' => 'staticCallbackTraversable']);
 
         $this->validator->validate(1, $constraint);