php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-17 06:48:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2767 from ZhandosKz/filter_validator_skip_on_array

Browse Source 
Fixed typo in FilterValidator for skipping array values.
This commit is contained in:
Qiang Xue
2014-03-16 09:46:13 -04:00
parent 76a7beb67f 202e3ae0ca
commit 7910cc11dd
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/validators/FilterValidator.php
View File

@@ -67,7 +67,7 @@ class FilterValidator extends Validator
public function validateAttribute($object, $attribute) public function validateAttribute($object, $attribute)
{ {
$value = $object->$attribute; $value = $object->$attribute;
if ($this->skipOnArray || !is_array($value)) { if (!$this->skipOnArray || !is_array($value)) {
$object->$attribute = call_user_func($this->filter, $value); $object->$attribute = call_user_func($this->filter, $value);
} }
} }

14
tests/unit/framework/validators/FilterValidatorTest.php
View File

@@ -26,7 +26,9 @@ class FilterValidatorTest extends TestCase
'attr_one' => ' to be trimmed ', 'attr_one' => ' to be trimmed ',
'attr_two' => 'set this to null', 'attr_two' => 'set this to null',
'attr_empty1' => '', 'attr_empty1' => '',
'attr_empty2' => null 'attr_empty2' => null,
'attr_array' => ['Maria', 'Anna', 'Elizabeth'],
'attr_array_skipped' => ['John', 'Bill']
]); ]);
$val = new FilterValidator(['filter' => 'trim']); $val = new FilterValidator(['filter' => 'trim']);
$val->validateAttribute($m, 'attr_one'); $val->validateAttribute($m, 'attr_one');
@@ -42,6 +44,16 @@ class FilterValidatorTest extends TestCase
$val->skipOnEmpty = true; $val->skipOnEmpty = true;
$val->validateAttribute($m, 'attr_empty2'); $val->validateAttribute($m, 'attr_empty2');
$this->assertNotNull($m->attr_empty2); $this->assertNotNull($m->attr_empty2);
$val->filter = function($value) {
return implode(',', $value);
};
$val->skipOnArray = false;
$val->validateAttribute($m, 'attr_array');
$this->assertSame('Maria,Anna,Elizabeth', $m->attr_array);
$val->skipOnArray = true;
$val->validateAttribute($m, 'attr_array_skipped');
$this->assertSame(['John', 'Bill'], $m->attr_array_skipped);
} }
public function notToBeNull($value) public function notToBeNull($value)