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

refactoring code

Browse Source
This commit is contained in:
githubjeka
2016-03-29 18:33:00 +03:00
parent 8e1ec62191
commit 59fea15ee2
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
framework/validators/BooleanValidator.php
View File

@ -56,17 +56,9 @@ class BooleanValidator extends Validator
|| $this->strict && ($value === $this->trueValue || $value === $this->falseValue);
if (!$valid) {
$trueParamMessage = $this->trueValue;
$falseParamMessage = $this->falseValue;
if ($this->trueValue === true) {
$trueParamMessage = 'true';
}
if ($this->falseValue === false) {
$falseParamMessage = 'false';
}
return [$this->message, [
'true' => $trueParamMessage,
'false' => $falseParamMessage,
'true' => $this->trueValue === true ? 'true' : $this->trueValue,
'false' => $this->falseValue === false ? 'false' : $this->falseValue,
]];
}
@ -78,22 +70,13 @@ class BooleanValidator extends Validator
*/
public function clientValidateAttribute($model, $attribute, $view)
{
$trueParamMessage = $this->trueValue;
$falseParamMessage = $this->falseValue;
if ($this->trueValue === true) {
$trueParamMessage = 'true';
}
if ($this->falseValue === false) {
$falseParamMessage = 'false';
}
$options = [
'trueValue' => $this->trueValue,
'falseValue' => $this->falseValue,
'message' => Yii::$app->getI18n()->format($this->message, [
'attribute' => $model->getAttributeLabel($attribute),
'true' => $trueParamMessage,
'false' => $falseParamMessage,
'true' => $this->trueValue === true ? 'true' : $this->trueValue,
'false' => $this->falseValue === false ? 'false' : $this->falseValue,
], Yii::$app->language),
];
if ($this->skipOnEmpty) {