[Validator] handle null values properly

symfony · Sep 30, 2018 · 73e1e81 · 73e1e81
1 parent 0b6e408
commit 73e1e81
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 0 deletions.
diff --git a/src/Symfony/Component/Validator/Constraints/NegativeOrZeroValidator.php b/src/Symfony/Component/Validator/Constraints/NegativeOrZeroValidator.php
@@ -31,6 +31,10 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\NegativeOrZero');
         }
 
+        if (null === $value) {
+            return;
+        }
+
         if (!\is_int($value) && !\is_float($value) && !\is_string($value)) {
             throw new UnexpectedTypeException($value, 'int, float or string');
         }

diff --git a/src/Symfony/Component/Validator/Constraints/NegativeValidator.php b/src/Symfony/Component/Validator/Constraints/NegativeValidator.php
@@ -31,6 +31,10 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Negative');
         }
 
+        if (null === $value) {
+            return;
+        }
+
         if (!\is_int($value) && !\is_float($value) && !\is_string($value)) {
             throw new UnexpectedTypeException($value, 'int, float or string');
         }

diff --git a/src/Symfony/Component/Validator/Constraints/PositiveOrZeroValidator.php b/src/Symfony/Component/Validator/Constraints/PositiveOrZeroValidator.php
@@ -31,6 +31,10 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\PositiveOrZero');
         }
 
+        if (null === $value) {
+            return;
+        }
+
         if (!\is_int($value) && !\is_float($value) && !\is_string($value)) {
             throw new UnexpectedTypeException($value, 'int, float or string');
         }

diff --git a/src/Symfony/Component/Validator/Constraints/PositiveValidator.php b/src/Symfony/Component/Validator/Constraints/PositiveValidator.php
@@ -31,6 +31,10 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Positive');
         }
 
+        if (null === $value) {
+            return;
+        }
+
         if (!\is_int($value) && !\is_float($value) && !\is_string($value)) {
             throw new UnexpectedTypeException($value, 'int, float or string');
         }

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/NegativeOrZeroValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/NegativeOrZeroValidatorTest.php
@@ -91,4 +91,11 @@ public function getWrongTypeValues()
             array(new \stdClass()),
         );
     }
+
+    public function testItShouldDoNothingForNullValue()
+    {
+        $this->validator->validate(null, new NegativeOrZero());
+
+        $this->assertNoViolation();
+    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/NegativeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/NegativeValidatorTest.php
@@ -114,4 +114,11 @@ public function getWrongTypeValues()
             array(new \stdClass()),
         );
     }
+
+    public function testItShouldDoNothingForNullValue()
+    {
+        $this->validator->validate(null, new Negative());
+
+        $this->assertNoViolation();
+    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/PositiveOrZeroValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/PositiveOrZeroValidatorTest.php
@@ -89,4 +89,11 @@ public function getWrongTypeValues()
             array(new \stdClass()),
         );
     }
+
+    public function testItShouldDoNothingForNullValue()
+    {
+        $this->validator->validate(null, new PositiveOrZero());
+
+        $this->assertNoViolation();
+    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/PositiveValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/PositiveValidatorTest.php
@@ -114,4 +114,11 @@ public function getWrongTypeValues()
             array(new \stdClass()),
         );
     }
+
+    public function testItShouldDoNothingForNullValue()
+    {
+        $this->validator->validate(null, new Positive());
+
+        $this->assertNoViolation();
+    }
 }