This repository has been archived by the owner on Jan 30, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/form-file-validation' into develop
File validation for forms, with PRG support Close zendframework/zendframework#2439
- Loading branch information
71 parents
e951b83
+
37c7404
+
e730f97
+
442a604
+
ce86130
+
6a17c00
+
3be35a1
+
b101693
+
38a8855
+
2503264
+
1330305
+
c63994b
+
0cebe75
+
88437dd
+
335a7e0
+
49f818c
+
94c6248
+
babc2b3
+
c5537ad
+
a278174
+
ee91e56
+
f730475
+
e954d31
+
aa83987
+
4272527
+
760e014
+
8f9644f
+
89ddc85
+
ef5a070
+
af19258
+
363ebe6
+
774ea64
+
db99c7e
+
fb3727c
+
d8ea42f
+
a5c0289
+
9730940
+
ebc1a56
+
1d8cf16
+
09b3859
+
efe96d1
+
acf177c
+
7a7f261
+
df4c86b
+
4d14dd3
+
d0b7057
+
c858228
+
8855a3f
+
956acc6
+
085a083
+
99b3987
+
59e9d17
+
edd16d1
+
17ad876
+
401ed50
+
f43d222
+
73ebfdd
+
da15c07
+
4652c73
+
6a7b288
+
93b11b3
+
d67242e
+
be0deed
+
c16475f
+
68c3d64
+
537f455
+
e79de85
+
0cbbdec
+
3e0855f
+
43752c5
+
eefc9a1
commit 3615cdf
Showing
5 changed files
with
372 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
<?php | ||
/** | ||
* Zend Framework (http://framework.zend.com/) | ||
* | ||
* @link http://github.com/zendframework/zf2 for the canonical source repository | ||
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
* @license http://framework.zend.com/license/new-bsd New BSD License | ||
* @package Zend_InputFilter | ||
*/ | ||
|
||
namespace Zend\InputFilter; | ||
|
||
use Zend\Filter\FilterChain; | ||
use Zend\Validator\ValidatorChain; | ||
use Zend\Validator\NotEmpty; | ||
|
||
/** | ||
* @category Zend | ||
* @package Zend_InputFilter | ||
*/ | ||
class FileInput extends Input | ||
{ | ||
/** | ||
* @var boolean | ||
*/ | ||
protected $isValid = false; | ||
|
||
/** | ||
* @return mixed | ||
*/ | ||
public function getValue() | ||
{ | ||
$filter = $this->getFilterChain(); | ||
$value = (is_array($this->value) && isset($this->value['tmp_name'])) | ||
? $this->value['tmp_name'] : $this->value; | ||
if ($this->isValid) { | ||
$value = $filter->filter($value); | ||
} | ||
return $value; | ||
} | ||
|
||
/** | ||
* @param mixed $context Extra "context" to provide the validator | ||
* @return boolean | ||
*/ | ||
public function isValid($context = null) | ||
{ | ||
$this->injectNotEmptyValidator(); | ||
$validator = $this->getValidatorChain(); | ||
//$value = $this->getValue(); // Do not run the filters yet for File uploads | ||
$this->isValid = $validator->isValid($this->getRawValue(), $context); | ||
return $this->isValid; | ||
} | ||
|
||
/** | ||
* @return void | ||
*/ | ||
protected function injectNotEmptyValidator() | ||
{ | ||
$this->notEmptyValidator = true; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.