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

Fix #115 strict flag for in_array

Browse Source
This commit is contained in:
Vance Lucas 2014-11-20 09:24:40 -06:00
parent bd0f6868c8
commit c7342e025a
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Valitron/Validator.php
View File

@ -350,13 +350,18 @@ class Validator
* @internal param array $fields * @internal param array $fields
* @return bool * @return bool
*/ */
protected function validateIn($field, $value, $params, $strict = false) protected function validateIn($field, $value, $params)
{ {
$isAssoc = array_values($params[0]) !== $params[0]; $isAssoc = array_values($params[0]) !== $params[0];
if ($isAssoc) { if ($isAssoc) {
$params[0] = array_keys($params[0]); $params[0] = array_keys($params[0]);
} }
$strict = false;
if (isset($params[1])) {
$strict = $params[1];
}
return in_array($value, $params[0], $strict); return in_array($value, $params[0], $strict);
} }

7
tests/Valitron/ValidateTest.php
View File

@ -273,6 +273,13 @@ class ValidateTest extends BaseTestCase
$this->assertTrue($v->validate()); $this->assertTrue($v->validate());
} }
public function testInStrictInvalid()
{
$v = new Validator(array('color' => '1'));
$v->rule('in', 'color', array(1, 2, 3), true);
$this->assertFalse($v->validate());
}
public function testArrayValid() public function testArrayValid()
{ {
$v = new Validator(array('colors' => array('yellow'))); $v = new Validator(array('colors' => array('yellow')));