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

Author: lmss

composer.json

@@ -23,8 +23,8 @@
     "twig/twig": ">=1.35"
   },
   "require-dev": {
-    "phpunit/phpunit": "~6.0",
     "php-coveralls/php-coveralls": "^1.0",
+    "phpunit/phpunit": "^6.5",
     "squizlabs/php_codesniffer": "*"
   },
   "autoload": {

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

tests/unit/Fields/ChoiceFieldTest.php

@@ -61,16 +61,6 @@ public function testValidateChoiceUnexistent()
         $this->field->validate("option2");
     }
 
-    /**
-     * @expectedException PHPForm\Exceptions\ValidationError
-     * @expectedExceptionMessage Select a valid choice. "empty string" is not one of the available choices.
-     */
-    public function testValidateChoiceEmpty()
-    {
-        $field = new ChoiceField(["choices" => array("option1" => "Option1")]);
-        $field->validate("");
-    }
-
     public function testValidateValidValue()
     {
         $this->assertNull($this->field->validate("option1"));