Merge pull request #292 from henriquemoody/date_time

Improve date and time handling on "Min" and "Max" rules

README.md

@@ -1406,6 +1406,13 @@ Also accepts dates:
 v::date()->max('2012-01-01')->validate('2010-01-01'); //true
 ```
 
+Also date intervals:
+
+```php
+// Same of minimum age validation
+v::date()->max('-18 years')->validate('1988-09-09'); //true
+```
+
 `true` may be passed as a parameter to indicate that inclusive
 values must be used.
 

library/Exceptions/MaxException.php

@@ -7,12 +7,12 @@ class MaxException extends ValidationException
 
     public static $defaultTemplates = array(
         self::MODE_DEFAULT => array(
-            self::STANDARD => '{{name}} must be lower than {{maxValue}}',
-            self::INCLUSIVE => '{{name}} must be lower than or equals {{maxValue}}',
+            self::STANDARD => '{{name}} must be lower than {{interval}}',
+            self::INCLUSIVE => '{{name}} must be lower than or equals {{interval}}',
         ),
         self::MODE_NEGATIVE => array(
-            self::STANDARD => '{{name}} must not be lower than {{maxValue}}',
-            self::INCLUSIVE => '{{name}} must not be lower than or equals {{maxValue}}',
+            self::STANDARD => '{{name}} must not be lower than {{interval}}',
+            self::INCLUSIVE => '{{name}} must not be lower than or equals {{interval}}',
         ),
     );
 

library/Exceptions/MinException.php

@@ -7,12 +7,12 @@ class MinException extends ValidationException
 
     public static $defaultTemplates = array(
         self::MODE_DEFAULT => array(
-            self::STANDARD => '{{name}} must be greater than {{minValue}}',
-            self::INCLUSIVE => '{{name}} must be greater than or equals {{minValue}}',
+            self::STANDARD => '{{name}} must be greater than {{interval}}',
+            self::INCLUSIVE => '{{name}} must be greater than or equals {{interval}}',
         ),
         self::MODE_NEGATIVE => array(
-            self::STANDARD => '{{name}} must not be greater than {{minValue}}',
-            self::INCLUSIVE => '{{name}} must not be greater than or equals {{minValue}}',
+            self::STANDARD => '{{name}} must not be greater than {{interval}}',
+            self::INCLUSIVE => '{{name}} must not be greater than or equals {{interval}}',
         ),
     );
 

library/Rules/AbstractInterval.php

@@ -0,0 +1,36 @@
+<?php
+namespace Respect\Validation\Rules;
+
+use Exception;
+use DateTime;
+
+abstract class AbstractInterval extends AbstractRule
+{
+    public $interval;
+    public $inclusive;
+
+    public function __construct($interval, $inclusive = false)
+    {
+        $this->interval  = $interval;
+        $this->inclusive = $inclusive;
+    }
+
+    protected function filterInterval($value)
+    {
+        if (!is_string($value) || is_numeric($value) || empty($value)) {
+            return $value;
+        }
+
+        if (strlen($value) == 1) {
+            return $value;
+        }
+
+        try {
+            return new DateTime($value);
+        } catch (Exception $e) {
+            // Pokémon Exception Handling
+        }
+
+        return $value;
+    }
+}

library/Rules/Max.php

@@ -1,23 +1,14 @@
 <?php
 namespace Respect\Validation\Rules;
 
-class Max extends AbstractRule
+class Max extends AbstractInterval
 {
-    public $maxValue;
-    public $inclusive;
-
-    public function __construct($maxValue, $inclusive = false)
-    {
-        $this->maxValue = $maxValue;
-        $this->inclusive = $inclusive;
-    }
-
     public function validate($input)
     {
         if ($this->inclusive) {
-            return $input <= $this->maxValue;
-        } else {
-            return $input < $this->maxValue;
+            return $this->filterInterval($input) <= $this->filterInterval($this->interval);
         }
+
+        return $this->filterInterval($input) < $this->filterInterval($this->interval);
     }
 }

library/Rules/Min.php

@@ -1,23 +1,14 @@
 <?php
 namespace Respect\Validation\Rules;
 
-class Min extends AbstractRule
+class Min extends AbstractInterval
 {
-    public $inclusive;
-    public $minValue;
-
-    public function __construct($minValue, $inclusive = false)
-    {
-        $this->minValue = $minValue;
-        $this->inclusive = $inclusive;
-    }
-
     public function validate($input)
     {
         if ($this->inclusive) {
-            return $input >= $this->minValue;
-        } else {
-            return $input > $this->minValue;
+            return $this->filterInterval($input) >= $this->filterInterval($this->interval);
         }
+
+        return $this->filterInterval($input) > $this->filterInterval($this->interval);
     }
 }

tests/Rules/MaxTest.php

@@ -33,6 +33,10 @@ public function providerForValidMax()
             array(200, false, -200),
             array(200, true, 200),
             array(200, false, 0),
+            array('-18 years', true, '1988-09-09'),
+            array('z', true, 'z'),
+            array('z', false, 'y'),
+            array('tomorrow', true, 'now'),
         );
     }
 

tests/Rules/MinTest.php

@@ -1,6 +1,8 @@
 <?php
 namespace Respect\Validation\Rules;
 
+use DateTime;
+
 class MinTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -35,6 +37,15 @@ public function providerForValidMin()
             array(-100, false, 200),
             array(200, true, 200),
             array(200, false, 300),
+            array('a', true, 'a'),
+            array('a', true, 'c'),
+            array('yesterday', true, 'now'),
+
+            // Samples from issue #178
+            array('13-05-2014 03:16', true, '20-05-2014 03:16'),
+            array(new DateTime('13-05-2014 03:16'), true, new DateTime('20-05-2014 03:16')),
+            array('13-05-2014 03:16', true, new DateTime('20-05-2014 03:16')),
+            array(new DateTime('13-05-2014 03:16'), true, '20-05-2014 03:16'),
         );
     }