Commit 9536357

authored

Merge pull request #22 from dipcode-software/bugfix/file-field-validator

Allow non-required file fields

2 parents c247a41 + 0ff86ea commit 9536357Copy full SHA for 9536357

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,10 @@ All notable changes to this project will be documented in this file.`
`4`	`4`	`The format is based on [Keep a Changelog](http://keepachangelog.com/)`
`5`	`5`	`and this project adheres to [Semantic Versioning](http://semver.org/).`
`6`	`6`
`7`		`-## [2.0.4] - 2017年12月14日`
	`7`	`+## [2.0.4] - 2018-03-XX`
`8`	`8`	`### Fixed`
`9`	`9`	- `data` and `files` were wrongly exposed on `Form` class. Changed visibility to private and added `getData` and `getFiles` methods.
	`10`	`+ - Allow non-required file fields`
`10`	`11`
`11`	`12`	`## [2.0.3] - 2017年12月13日`
`12`	`13`	`### Added`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,11 @@ public function __construct(array $args = array())`
`31`	`31`
`32`	`32`	`public function validate($value)`
`33`	`33`	`{`
`34`		`- if (is_null($value) && !$this->required) {`
	`34`	`+ if (0 == $value->size && !$this->required) {`
`35`	`35`	`return;`
`36`	`36`	`}`
`37`		`- if (is_null($value) && $this->required \|\| 0 == $value->size && $this->required) {`
	`37`	`+`
	`38`	`+ if (0 == $value->size && $this->required) {`
`38`	`39`	`throw new ValidationError($this->error_messages['required'], 'required');`
`39`	`40`	`}`
`40`	`41`
`@@ -54,9 +55,6 @@ public function validate($value)`
`54`	`55`
`55`	`56`	`public function toNative($value)`
`56`	`57`	`{`
`57`		`- if (is_null($value)) {`
`58`		`- return null;`
`59`		`- }`
`60`	`58`	`if (!is_array($value)) {`
`61`	`59`	`throw new ValidationError(msg("INVALID_FILE"), 'invalid');`
`62`	`60`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function __construct(array $valid_filetypes, $message = null)`
`24`	`24`
`25`	`25`	`public function __invoke($value)`
`26`	`26`	`{`
`27`		`- if (!is_null($this->valid_filetypes) && !in_array($value->type, $this->valid_filetypes)) {`
	`27`	`+ if ($value->size > 0 && !is_null($this->valid_filetypes) && !in_array($value->type, $this->valid_filetypes)) {`
`28`	`28`	`$message = msg($this->message, array(`
`29`	`29`	`"valid_types" => implode(", ", $this->valid_filetypes),`
`30`	`30`	`"type" => $value->type`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,13 @@ public function testConstruct()`
`22`	`22`
`23`	`23`	`/**`
`24`	`24`	`* @expectedException PHPForm\Exceptions\ValidationError`
`25`		`- * @expectedExceptionMessage The submitted file is empty.`
	`25`	`+ * @expectedExceptionMessage This field is required.`
`26`	`26`	`*/`
`27`	`27`	`public function testValidateEmpty()`
`28`	`28`	`{`
`29`	`29`	`$data = array('size' => 0);`
`30`		`- $this->field->validate((object) $data);`
	`30`	`+ $field = new FileField(["max_size" => 20, "required" => true]);`
	`31`	`+ $field->validate((object) $data);`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`/**`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class FileTypeValidatorTest extends TestCase`
`11`	`11`
`12`	`12`	`public function setUp()`
`13`	`13`	`{`
`14`		`- $this->data = (object) array('type' => 'image/png');`
	`14`	`+ $this->data = (object) array('size' => 10, 'type' => 'image/png');`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public function testValidType()`

Comments

(0)