Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-23 07:27:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

20160611

Browse Source
This commit is contained in:
cuiliang
2016-06-11 19:49:57 +08:00
parent 13e014b7d9 89ad1f534a
commit cd9caf65d2
2065 changed files with 88639 additions and 74804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
framework/validators/NumberValidator.php
View File

@@ -101,7 +101,7 @@ class NumberValidator extends Validator
*/
protected function validateValue($value)
{
if (is_array($value)) {
if (is_array($value) || is_object($value)) {
return [Yii::t('yii', '{attribute} is invalid.'), []];
}
$pattern = $this->integerOnly ? $this->integerPattern : $this->numberPattern;
@@ -133,7 +133,7 @@ class NumberValidator extends Validator
if ($this->min !== null) {
// ensure numeric value to make javascript comparison equal to PHP comparison
// https://github.com/yiisoft/yii2/issues/3118
$options['min'] = is_string($this->min) ? (float)$this->min : $this->min;
$options['min'] = is_string($this->min) ? (float) $this->min : $this->min;
$options['tooSmall'] = Yii::$app->getI18n()->format($this->tooSmall, [
'attribute' => $label,
'min' => $this->min,
@@ -142,7 +142,7 @@ class NumberValidator extends Validator
if ($this->max !== null) {
// ensure numeric value to make javascript comparison equal to PHP comparison
// https://github.com/yiisoft/yii2/issues/3118
$options['max'] = is_string($this->max) ? (float)$this->max : $this->max;
$options['max'] = is_string($this->max) ? (float) $this->max : $this->max;
$options['tooBig'] = Yii::$app->getI18n()->format($this->tooBig, [
'attribute' => $label,
'max' => $this->max,
@@ -154,10 +154,14 @@ class NumberValidator extends Validator
ValidationAsset::register($view);
<<<<<<< HEAD
<<<<<<< HEAD
return 'yii.validation.number(value, messages, ' . Json::encode($options) . ');';
=======
return 'yii.validation.number(value, messages, ' . Json::htmlEncode($options) . ');';
>>>>>>> yiichina/master
=======
return 'yii.validation.number(value, messages, ' . Json::htmlEncode($options) . ');';
>>>>>>> master
}
}