merged branch yethee/choice_validator (PR #1713)

Commits ------- 0f328d2 [Validator] Fixed using the strict option in the choice validator. Discussion ---------- [Validator] Fixed using the strict option in the choice validator.
symfony · Jul 16, 2011 · e3a14c8 · e3a14c8
2 parents 760b11c + 0f328d2
commit e3a14c8
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
@@ -53,7 +53,7 @@ public function isValid($value, Constraint $constraint)
 
         if ($constraint->multiple) {
             foreach ($value as $_value) {
-                if (!in_array($_value, $choices, true)) {
+                if (!in_array($_value, $choices, $constraint->strict)) {
                     $this->setMessage($constraint->multipleMessage, array('{{ value }}' => $_value));
 
                     return false;

diff --git a/tests/Symfony/Tests/Component/Validator/Constraints/ChoiceValidatorTest.php b/tests/Symfony/Tests/Component/Validator/Constraints/ChoiceValidatorTest.php
@@ -193,4 +193,37 @@ public function testStrictIsFalse()
         $this->assertTrue($this->validator->isValid('2', $constraint));
         $this->assertTrue($this->validator->isValid(2, $constraint));
     }
+
+    public function testStrictIsTrue()
+    {
+        $constraint = new Choice(array(
+            'choices' => array(1, 2),
+            'strict' => true,
+        ));
+
+        $this->assertTrue($this->validator->isValid(2, $constraint));
+        $this->assertFalse($this->validator->isValid('2', $constraint));
+    }
+
+    public function testStrictIsFalseWhenMultipleChoices()
+    {
+        $constraint = new Choice(array(
+            'choices' => array(1, 2, 3),
+            'multiple' => true,
+            'strict' => false
+        ));
+
+        $this->assertTrue($this->validator->isValid(array('2', 3), $constraint));
+    }
+
+    public function testStrictIsTrueWhenMultipleChoices()
+    {
+        $constraint = new Choice(array(
+            'choices' => array(1, 2, 3),
+            'multiple' => true,
+            'strict' => true
+        ));
+
+        $this->assertFalse($this->validator->isValid(array(2, '3'), $constraint));
+    }
 }