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

Fix #18051: Fix missing support for custom validation method in EachValidator

Browse Source
This commit is contained in:
Bizley
2020-05-23 16:37:23 +02:00
committed by GitHub
parent f2d32fab77
commit 2a73a4ae3a
5 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@@ -8,6 +8,7 @@ Yii Framework 2 Change Log
- Enh #18019: Allow jQuery 3.5.0 to be installed (wouter90) - Enh #18019: Allow jQuery 3.5.0 to be installed (wouter90)
- Bug #18026: Fix `ArrayHelper::getValue()` did not work with `ArrayAccess` objects (mikk150) - Bug #18026: Fix `ArrayHelper::getValue()` did not work with `ArrayAccess` objects (mikk150)
- Enh #18048: Use `Instance::ensure()` to set `User::$accessChecker` (lav45) - Enh #18048: Use `Instance::ensure()` to set `User::$accessChecker` (lav45)
- Bug #18051: Fix missing support for custom validation method in EachValidator (bizley)
2.0.35 May 02, 2020 2.0.35 May 02, 2020

7
framework/validators/Validator.php
View File

@@ -209,10 +209,13 @@ class Validator extends Component
{ {
$params['attributes'] = $attributes; $params['attributes'] = $attributes;
if ($type instanceof \Closure || ($model->hasMethod($type) && !isset(static::$builtInValidators[$type]))) { if ($type instanceof \Closure) {
// method-based validator
$params['class'] = __NAMESPACE__ . '\InlineValidator'; $params['class'] = __NAMESPACE__ . '\InlineValidator';
$params['method'] = $type; $params['method'] = $type;
} elseif (!isset(static::$builtInValidators[$type]) && $model->hasMethod($type)) {
// method-based validator
$params['class'] = __NAMESPACE__ . '\InlineValidator';
$params['method'] = [$model, $type];
} else { } else {
if (isset(static::$builtInValidators[$type])) { if (isset(static::$builtInValidators[$type])) {
$type = static::$builtInValidators[$type]; $type = static::$builtInValidators[$type];

5
tests/data/base/Speaker.php
View File

@@ -49,4 +49,9 @@ class Speaker extends Model
'duplicates' => ['firstName', 'firstName', '!underscore_style', '!underscore_style'], 'duplicates' => ['firstName', 'firstName', '!underscore_style', '!underscore_style'],
]; ];
} }
public function customValidatingMethod($attribute, $params, $validator)
{
$this->addError($attribute, 'Custom method error');
}
} }

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

@@ -238,4 +238,15 @@ class EachValidatorTest extends TestCase
$this->assertEquals('This is the custom label must be a valid IP address.', $model->getFirstError('customLabel')); $this->assertEquals('This is the custom label must be a valid IP address.', $model->getFirstError('customLabel'));
$this->assertEquals('First Name is invalid.', $model->getFirstError('firstName')); $this->assertEquals('First Name is invalid.', $model->getFirstError('firstName'));
} }
public function testCustomMethod()
{
$model = new Speaker();
$model->firstName = ['a', 'b'];
$validator = new EachValidator(['rule' => ['customValidatingMethod']]);
$validator->validateAttribute($model, 'firstName');
$this->assertEquals('Custom method error', $model->getFirstError('firstName'));
}
} }

2
tests/framework/validators/ValidatorTest.php
View File

@@ -71,7 +71,7 @@ class ValidatorTest extends TestCase
$this->assertSame(['c', 'd', 'e'], $val->except); $this->assertSame(['c', 'd', 'e'], $val->except);
$val = TestValidator::createValidator('inlineVal', $model, ['val_attr_a'], ['params' => ['foo' => 'bar']]); $val = TestValidator::createValidator('inlineVal', $model, ['val_attr_a'], ['params' => ['foo' => 'bar']]);
$this->assertInstanceOf(InlineValidator::className(), $val); $this->assertInstanceOf(InlineValidator::className(), $val);
$this->assertSame('inlineVal', $val->method); $this->assertSame('inlineVal', $val->method[1]);
$this->assertSame(['foo' => 'bar'], $val->params); $this->assertSame(['foo' => 'bar'], $val->params);
} }