Ignore empty values. Fixes #39 (#42)

Author: rimas-kudelis

README.md

@@ -87,18 +87,18 @@ you can set the `strict` option to `FALSE`.
 
 ```php
 /**
-* @ZipCode(getter="getCountry", strict=false)
-*/
+ * @ZipCode(getter="getCountry", strict=false)
+ */
 protected $zipCode;
 ```
 
-To avoid that the validation fails in case that there's an empty value in the zip code field
-you can set the `ignoreEmpty` option to `TRUE`.
+The validator will not validate empty strings and null values. To disallow them use the Symfony stock `NotNull` or `NotBlank` constraint in addition to `ZipCode`.
 
 ```php
 /**
-* @ZipCode(getter="getCountry", ignoreEmpty=true)
-*/
+ * @ZipCode(getter="getCountry")
+ * @NotBlank 
+ */
 protected $zipCode;
 ```
 

src/ZipCodeValidator/Constraints/ZipCode.php

@@ -34,11 +34,6 @@ class ZipCode extends Constraint
      */
     public $strict = true;
 
-    /**
-     * @var bool
-     */
-    public $ignoreEmpty = false;
-
     /**
      * @var bool
      */

src/ZipCodeValidator/Constraints/ZipCodeValidator.php

@@ -224,7 +224,7 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\ZipCode');
         }
 
-        if ($constraint->ignoreEmpty and empty($value)) {
+        if (null === $value || '' === $value) {
             return;
         }
 

tests/Constraints/ZipCodeValidatorTest.php

@@ -88,12 +88,12 @@ public function testUnexpectedTypeException()
     /**
      * @doesNotPerformAssertions
      */
-    public function testValidationDoesNothingOnEmptyValueIfIgnoreEmptyIsTrue()
+    public function testValidationIgnoresBlankValues()
     {
         $constraint = new ZipCode('HK');
-        $constraint->ignoreEmpty = true;
 
         $this->validator->validate('', $constraint);
+        $this->validator->validate(null, $constraint);
     }
 
     /** @test */