bug #14463 [Validator] Fixed Choice when an empty array is used in the "choices" option (webmozart)

fabpot · fabpot · commit 01b2d8ef96df · 2015-04-27T14:22:06.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [Validator] Fixed Choice when an empty array is used in the "choices" option | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #13853 | License | MIT | Doc PR | - This is a backport of #14448 for the 2.3 branch. Commits ------- 8bf8556 [Validator] Fixed Choice when an empty array is used in the "choices" option
diff --git a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
@@ -32,7 +32,7 @@ class ChoiceValidator extends ConstraintValidator
      */
     public function validate($value, Constraint $constraint)
     {
-        if (!$constraint->choices && !$constraint->callback) {
+        if (!is_array($constraint->choices) && !$constraint->callback) {
             throw new ConstraintDefinitionException('Either "choices" or "callback" must be specified on constraint Choice');
         }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
@@ -143,6 +143,20 @@ public function testInvalidChoice()
             ->assertRaised();
     }
 
+    public function testInvalidChoiceEmptyChoices()
+    {
+        $constraint = new Choice(array(
+            'choices' => array(),
+            'message' => 'myMessage',
+        ));
+
+        $this->validator->validate('baz', $constraint);
+
+        $this->buildViolation('myMessage')
+            ->setParameter('{{ value }}', '"baz"')
+            ->assertRaised();
+    }
+
     public function testInvalidChoiceMultiple()
     {
         $constraint = new Choice(array(

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class ChoiceValidator extends ConstraintValidator`
`32`	`32`	`*/`
`33`	`33`	`public function validate($value, Constraint $constraint)`
`34`	`34`	`{`
`35`		`- if (!$constraint->choices && !$constraint->callback) {`
	`35`	`+ if (!is_array($constraint->choices) && !$constraint->callback) {`
`36`	`36`	`throw new ConstraintDefinitionException('Either "choices" or "callback" must be specified on constraint Choice');`
`37`	`37`	`}`
`38`	`38`