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

release version 2.0.11

Browse Source
This commit is contained in:
Carsten Brandt
2017-02-01 17:46:29 +01:00
parent bd59d8f527
commit c19b2f7dc8
45 changed files with 80 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/validators/ExistValidator.php
View File

@ -64,13 +64,13 @@ class ExistValidator extends Validator
* @var bool whether to allow array type attribute.
*/
public $allowArray = false;
/**
* @var string and|or define how target attributes are related
* @since 2.0.11
*/
public $targetAttributeJunction = 'and';
/**
* @inheritdoc
*/

4
framework/validators/UniqueValidator.php
View File

@ -83,13 +83,13 @@ class UniqueValidator extends Validator
* to setup custom message for multiple target attributes.
*/
public $comboNotUnique;
/**
* @var string and|or define how target attributes are related
* @since 2.0.11
*/
public $targetAttributeJunction = 'and';
/**
* @inheritdoc
*/
@ -218,7 +218,7 @@ class UniqueValidator extends Validator
* If the key and the value are the same, you can just specify the value.
* @param Model $model the data model to be validated
* @param string $attribute the name of the attribute to be validated in the $model
*
* @return array conditions, compatible with [[\yii\db\Query::where()|Query::where()]] key-value format.
*/
private function prepareConditions($targetAttribute, $model, $attribute)