Drop the iterator_to_array() part and tests associated

Author: symfonyaml

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

@@ -56,12 +56,7 @@ public function validate($value, Constraint $constraint)
             }
             $choices = $choices();
             if (!is_array($choices)) {
-                if (is_iterable($choices)) {
-                    /** @psalm-suppress InvalidArgument */
-                    $choices = iterator_to_array($choices);
-                } else {
-                    throw new ConstraintDefinitionException(sprintf('The Choice constraint callback "%s" expects to return an iterable, got "%s".', trim($this->formatValue($constraint->callback), '"'), get_debug_type($choices)));
-                }
+                throw new ConstraintDefinitionException(sprintf('The Choice constraint callback "%s" is expected to return an array, but returned "%s".', trim($this->formatValue($constraint->callback), '"'), get_debug_type($choices)));
             }
         } else {
             $choices = $constraint->choices;

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

@@ -39,13 +39,6 @@ public function objectMethodCallback()
         return ['foo', 'bar'];
     }
 
-    public static function staticCallbackTraversable()
-    {
-        yield 1;
-        yield 2;
-        yield 3;
-    }
-
     public static function staticCallbackInvalid()
     {
         return null;
@@ -149,7 +142,7 @@ public function testValidChoiceCallbackContextMethod()
     public function testInvalidChoiceCallbackContextMethod()
     {
         $this->expectException(ConstraintDefinitionException::class);
-        $this->expectExceptionMessage('The Choice constraint callback "staticCallbackInvalid" expects to return an iterable, got "null".');
+        $this->expectExceptionMessage('The Choice constraint callback "staticCallbackInvalid" is expected to return an array, but returned "null".');
 
         // search $this for "staticCallbackInvalid"
         $this->setObject($this);
@@ -159,18 +152,6 @@ public function testInvalidChoiceCallbackContextMethod()
         $this->validator->validate('bar', $constraint);
     }
 
-    public function testValidChoiceCallbackContextMethodTraversable()
-    {
-        // search $this for "staticCallbackTraversable"
-        $this->setObject($this);
-
-        $constraint = new Choice(['callback' => 'staticCallbackTraversable']);
-
-        $this->validator->validate(2, $constraint);
-
-        $this->assertNoViolation();
-    }
-
     public function testValidChoiceCallbackContextObjectMethod()
     {
         // search $this for "objectMethodCallback"