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 #201 from auroraeosrose/foreachbug

Browse Source 
Check if the value in getParts is non-scalar to prevent "Invalid argument to foreach" error
This commit is contained in:
Willem Wollebrants 2017-06-23 23:38:17 +02:00 committed by GitHub
commit a6cf3a8c86
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Valitron/Validator.php
View File

@ -892,6 +892,11 @@ class Validator
if (is_array($identifiers) && count($identifiers) === 0) { if (is_array($identifiers) && count($identifiers) === 0) {
return array($data, false); return array($data, false);
} }
// Catches the case where the data isn't an array or object
if (is_scalar($data)) {
return array(NULL, false);
}
$identifier = array_shift($identifiers); $identifier = array_shift($identifiers);

7
tests/Valitron/ValidateTest.php
View File

@ -34,6 +34,13 @@ class ValidateTest extends BaseTestCase
$v->rule('required', array('name', 'email')); $v->rule('required', array('name', 'email'));
$this->assertFalse($v->validate()); $this->assertFalse($v->validate());
} }
public function testRequiredSubfieldsArrayStringValue()
{
$v = new Validator(array('name' => 'bob'));
$v->rule('required', array('name.*.red'));
$this->assertFalse($v->validate());
}
public function testRequiredValid() public function testRequiredValid()
{ {