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

Fixed yii\validators\EachValidator does not invoke validateAttribute() method of the embedded validator

Browse Source
This commit is contained in:
Klimov Paul
2016-04-12 11:14:57 +03:00
parent 77996374a4
commit 205f16811a
3 changed files with 60 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -4,6 +4,7 @@ Yii Framework 2 Change Log
2.0.8 under development
-----------------------
- Bug #9935: Fixed `yii\validators\EachValidator` does not invoke `validateAttribute()` method of the embedded validator (klimov-paul)
- Bug #11270: Fixed `BaseActiveRecord::link()` method in order to support closure in `indexBy` for relations declaration (iushev)
- Bug #11262: Enabled use of yii2 inside of PHAR packaged console applications (hiqsol)
- Bug #11196: Fixed VarDumper throws PHP Fatal when dumping `__PHP_Incomplete_Class` (DamianZ)

39
framework/validators/EachValidator.php
View File

@ -115,19 +115,34 @@ class EachValidator extends Validator
public function validateAttribute($model, $attribute)
{
$value = $model->$attribute;
$validator = $this->getValidator();
if ($validator instanceof FilterValidator && is_array($value)) {
$filteredValue = [];
foreach ($value as $k => $v) {
if (!$validator->skipOnArray || !is_array($v)) {
$filteredValue[$k] = call_user_func($validator->filter, $v);
}
}
$model->$attribute = $filteredValue;
} else {
$this->getValidator($model); // ensure model context while validator creation
parent::validateAttribute($model, $attribute);
if (!is_array($value)) {
$this->addError($model, $attribute, $this->message, []);
return;
}
$validator = $this->getValidator($model); // ensure model context while validator creation
$originalErrors = $model->getErrors($attribute);
$filteredValue = [];
foreach ($value as $k => $v) {
$model->$attribute = $v;
$validator->validateAttribute($model, $attribute);
$filteredValue[$k] = $model->$attribute;
if ($model->hasErrors($attribute)) {
$validationErrors = $model->getErrors($attribute);
$model->clearErrors($attribute);
if (!empty($originalErrors)) {
$model->addErrors([$attribute => $originalErrors]);
}
if ($this->allowMessageFromRule) {
$model->addErrors([$attribute => $validationErrors]);
} else {
$this->addError($model, $attribute, $this->message, ['value' => $v]);
}
return;
}
}
$model->$attribute = $filteredValue;
}
/**

32
tests/framework/validators/EachValidatorTest.php
View File

@ -108,4 +108,36 @@ class EachValidatorTest extends TestCase
$validator = new EachValidator(['rule' => ['integer', 'skipOnEmpty' => false]]);
$this->assertFalse($validator->validate(['']));
}
/**
* @see https://github.com/yiisoft/yii2/issues/9935
*
* @depends testValidate
*/
public function testCompare()
{
$model = FakedValidationModel::createWithAttributes([
'attr_one' => [
'value1',
'value2',
'value3',
],
'attr_two' => 'value2',
]);
$validator = new EachValidator(['rule' => ['compare', 'compareAttribute' => 'attr_two']]);
$validator->validateAttribute($model, 'attr_one');
$this->assertNotEmpty($model->getErrors('attr_one'));
$model = FakedValidationModel::createWithAttributes([
'attr_one' => [
'value1',
'value2',
'value3',
],
'attr_two' => 'value4',
]);
$validator = new EachValidator(['rule' => ['compare', 'compareAttribute' => 'attr_two', 'operator' => '!=']]);
$validator->validateAttribute($model, 'attr_one');
$this->assertEmpty($model->getErrors('attr_one'));
}
}