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

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;
}
/**