[Validator] fixed Min and Max validator when the input value is not a…

… number (now return an error message instead of an exception which does not make sense in this context)
symfony · Jul 12, 2011 · 88d915d · vicb · Jul 12, 2011 · stloyd
1 parent 3ca536e
commit 88d915d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/src/Symfony/Component/Validator/Constraints/Max.php b/src/Symfony/Component/Validator/Constraints/Max.php
@@ -17,6 +17,7 @@
 class Max extends Constraint
 {
     public $message = 'This value should be {{ limit }} or less';
+    public $invalidMessage = 'This value should be a valid number';
     public $limit;
 
     /**

diff --git a/src/Symfony/Component/Validator/Constraints/MaxValidator.php b/src/Symfony/Component/Validator/Constraints/MaxValidator.php
@@ -24,7 +24,12 @@ public function isValid($value, Constraint $constraint)
         }
 
         if (!is_numeric($value)) {
-            throw new UnexpectedTypeException($value, 'numeric');
+            $this->setMessage($constraint->invalidMessage, array(
+                '{{ value }}' => $value,
+                '{{ limit }}' => $constraint->limit,
+            ));
+
+            return false;
         }
 
         if ($value > $constraint->limit) {

diff --git a/src/Symfony/Component/Validator/Constraints/Min.php b/src/Symfony/Component/Validator/Constraints/Min.php
@@ -17,6 +17,7 @@
 class Min extends Constraint
 {
     public $message = 'This value should be {{ limit }} or more';
+    public $invalidMessage = 'This value should be a valid number';
     public $limit;
 
     /**

diff --git a/src/Symfony/Component/Validator/Constraints/MinValidator.php b/src/Symfony/Component/Validator/Constraints/MinValidator.php
@@ -24,7 +24,12 @@ public function isValid($value, Constraint $constraint)
         }
 
         if (!is_numeric($value)) {
-            throw new UnexpectedTypeException($value, 'numeric');
+            $this->setMessage($constraint->invalidMessage, array(
+                '{{ value }}' => $value,
+                '{{ limit }}' => $constraint->limit,
+            ));
+
+            return false;
         }
 
         if ($value < $constraint->limit) {

diff --git a/tests/Symfony/Tests/Component/Validator/Constraints/MaxValidatorTest.php b/tests/Symfony/Tests/Component/Validator/Constraints/MaxValidatorTest.php
@@ -33,13 +33,6 @@ public function testNullIsValid()
         $this->assertTrue($this->validator->isValid(null, new Max(array('limit' => 10))));
     }
 
-    public function testExpectsNumericType()
-    {
-        $this->setExpectedException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
-
-        $this->validator->isValid(new \stdClass(), new Max(array('limit' => 10)));
-    }
-
     /**
      * @dataProvider getValidValues
      */
@@ -73,6 +66,7 @@ public function getInvalidValues()
         return array(
             array(10.00001),
             array('10.00001'),
+            array(new \stdClass()),
         );
     }
 

diff --git a/tests/Symfony/Tests/Component/Validator/Constraints/MinValidatorTest.php b/tests/Symfony/Tests/Component/Validator/Constraints/MinValidatorTest.php
@@ -28,13 +28,6 @@ public function testNullIsValid()
         $this->assertTrue($this->validator->isValid(null, new Min(array('limit' => 10))));
     }
 
-    public function testExpectsNumericType()
-    {
-        $this->setExpectedException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
-
-        $this->validator->isValid(new \stdClass(), new Min(array('limit' => 10)));
-    }
-
     /**
      * @dataProvider getValidValues
      */
@@ -68,6 +61,7 @@ public function getInvalidValues()
         return array(
             array(9.999999),
             array('9.999999'),
+            array(new \stdClass()),
         );
     }