Only validate choice field if is not empty and if is not a valid choice

lmss · lmss · commit 4cf5eb9307f0 · 2019-01-16T17:36:45.000Z
diff --git a/src/Fields/ChoiceField.php b/src/Fields/ChoiceField.php
@@ -41,7 +41,7 @@ public function validate($value)
     {
         parent::validate($value);
 
-        if (!$this->validValue($value)) {
+        if (!$this->isEmpty($value) && !$this->validValue($value)) {
             if (is_array($value)) {
                 $value_diff = array_diff($value, array_keys($this->choices));
                 $value = implode(', ', $value_diff);

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);`