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
3ff8f10d
Commit
3ff8f10d
authored
Nov 12, 2013
by
slavcodev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add array conversion on creating validator
parent
9bf7f791
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
Model.php
framework/yii/base/Model.php
+1
-1
FakedValidationModel.php
tests/unit/data/validators/models/FakedValidationModel.php
+1
-1
No files found.
framework/yii/base/Model.php
View file @
3ff8f10d
...
@@ -390,7 +390,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess
...
@@ -390,7 +390,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess
if
(
$rule
instanceof
Validator
)
{
if
(
$rule
instanceof
Validator
)
{
$validators
->
append
(
$rule
);
$validators
->
append
(
$rule
);
}
elseif
(
is_array
(
$rule
)
&&
isset
(
$rule
[
0
],
$rule
[
1
]))
{
// attributes, validator type
}
elseif
(
is_array
(
$rule
)
&&
isset
(
$rule
[
0
],
$rule
[
1
]))
{
// attributes, validator type
$validator
=
Validator
::
createValidator
(
$rule
[
1
],
$this
,
$rule
[
0
],
array_slice
(
$rule
,
2
));
$validator
=
Validator
::
createValidator
(
$rule
[
1
],
$this
,
(
array
)
$rule
[
0
],
array_slice
(
$rule
,
2
));
$validators
->
append
(
$validator
);
$validators
->
append
(
$validator
);
}
else
{
}
else
{
throw
new
InvalidConfigException
(
'Invalid validation rule: a rule must specify both attribute names and validator type.'
);
throw
new
InvalidConfigException
(
'Invalid validation rule: a rule must specify both attribute names and validator type.'
);
...
...
tests/unit/data/validators/models/FakedValidationModel.php
View file @
3ff8f10d
...
@@ -29,7 +29,7 @@ class FakedValidationModel extends Model
...
@@ -29,7 +29,7 @@ class FakedValidationModel extends Model
{
{
return
[
return
[
[[
'val_attr_a'
,
'val_attr_b'
],
'required'
,
'on'
=>
'reqTest'
],
[[
'val_attr_a'
,
'val_attr_b'
],
'required'
,
'on'
=>
'reqTest'
],
[
[
'val_attr_c'
]
,
'integer'
],
[
'val_attr_c'
,
'integer'
],
];
];
}
}
...
...
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