deblan-mirror/respect-validation
deblan-mirror/respect-validation
1
0
Fork 0
mirror of https://github.com/Respect/Validation.git synced 2024-06-29 02:30:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve date and time handling on "Min" rule

Browse source
This commit is contained in:
Henrique Moody 2015-02-11 10:52:49 -02:00
parent 9a5f4302cb
commit e91d0ef22e
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/Exceptions/MinException.php
View file

@ -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}}',
),
);

17
library/Rules/Min.php
View file

@ -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);
}
}

11
tests/Rules/MinTest.php
View file

@ -1,6 +1,8 @@
<?php
namespace Respect\Validation\Rules;
use DateTime;
class MinTest extends \PHPUnit_Framework_TestCase
{
/**
@ -35,6 +37,15 @@ class MinTest extends \PHPUnit_Framework_TestCase
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'),
);
}