From 4fb6f478ef05cb2cf76115e0c18260308b9a7ed7 Mon Sep 17 00:00:00 2001
From: Justin Hook <justinhook88@yahoo.co.uk>
Date: Tue, 1 Apr 2014 21:17:00 +0100
Subject: [PATCH 1/2] Fixed issue with Min/Max rules using decimals

---
 src/Valitron/Validator.php      |  4 ++--
 tests/Valitron/ValidateTest.php | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/Valitron/Validator.php b/src/Valitron/Validator.php
index cfb2da1..6d0831c 100644
--- a/src/Valitron/Validator.php
+++ b/src/Valitron/Validator.php
@@ -224,7 +224,7 @@ class Validator
      */
     protected function validateMin($field, $value, $params)
     {
-        return (int) $value >= $params[0];
+        return $value >= $params[0];
     }
 
     /**
@@ -238,7 +238,7 @@ class Validator
      */
     protected function validateMax($field, $value, $params)
     {
-        return (int) $value <= $params[0];
+        return $value <= $params[0];
     }
 
     /**
diff --git a/tests/Valitron/ValidateTest.php b/tests/Valitron/ValidateTest.php
index d1ed886..9809f2d 100644
--- a/tests/Valitron/ValidateTest.php
+++ b/tests/Valitron/ValidateTest.php
@@ -154,6 +154,13 @@ class ValidateTest extends BaseTestCase
         $this->assertTrue($v->validate());
     }
 
+    public function testMinValidDecimal()
+    {
+        $v = new Validator(array('num' => 0.9));
+        $v->rule('min', 'num', 0.5);
+        $this->assertTrue($v->validate());
+    }
+
     public function testMinInvalid()
     {
         $v = new Validator(array('num' => 5));
@@ -161,6 +168,13 @@ class ValidateTest extends BaseTestCase
         $this->assertFalse($v->validate());
     }
 
+    public function testMinInvalidDecimal()
+    {
+        $v = new Validator(array('num' => 0.5));
+        $v->rule('min', 'num', 0.9);
+        $this->assertFalse($v->validate());
+    }
+
     public function testMaxValid()
     {
         $v = new Validator(array('num' => 5));
@@ -168,6 +182,13 @@ class ValidateTest extends BaseTestCase
         $this->assertTrue($v->validate());
     }
 
+    public function testMaxValidDecimal()
+    {
+        $v = new Validator(array('num' => 0.4));
+        $v->rule('max', 'num', 0.5);
+        $this->assertTrue($v->validate());
+    }
+
     public function testMaxInvalid()
     {
         $v = new Validator(array('num' => 5));
@@ -175,6 +196,13 @@ class ValidateTest extends BaseTestCase
         $this->assertFalse($v->validate());
     }
 
+    public function testMaxInvalidDecimal()
+    {
+        $v = new Validator(array('num' => 0.9));
+        $v->rule('max', 'num', 0.5);
+        $this->assertFalse($v->validate());
+    }
+
     public function testInValid()
     {
         $v = new Validator(array('color' => 'green'));

From 631a5e213847b73be88203d27e15469ff6e0abde Mon Sep 17 00:00:00 2001
From: Justin Hook <justinhook88@yahoo.co.uk>
Date: Wed, 2 Apr 2014 21:58:30 +0100
Subject: [PATCH 2/2] 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);