fix: reviews

bpolaszek · bpolaszek · commit 62940fcaefac · 2021-09-16T13:00:10.000+02:00
diff --git a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
@@ -35,7 +35,11 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, Choice::class);
         }
 
-        if (!\is_array($constraint->choices) && !is_a($constraint->choices, \BackedEnum::class, true) && !$constraint->callback) {
+        $valid = \is_array($constraint->choices)
+            || (\is_string($constraint->choices) && is_a($constraint->choices, \BackedEnum::class, true))
+            || isset($constraint->callback);
+
+        if (!$valid) {
             throw new ConstraintDefinitionException('Either "choices" or "callback" must be specified on constraint Choice.');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,11 @@ public function validate($value, Constraint $constraint)`
`35`	`35`	`throw new UnexpectedTypeException($constraint, Choice::class);`
`36`	`36`	`}`
`37`	`37`
`38`		`- if (!\is_array($constraint->choices) && !is_a($constraint->choices, \BackedEnum::class, true) && !$constraint->callback) {`
	`38`	`+ $valid = \is_array($constraint->choices)`
	`39`	`+ \|\| (\is_string($constraint->choices) && is_a($constraint->choices, \BackedEnum::class, true))`
	`40`	`+ \|\| isset($constraint->callback);`
	`41`	`+`
	`42`	`+ if (!$valid) {`
`39`	`43`	`throw new ConstraintDefinitionException('Either "choices" or "callback" must be specified on constraint Choice.');`
`40`	`44`	`}`
`41`	`45`