Fix psalm issue $choices Traversable

symfonyaml · symfonyaml · commit 88e1403f117d · 2024-10-22T17:38:55.000+02:00
diff --git a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
@@ -56,10 +56,12 @@ public function validate($value, Constraint $constraint)
             }
             $choices = $choices();
             if (!is_array($choices)) {
-                if (!is_iterable($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)));
                 }
-                $choices = iterator_to_array($choices);
             }
         } else {
             $choices = $constraint->choices;

Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,12 @@ public function validate($value, Constraint $constraint)`
`56`	`56`	`}`
`57`	`57`	`$choices = $choices();`
`58`	`58`	`if (!is_array($choices)) {`
`59`		`- if (!is_iterable($choices)) {`
	`59`	`+ if (is_iterable($choices)) {`
	`60`	`+ /** @psalm-suppress InvalidArgument */`
	`61`	`+ $choices = iterator_to_array($choices);`
	`62`	`+ } else {`
`60`	`63`	`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)));`
`61`	`64`	`}`
`62`		`- $choices = iterator_to_array($choices);`
`63`	`65`	`}`
`64`	`66`	`} else {`
`65`	`67`	`$choices = $constraint->choices;`