Commit 26e0033

authored

Merge pull request #28 from dipcode-software/fix/allow-choice-field-be-empty

Validate choice field if is not empty and if is not a valid choice

2 parents 81e0717 + 6f53445 commit 26e0033Copy full SHA for 26e0033

File tree

-12

lines changed

-12

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function validate($value)`
`41`	`41`	`{`
`42`	`42`	`parent::validate($value);`
`43`	`43`
`44`		`- if (!$this->validValue($value)) {`
	`44`	`+ if (!$this->isEmpty($value) && !$this->validValue($value)) {`
`45`	`45`	`if (is_array($value)) {`
`46`	`46`	`$value_diff = array_diff($value, array_keys($this->choices));`
`47`	`47`	`$value = implode(', ', $value_diff);`

Lines changed: 0 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,16 +61,6 @@ public function testValidateChoiceUnexistent()`
`61`	`61`	`$this->field->validate("option2");`
`62`	`62`	`}`
`63`	`63`
`64`		`- /**`
`65`		`- * @expectedException PHPForm\Exceptions\ValidationError`
`66`		`- * @expectedExceptionMessage Select a valid choice. "empty string" is not one of the available choices.`
`67`		`- */`
`68`		`- public function testValidateChoiceEmpty()`
`69`		`- {`
`70`		`- $field = new ChoiceField(["choices" => array("option1" => "Option1")]);`
`71`		`- $field->validate("");`
`72`		`- }`
`73`		`-`
`74`	`64`	`public function testValidateValidValue()`
`75`	`65`	`{`
`76`	`66`	`$this->assertNull($this->field->validate("option1"));`

Comments

(0)