From 631a5e213847b73be88203d27e15469ff6e0abde Mon Sep 17 00:00:00 2001 From: Justin Hook Date: Wed, 2 Apr 2014 21:58:30 +0100 Subject: [PATCH] Updated min and max rules to use bccomp for number comparison. --- src/Valitron/Validator.php | 4 ++-- tests/Valitron/ValidateTest.php | 24 ++++++++++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/Valitron/Validator.php b/src/Valitron/Validator.php index 6d0831c..46e03db 100644 --- a/src/Valitron/Validator.php +++ b/src/Valitron/Validator.php @@ -224,7 +224,7 @@ class Validator */ protected function validateMin($field, $value, $params) { - return $value >= $params[0]; + return !(bccomp($params[0], $value, 14) == 1); } /** @@ -238,7 +238,7 @@ class Validator */ protected function validateMax($field, $value, $params) { - return $value <= $params[0]; + return !(bccomp($value, $params[0], 14) == 1); } /** diff --git a/tests/Valitron/ValidateTest.php b/tests/Valitron/ValidateTest.php index 9809f2d..79858d3 100644 --- a/tests/Valitron/ValidateTest.php +++ b/tests/Valitron/ValidateTest.php @@ -152,13 +152,21 @@ class ValidateTest extends BaseTestCase $v = new Validator(array('num' => 5)); $v->rule('min', 'num', 2); $this->assertTrue($v->validate()); + + $v = new Validator(array('num' => 5)); + $v->rule('min', 'num', 5); + $this->assertTrue($v->validate()); } - public function testMinValidDecimal() + public function testMinValidFloat() { $v = new Validator(array('num' => 0.9)); $v->rule('min', 'num', 0.5); $this->assertTrue($v->validate()); + + $v = new Validator(array('num' => 1 - 0.81)); + $v->rule('min', 'num', 0.19); + $this->assertTrue($v->validate()); } public function testMinInvalid() @@ -168,7 +176,7 @@ class ValidateTest extends BaseTestCase $this->assertFalse($v->validate()); } - public function testMinInvalidDecimal() + public function testMinInvalidFloat() { $v = new Validator(array('num' => 0.5)); $v->rule('min', 'num', 0.9); @@ -180,13 +188,21 @@ class ValidateTest extends BaseTestCase $v = new Validator(array('num' => 5)); $v->rule('max', 'num', 6); $this->assertTrue($v->validate()); + + $v = new Validator(array('num' => 5)); + $v->rule('max', 'num', 5); + $this->assertTrue($v->validate()); } - public function testMaxValidDecimal() + public function testMaxValidFloat() { $v = new Validator(array('num' => 0.4)); $v->rule('max', 'num', 0.5); $this->assertTrue($v->validate()); + + $v = new Validator(array('num' => 1 - 0.83)); + $v->rule('max', 'num', 0.17); + $this->assertTrue($v->validate()); } public function testMaxInvalid() @@ -196,7 +212,7 @@ class ValidateTest extends BaseTestCase $this->assertFalse($v->validate()); } - public function testMaxInvalidDecimal() + public function testMaxInvalidFloat() { $v = new Validator(array('num' => 0.9)); $v->rule('max', 'num', 0.5);