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

Merge pull request #288 from deveplon/add-allow-null-value-in-subset-method

Browse Source 
Add some validation to prevent PHP Warning when value in subset is null
This commit is contained in:
Willem Wollebrants 2019-08-15 16:36:07 +02:00 committed by GitHub
commit 4cf18608ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Valitron/Validator.php
View File

@ -489,7 +489,7 @@ class Validator
if (!is_array($params[0])) { if (!is_array($params[0])) {
$params[0] = array($params[0]); $params[0] = array($params[0]);
} }
if (is_scalar($value)) { if (is_scalar($value) || is_null($value)) {
return $this->validateIn($field, $value, $params); return $this->validateIn($field, $value, $params);
} }

11
tests/Valitron/ValidateTest.php
View File

@ -484,7 +484,7 @@ class ValidateTest extends BaseTestCase
$v->rule('lengthMin', 'str', 4); $v->rule('lengthMin', 'str', 4);
$this->assertTrue($v->validate()); $this->assertTrue($v->validate());
} }
public function testLengthMinValidAltSyntax() public function testLengthMinValidAltSyntax()
{ {
$v = new Valitron\Validator(array('username' => 'martha')); $v = new Valitron\Validator(array('username' => 'martha'));
@ -1720,6 +1720,15 @@ class ValidateTest extends BaseTestCase
$this->assertFalse($v->validate()); $this->assertFalse($v->validate());
} }
public function testSubsetAcceptNullValue()
{
// rule value equals null
$v = new Validator(array('test_field' => null));
$v->rule('required', 'test_field');
$v->rule('subset', 'test_field', array('black', 45));
$this->assertFalse($v->validate());
}
public function testContainsUniqueValid() public function testContainsUniqueValid()
{ {
// numeric values // numeric values