LiittleCookie/valitron
1
0
Fork 0
mirror of https://github.com/vlucas/valitron.git synced 2025-12-31 07:01:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #206 from vlucas/issue101

Browse Source 
Always run 'accepted' validation (#101)
This commit is contained in:
Willem Wollebrants 2017-07-06 11:27:46 +02:00 committed by GitHub
commit c3d644e1d7
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Valitron/Validator.php
View File

@ -945,7 +945,11 @@ class Validator
// Don't validate if the field is not required and the value is empty // Don't validate if the field is not required and the value is empty
if ($this->hasRule('optional', $field) && isset($values)) { if ($this->hasRule('optional', $field) && isset($values)) {
//Continue with execution below if statement //Continue with execution below if statement
} elseif ($v['rule'] !== 'required' && !$this->hasRule('required', $field) && (! isset($values) || $values === '' || ($multiple && count($values) == 0))) { } elseif (
$v['rule'] !== 'required' && !$this->hasRule('required', $field) &&
$v['rule'] !== 'accepted' &&
(! isset($values) || $values === '' || ($multiple && count($values) == 0))
) {
continue; continue;
} }

6
tests/Valitron/ValidateTest.php
View File

@ -98,6 +98,12 @@ class ValidateTest extends BaseTestCase
$this->assertFalse($v->validate()); $this->assertFalse($v->validate());
} }
public function testAcceptedNotSet(){
$v = new Validator();
$v->rule('accepted', 'agree');
$this->assertFalse($v->validate());
}
public function testNumericValid() public function testNumericValid()
{ {
$v = new Validator(array('num' => '42.341569')); $v = new Validator(array('num' => '42.341569'));