Add rule "Age" to validation.

library/Exceptions/MinimumAgeException.php → library/Exceptions/AgeException.php

@@ -1,7 +1,7 @@
 <?php
 namespace Respect\Validation\Exceptions;
 
-class MinimumAgeException extends ValidationException
+class AgeException extends ValidationException
 {
     public static $defaultTemplates = array(
         self::MODE_DEFAULT => array(

library/Rules/Age.php

@@ -0,0 +1,51 @@
+<?php
+namespace Respect\Validation\Rules;
+
+use DateTime;
+
+class Age extends AbstractRule
+{
+    private $maxAge = null;
+    private $minAge = null;
+
+    public function __construct($min, $max = null)
+    {
+        $this->minAge = $min;
+        $this->maxAge = $max;
+    }
+
+    public function validate($input)
+    {
+        if (! is_int($this->minAge) || ! is_int($this->maxAge)) {
+            return false;
+        }
+
+        if ($input instanceof DateTime) {
+            return $this->dateTimeResolver();
+        } 
+
+        if (!is_string($input) || (is_null($this->format) && false === strtotime($input))) {
+            return false;
+        } 
+
+        $age = ((date('Ymd') - date('Ymd', strtotime($input))) / 10000);
+
+        if ($this->maxAge) {
+            return $age >= $this->minAge and $age <= $this->maxAge;
+        }
+
+        return $age >= $this->minAge;
+    }
+
+    private function dateTimeResolver($input)
+    {
+        $birthday = new DateTime('now - '.$this->minAge.' year');
+
+        if ($this->maxAge) {
+            $limit = new DateTime('now + '.$this->maxAge. ' year');
+            return $birthday > $input and $limit < $input;
+        }
+
+        return $birthday > $input;
+    }
+}

library/Rules/MinimumAge.php

@@ -3,33 +3,14 @@
 
 use DateTime;
 
-class MinimumAge extends AbstractRule
+/**
+ * @deprecated
+ */
+class MinimumAge extends Age
 {
-    public $age = null;
-    public $format = null;
-
-    public function __construct($age, $format = null)
-    {
-        $this->age = $age;
-        $this->format = $format;
-    }
-
-    public function validate($input)
+    public function __construct($min, $max = null)
     {
-        if (!is_int($this->age)) {
-            return false;
-        }
-
-        if ($input instanceof DateTime) {
-            $birthday = new \DateTime('now - '.$this->age.' year');
-
-            return $birthday > $input;
-        } elseif (!is_string($input) || (is_null($this->format) && false === strtotime($input))) {
-            return false;
-        } else {
-            $age = ((date('Ymd') - date('Ymd', strtotime($input))) / 10000);
-
-            return $age >= $this->age;
-        }
+        parent::__construct($min, $max = null);
+        trigger_error("Use Age instead.", E_USER_DEPRECATED);
     }
 }

tests/Rules/AgeTest.php

@@ -0,0 +1,69 @@
+<?php
+namespace Respect\Validation\Rules;
+
+use DateTime;
+
+class AgeTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider providerForValidDateValidAge
+     */
+    public function testValidAgeInsideBoundsShouldPass($age, $format, $input)
+    {
+       $maximumAge = null;
+        $minimumAge = new Age($age, $maximumAge, $format);
+        $this->assertTrue($minimumAge->__invoke($input));
+        $this->assertTrue($minimumAge->assert($input));
+        $this->assertTrue($minimumAge->check($input));
+    }
+
+    /**
+     * @dataProvider providerForValidDateInvalidAge
+     * @expectedException Respect\Validation\Exceptions\AgeException
+     */
+    public function testInvalidAgeShouldThrowException($age, $format, $input)
+    {
+        $minimumAge = new Age($age, $format);
+        $this->assertFalse($minimumAge->__invoke($input));
+        $this->assertFalse($minimumAge->assert($input));
+    }
+
+    /**
+     * @dataProvider providerForInvalidDate
+     * @expectedException Respect\Validation\Exceptions\AgeException
+     */
+    public function testInvalidDateShouldNotPass($age, $format, $input)
+    {
+        $minimumAge = new Age($age, $format);
+        $this->assertFalse($minimumAge->__invoke($input));
+        $this->assertFalse($minimumAge->assert($input));
+    }
+
+    public function providerForValidDateValidAge()
+    {
+        return array(
+            array(18, 'Y-m-d', ''),
+            array(18, 'Y-m-d', '1969-07-20'),
+            array(18, null, new \DateTime('1969-07-20')),
+            array(18, 'Y-m-d', new \DateTime('1969-07-20')),
+        );
+    }
+
+    public function providerForValidDateInvalidAge()
+    {
+        return array(
+            array(18, 'Y-m-d', '2002-06-30'),
+            array(18, null, new \DateTime('2002-06-30')),
+            array(18, 'Y-m-d', new \DateTime('2002-06-30')),
+        );
+    }
+
+    public function providerForInvalidDate()
+    {
+        return array(
+            array(18, null, 'invalid-input'),
+            array(18, null, new \stdClass),
+            array(18, 'y-m-d', '2002-06-30'),
+        );
+    }
+}

tests/Rules/MininumAgeTest.php

@@ -6,39 +6,40 @@
 class MinimumAgeTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @dataProvider providerForValidDateValidMinimumAge
+     * @dataProvider providerForValidDateValidAge
      */
-    public function testValidMinimumAgeInsideBoundsShouldPass($age, $format, $input)
+    public function testValidAgeInsideBoundsShouldPass($age, $format, $input)
     {
-        $minimumAge = new MinimumAge($age, $format);
+	$maximumAge = null;
+        $minimumAge = new Age($age, $maximumAge, $format);
         $this->assertTrue($minimumAge->__invoke($input));
         $this->assertTrue($minimumAge->assert($input));
         $this->assertTrue($minimumAge->check($input));
     }
 
     /**
-     * @dataProvider providerForValidDateInvalidMinimumAge
-     * @expectedException Respect\Validation\Exceptions\MinimumAgeException
+     * @dataProvider providerForValidDateInvalidAge
+     * @expectedException Respect\Validation\Exceptions\AgeException
      */
-    public function testInvalidMinimumAgeShouldThrowException($age, $format, $input)
+    public function testInvalidAgeShouldThrowException($age, $format, $input)
     {
-        $minimumAge = new MinimumAge($age, $format);
+        $minimumAge = new Age($age, $format);
         $this->assertFalse($minimumAge->__invoke($input));
         $this->assertFalse($minimumAge->assert($input));
     }
 
     /**
      * @dataProvider providerForInvalidDate
-     * @expectedException Respect\Validation\Exceptions\MinimumAgeException
+     * @expectedException Respect\Validation\Exceptions\AgeException
      */
     public function testInvalidDateShouldNotPass($age, $format, $input)
     {
-        $minimumAge = new MinimumAge($age, $format);
+        $minimumAge = new Age($age, $format);
         $this->assertFalse($minimumAge->__invoke($input));
         $this->assertFalse($minimumAge->assert($input));
     }
 
-    public function providerForValidDateValidMinimumAge()
+    public function providerForValidDateValidAge()
     {
         return array(
             array(18, 'Y-m-d', ''),
@@ -48,7 +49,7 @@ public function providerForValidDateValidMinimumAge()
         );
     }
 
-    public function providerForValidDateInvalidMinimumAge()
+    public function providerForValidDateInvalidAge()
     {
         return array(
             array(18, 'Y-m-d', '2002-06-30'),

tests/library/Respect/Validation/Rules/Age.php

@@ -0,0 +1,69 @@
+<?php
+namespace Respect\Validation\Rules;
+
+use DateTime;
+
+class AgeTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider providerForValidDateValidAge
+     */
+    public function testValidMinimumAgeInsideBoundsShouldPass($minAge, $maxAge, $input)
+    {
+        $minimumAge = new Age($minAge, $maxAge);
+        $this->assertTrue($minimumAge->__invoke($input));
+        $this->assertTrue($minimumAge->assert($input));
+        $this->assertTrue($minimumAge->check($input));
+    }
+
+    /**
+     * @dataProvider providerForValidDateInvalidAge
+     * @expectedException Respect\Validation\Exceptions\AgeException
+     */
+    public function testInvalidMinimumAgeShouldThrowException($minAge, $maxAge, $input)
+    {
+        $minimumAge = new Age($minAge, $maxAge);
+        $this->assertFalse($minimumAge->__invoke($input));
+        $this->assertFalse($minimumAge->assert($input));
+    }
+
+    /**
+     * @dataProvider providerForInvalidDate
+     * @expectedException Respect\Validation\Exceptions\AgeException
+     */
+    public function testInvalidDateShouldNotPass($minAge, $maxAge, $input)
+    {
+        $minimumAge = new Age($minAge, $maxAge);
+        $this->assertFalse($minimumAge->__invoke($input));
+        $this->assertFalse($minimumAge->assert($input));
+    }
+
+    public function providerForValidDateValidAge()
+    {
+        return array(
+            array(18, 25, ''),
+            array(18, 25, '1969-07-20'),
+            array(18, null, new \DateTime('1969-07-20')),
+            array(18, 25, new \DateTime('1969-07-20')),
+        );
+    }
+
+    public function providerForValidDateInvalidAge()
+    {
+        return array(
+            array(18, 25, '2002-06-30'),
+            array(18, null, new \DateTime('2002-06-30')),
+            array(18, 35, new \DateTime('2002-06-30')),
+        );
+    }
+
+    public function providerForInvalidDate()
+    {
+        return array(
+            array(18, null, 'invalid-input'),
+            array(18, 25, new \stdClass),
+            array(18, 25, '2002-06-30'),
+        );
+    }
+}
+