Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-22 23:17:12 +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

65
framework/validators/Validator.php
View File

@@ -18,7 +18,7 @@ use yii\base\NotSupportedException;
* logic of performing data validation. Child classes may also override [[clientValidateAttribute()]]
* to provide client-side validation support.
*
* Validator declares a set of [[builtInValidators|built-in validators] which can
* Validator declares a set of [[builtInValidators|built-in validators]] which can
* be referenced using short names. They are listed as follows:
*
* - `boolean`: [[BooleanValidator]]
@@ -28,9 +28,13 @@ use yii\base\NotSupportedException;
* - `default`: [[DefaultValueValidator]]
* - `double`: [[NumberValidator]]
<<<<<<< HEAD
<<<<<<< HEAD
=======
* - `each`: [[EachValidator]]
>>>>>>> yiichina/master
=======
* - `each`: [[EachValidator]]
>>>>>>> master
* - `email`: [[EmailValidator]]
* - `exist`: [[ExistValidator]]
* - `file`: [[FileValidator]]
@@ -45,6 +49,7 @@ use yii\base\NotSupportedException;
* - `trim`: [[FilterValidator]]
* - `unique`: [[UniqueValidator]]
* - `url`: [[UrlValidator]]
* - `ip`: [[IpValidator]]
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0
@@ -62,9 +67,13 @@ class Validator extends Component
'default' => 'yii\validators\DefaultValueValidator',
'double' => 'yii\validators\NumberValidator',
<<<<<<< HEAD
<<<<<<< HEAD
=======
'each' => 'yii\validators\EachValidator',
>>>>>>> yiichina/master
=======
'each' => 'yii\validators\EachValidator',
>>>>>>> master
'email' => 'yii\validators\EmailValidator',
'exist' => 'yii\validators\ExistValidator',
'file' => 'yii\validators\FileValidator',
@@ -87,6 +96,7 @@ class Validator extends Component
],
'unique' => 'yii\validators\UniqueValidator',
'url' => 'yii\validators\UrlValidator',
'ip' => 'yii\validators\IpValidator',
];
/**
* @var array|string attributes to be validated by this validator. For multiple attributes,
@@ -162,7 +172,8 @@ class Validator extends Component
/**
* @var string a JavaScript function name whose return value determines whether this validator should be applied
* on the client side. The signature of the function should be `function (attribute, value)`, where
* `attribute` is the name of the attribute being validated and `value` the current value of the attribute.
* `attribute` is an object describing the attribute being validated (see [[clientValidateAttribute()]])
* and `value` the current value of the attribute.
*
* This property is mainly provided to support conditional validation on the client side.
* If this property is not set, this validator will be always applied on the client side.
@@ -171,7 +182,7 @@ class Validator extends Component
*
* ```php
* function (attribute, value) {
* return $('#country').value == 'USA';
* return $('#country').val() === 'USA';
* }
* ```
*
@@ -227,17 +238,26 @@ class Validator extends Component
* Validates the specified object.
* @param \yii\base\Model $model the data model being validated
* @param array|null $attributes the list of attributes to be validated.
* Note that if an attribute is not associated with the validator,
* it will be ignored.
* If this parameter is null, every attribute listed in [[attributes]] will be validated.
* Note that if an attribute is not associated with the validator, or is is prefixed with `!` char - it will be
* ignored. If this parameter is null, every attribute listed in [[attributes]] will be validated.
*/
public function validateAttributes($model, $attributes = null)
{
if (is_array($attributes)) {
$attributes = array_intersect($this->attributes, $attributes);
$newAttributes = [];
foreach ($attributes as $attribute) {
if (in_array($attribute, $this->attributes) || in_array('!' . $attribute, $this->attributes)) {
$newAttributes[] = $attribute;
}
}
$attributes = $newAttributes;
} else {
$attributes = $this->attributes;
$attributes = [];
foreach ($this->attributes as $attribute) {
$attributes[] = $attribute[0] === '!' ? substr($attribute, 1) : $attribute;
}
}
foreach ($attributes as $attribute) {
$skip = $this->skipOnError && $model->hasErrors($attribute)
|| $this->skipOnEmpty && $this->isEmpty($model->$attribute);
@@ -279,7 +299,13 @@ class Validator extends Component
list($message, $params) = $result;
$params['attribute'] = Yii::t('yii', 'the input value');
$params['value'] = is_array($value) ? 'array()' : $value;
if (is_array($value)) {
$params['value'] = 'array()';
} elseif (is_object($value)) {
$params['value'] = 'object';
} else {
$params['value'] = $value;
}
$error = Yii::$app->getI18n()->format($message, $params, Yii::$app->language);
return false;
@@ -306,10 +332,19 @@ class Validator extends Component
*
* The following JavaScript variables are predefined and can be used in the validation code:
*
* - `attribute`: the name of the attribute being validated.
* - `attribute`: an object describing the the attribute being validated.
* - `value`: the value being validated.
* - `messages`: an array used to hold the validation error messages for the attribute.
* - `deferred`: an array used to hold deferred objects for asynchronous validation
* - `$form`: a jQuery object containing the form element
*
* The `attribute` object contains the following properties:
* - `id`: a unique ID identifying the attribute (e.g. "loginform-username") in the form
* - `name`: attribute name or expression (e.g. "[0]content" for tabular input)
* - `container`: the jQuery selector of the container of the input field
* - `input`: the jQuery selector of the input field under the context of the form
* - `error`: the jQuery selector of the error tag under the context of the container
* - `status`: status of the input field, 0: empty, not entered before, 1: validated, 2: pending validation, 3: validating
*
* @param \yii\base\Model $model the data model being validated
* @param string $attribute the name of the attribute to be validated.
@@ -350,19 +385,25 @@ class Validator extends Component
*/
public function addError($model, $attribute, $message, $params = [])
{
$value = $model->$attribute;
$params['attribute'] = $model->getAttributeLabel($attribute);
$params['value'] = is_array($value) ? 'array()' : $value;
if (!isset($params['value'])) {
$value = $model->$attribute;
$params['value'] = is_array($value) ? 'array()' : $value;
}
$model->addError($attribute, Yii::$app->getI18n()->format($message, $params, Yii::$app->language));
}
/**
* Checks if the given value is empty.
<<<<<<< HEAD
<<<<<<< HEAD
* A value is considered empty if it is null, an empty array, or the trimmed result is an empty string.
=======
* A value is considered empty if it is null, an empty array, or an empty string.
>>>>>>> yiichina/master
=======
* A value is considered empty if it is null, an empty array, or an empty string.
>>>>>>> master
* Note that this method is different from PHP empty(). It will return false when the value is 0.
* @param mixed $value the value to be checked
* @return boolean whether the value is empty