Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
1c2489a3
Commit
1c2489a3
authored
Nov 12, 2013
by
slavcodev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Using only arrays in rules instead comma-separated string
parent
6066c29a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
17 deletions
+14
-17
Model.php
framework/yii/base/Model.php
+9
-9
Validator.php
framework/yii/validators/Validator.php
+5
-8
No files found.
framework/yii/base/Model.php
View file @
1c2489a3
...
@@ -91,19 +91,19 @@ class Model extends Component implements IteratorAggregate, ArrayAccess
...
@@ -91,19 +91,19 @@ class Model extends Component implements IteratorAggregate, ArrayAccess
*
*
* ~~~
* ~~~
* [
* [
*
'attribute list'
,
*
['attribute1', 'attribute2']
,
* 'validator type',
* 'validator type',
* 'on' =>
'scenario name'
,
* 'on' =>
['scenario1', 'scenario2']
,
* ...other parameters...
* ...other parameters...
* ]
* ]
* ~~~
* ~~~
*
*
* where
* where
*
*
* - attribute list: required, specifies the attributes
(separated by commas)
to be validated;
* - attribute list: required, specifies the attributes
array
to be validated;
* - validator type: required, specifies the validator to be used. It can be the name of a model
* - validator type: required, specifies the validator to be used. It can be the name of a model
* class method, the name of a built-in validator, or a validator class name (or its path alias).
* class method, the name of a built-in validator, or a validator class name (or its path alias).
* - on: optional, specifies the [[scenario|scenarios]]
(separated by commas)
when the validation
* - on: optional, specifies the [[scenario|scenarios]]
array
when the validation
* rule can be applied. If this option is not set, the rule will apply to all scenarios.
* rule can be applied. If this option is not set, the rule will apply to all scenarios.
* - additional name-value pairs can be specified to initialize the corresponding validator properties.
* - additional name-value pairs can be specified to initialize the corresponding validator properties.
* Please refer to individual validator class API for possible properties.
* Please refer to individual validator class API for possible properties.
...
@@ -128,15 +128,15 @@ class Model extends Component implements IteratorAggregate, ArrayAccess
...
@@ -128,15 +128,15 @@ class Model extends Component implements IteratorAggregate, ArrayAccess
* ~~~
* ~~~
* [
* [
* // built-in "required" validator
* // built-in "required" validator
* [
'username'
, 'required'],
* [
['username']
, 'required'],
* // built-in "string" validator customized with "min" and "max" properties
* // built-in "string" validator customized with "min" and "max" properties
* [
'username'
, 'string', 'min' => 3, 'max' => 12],
* [
['username']
, 'string', 'min' => 3, 'max' => 12],
* // built-in "compare" validator that is used in "register" scenario only
* // built-in "compare" validator that is used in "register" scenario only
* [
'password'
, 'compare', 'compareAttribute' => 'password2', 'on' => 'register'],
* [
['password']
, 'compare', 'compareAttribute' => 'password2', 'on' => 'register'],
* // an inline validator defined via the "authenticate()" method in the model class
* // an inline validator defined via the "authenticate()" method in the model class
* [
'password'
, 'authenticate', 'on' => 'login'],
* [
['password']
, 'authenticate', 'on' => 'login'],
* // a validator of class "DateRangeValidator"
* // a validator of class "DateRangeValidator"
* [
'dateRange'
, 'DateRangeValidator'],
* [
['dateRange']
, 'DateRangeValidator'],
* ];
* ];
* ~~~
* ~~~
*
*
...
...
framework/yii/validators/Validator.php
View file @
1c2489a3
...
@@ -133,17 +133,14 @@ abstract class Validator extends Component
...
@@ -133,17 +133,14 @@ abstract class Validator extends Component
*/
*/
public
static
function
createValidator
(
$type
,
$object
,
$attributes
,
$params
=
[])
public
static
function
createValidator
(
$type
,
$object
,
$attributes
,
$params
=
[])
{
{
if
(
!
is_array
(
$attributes
))
{
$params
[
'attributes'
]
=
(
array
)
$attributes
;
$attributes
=
preg_split
(
'/[\s,]+/'
,
$attributes
,
-
1
,
PREG_SPLIT_NO_EMPTY
);
}
$params
[
'attributes'
]
=
$attributes
;
if
(
isset
(
$params
[
'on'
])
&&
!
is_array
(
$params
[
'on'
])
)
{
if
(
isset
(
$params
[
'on'
]))
{
$params
[
'on'
]
=
preg_split
(
'/[\s,]+/'
,
$params
[
'on'
],
-
1
,
PREG_SPLIT_NO_EMPTY
)
;
$params
[
'on'
]
=
(
array
)
$params
[
'on'
]
;
}
}
if
(
isset
(
$params
[
'except'
])
&&
!
is_array
(
$params
[
'except'
])
)
{
if
(
isset
(
$params
[
'except'
]))
{
$params
[
'except'
]
=
preg_split
(
'/[\s,]+/'
,
$params
[
'except'
],
-
1
,
PREG_SPLIT_NO_EMPTY
)
;
$params
[
'except'
]
=
(
array
)
$params
[
'except'
]
;
}
}
if
(
method_exists
(
$object
,
$type
))
{
if
(
method_exists
(
$object
,
$type
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment