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
b3b9bd35
Commit
b3b9bd35
authored
Mar 10, 2014
by
Zhandos Nuftiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix isEmpty method for file validator.
parent
cd7e51df
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
66 additions
and
0 deletions
+66
-0
FileValidator.php
framework/validators/FileValidator.php
+2
-0
FakedValidationModel.php
tests/unit/data/validators/models/FakedValidationModel.php
+2
-0
FileValidatorTest.php
tests/unit/framework/validators/FileValidatorTest.php
+62
-0
No files found.
framework/validators/FileValidator.php
View file @
b3b9bd35
...
@@ -229,6 +229,8 @@ class FileValidator extends Validator
...
@@ -229,6 +229,8 @@ class FileValidator extends Validator
*/
*/
public
function
isEmpty
(
$value
,
$trim
=
false
)
public
function
isEmpty
(
$value
,
$trim
=
false
)
{
{
$value
=
is_array
(
$value
)
&&
!
empty
(
$value
)
?
$value
[
0
]
:
$value
;
return
!
$value
instanceof
UploadedFile
||
$value
->
error
==
UPLOAD_ERR_NO_FILE
;
return
!
$value
instanceof
UploadedFile
||
$value
->
error
==
UPLOAD_ERR_NO_FILE
;
}
}
...
...
tests/unit/data/validators/models/FakedValidationModel.php
View file @
b3b9bd35
...
@@ -30,6 +30,8 @@ class FakedValidationModel extends Model
...
@@ -30,6 +30,8 @@ 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'
],
[
'attr_images'
,
'file'
,
'maxFiles'
=>
3
,
'types'
=>
[
'png'
],
'on'
=>
'validateMultipleFiles'
],
[
'attr_image'
,
'file'
,
'types'
=>
[
'png'
],
'on'
=>
'validateFile'
]
];
];
}
}
...
...
tests/unit/framework/validators/FileValidatorTest.php
View file @
b3b9bd35
...
@@ -107,6 +107,68 @@ class FileValidatorTest extends TestCase
...
@@ -107,6 +107,68 @@ class FileValidatorTest extends TestCase
$val
->
validateAttribute
(
$m
,
'attr_files'
);
$val
->
validateAttribute
(
$m
,
'attr_files'
);
$this
->
assertTrue
(
$m
->
hasErrors
());
$this
->
assertTrue
(
$m
->
hasErrors
());
$this
->
assertTrue
(
stripos
(
current
(
$m
->
getErrors
(
'attr_files'
)),
'you can upload at most'
)
!==
false
);
$this
->
assertTrue
(
stripos
(
current
(
$m
->
getErrors
(
'attr_files'
)),
'you can upload at most'
)
!==
false
);
$m
=
FakedValidationModel
::
createWithAttributes
(
[
'attr_images'
=>
$this
->
createTestFiles
(
[
[
'name'
=>
'image.png'
,
'size'
=>
1024
,
'type'
=>
'image/png'
],
[
'name'
=>
'image.png'
,
'size'
=>
1024
,
'type'
=>
'image/png'
],
[
'name'
=>
'text.txt'
,
'size'
=>
1024
],
]
)
]
);
$m
->
setScenario
(
'validateMultipleFiles'
);
$this
->
assertFalse
(
$m
->
validate
());
$this
->
assertTrue
(
stripos
(
current
(
$m
->
getErrors
(
'attr_images'
)),
'Only files with these extensions are allowed'
)
!==
false
);
$m
=
FakedValidationModel
::
createWithAttributes
(
[
'attr_images'
=>
$this
->
createTestFiles
(
[
[
'name'
=>
'image.png'
,
'size'
=>
1024
,
'type'
=>
'image/png'
],
[
'name'
=>
'image.png'
,
'size'
=>
1024
,
'type'
=>
'image/png'
],
]
)
]
);
$m
->
setScenario
(
'validateMultipleFiles'
);
$this
->
assertTrue
(
$m
->
validate
());
$m
=
FakedValidationModel
::
createWithAttributes
(
[
'attr_image'
=>
$this
->
createTestFiles
(
[
[
'name'
=>
'text.txt'
,
'size'
=>
1024
,
],
]
)
]
);
$m
->
setScenario
(
'validateFile'
);
$this
->
assertFalse
(
$m
->
validate
());
}
}
/**
/**
...
...
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