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 #343 from vlucas/issue-332

Browse Source 
detect numeric array when keys are out of order , fixes #332
This commit is contained in:
Willem Wollebrants 2021-07-06 14:22:56 +02:00 committed by GitHub
commit ba90097aa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Valitron/Validator.php
View File

@ -420,8 +420,12 @@ class Validator
*/ */
protected function validateIn($field, $value, $params) protected function validateIn($field, $value, $params)
{ {
$isAssoc = array_values($params[0]) !== $params[0]; $forceAsAssociative = false;
if ($isAssoc) { if (isset($params[2])) {
$forceAsAssociative = (bool) $params[2];
}
if ($forceAsAssociative || $this->isAssociativeArray($params[0])) {
$params[0] = array_keys($params[0]); $params[0] = array_keys($params[0]);
} }
@ -443,8 +447,12 @@ class Validator
*/ */
protected function validateListContains($field, $value, $params) protected function validateListContains($field, $value, $params)
{ {
$isAssoc = array_values($value) !== $value; $forceAsAssociative = false;
if ($isAssoc) { if (isset($params[2])) {
$forceAsAssociative = (bool) $params[2];
}
if ($forceAsAssociative || $this->isAssociativeArray($value)) {
$value = array_keys($value); $value = array_keys($value);
} }
@ -1566,4 +1574,9 @@ class Validator
$me->mapFieldRules($field, $rules[$field]); $me->mapFieldRules($field, $rules[$field]);
}, array_keys($rules)); }, array_keys($rules));
} }
private function isAssociativeArray($input){
//array contains at least one key that's not an can not be cast to an integer
return count(array_filter(array_keys($input), 'is_string')) > 0;
}
} }

41
tests/Valitron/ValidateTest.php
View File

@ -4,6 +4,7 @@ use Valitron\Validator;
class ValidateTest extends BaseTestCase class ValidateTest extends BaseTestCase
{ {
public function testValidWithNoRules() public function testValidWithNoRules()
{ {
$v = new Validator(array('name' => 'Chester Tester')); $v = new Validator(array('name' => 'Chester Tester'));
@ -2920,6 +2921,46 @@ class ValidateTest extends BaseTestCase
$v->rule('optional', 'address'); $v->rule('optional', 'address');
$this->assertTrue($v->validate()); $this->assertTrue($v->validate());
} }
/**
*
* @see https://github.com/vlucas/valitron/issues/332
*/
public function testInRuleSearchesValuesForNumericArray(){
$v = new Valitron\Validator(array('color' => 'purple'));
$v->rules(array(
'in' => array(
array('color', array(3=>'green', 2=>'purple'))
)
));
$this->assertTrue($v->validate());
}
public function testInRuleSearchesKeysForAssociativeArray(){
$v = new Valitron\Validator(array('color' => 'c-2'));
$v->rules(array(
'in' => array(
array('color', array('c-3'=>'green', 'c-2'=>'purple'))
)
));
$this->assertTrue($v->validate());
}
public function testInRuleSearchesKeysWhenForcedTo(){
$v = new Valitron\Validator(array('color' => 2));
$v->rules(array(
'in' => array(
array('color', array('3'=>'green', '2'=>'purple'), null, true)
)
));
$this->assertTrue($v->validate());
}
} }
function sampleFunctionCallback($field, $value, array $params) function sampleFunctionCallback($field, $value, array $params)