bug #36672 [Validator] Skip validation when email is an empty object (acrobat)

fabpot · fabpot · commit 469d82d6e2b9 · 2020-05-04T09:50:33.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Validator] Skip validation when email is an empty object | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets |  | License | MIT | Doc PR |  When the value passed to the email validator is an empty object the validator is still called and will mark the value as invalid. The object should be skipped in this case, as it is also done in the `UrlValidator` https://github.com/symfony/symfony/blob/bfdbb244fe311008437e3634cc97fefae8cc7446/src/Symfony/Component/Validator/Constraints/UrlValidator.php#L59-L62  Commits ------- de5d68e Skip validation when email is an empty object
diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -51,6 +51,9 @@ public function validate($value, Constraint $constraint)
         }
 
         $value = (string) $value;
+        if ('' === $value) {
+            return;
+        }
 
         if (null === $constraint->strict) {
             $constraint->strict = $this->isStrict;
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
@@ -40,6 +40,13 @@ public function testEmptyStringIsValid()
         $this->assertNoViolation();
     }
 
+    public function testObjectEmptyStringIsValid()
+    {
+        $this->validator->validate(new EmptyEmailObject(), new Email());
+
+        $this->assertNoViolation();
+    }
+
     public function testExpectsStringCompatibleType()
     {
         $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
@@ -256,3 +263,11 @@ public function provideCheckTypes()
         ];
     }
 }
+
+class EmptyEmailObject
+{
+    public function __toString()
+    {
+        return '';
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,9 @@ public function validate($value, Constraint $constraint)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`$value = (string) $value;`
	`54`	`+ if ('' === $value) {`
	`55`	`+ return;`
	`56`	`+ }`
`54`	`57`
`55`	`58`	`if (null === $constraint->strict) {`
`56`	`59`	`$constraint->strict = $this->isStrict;`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,13 @@ public function testEmptyStringIsValid()`
`40`	`40`	`$this->assertNoViolation();`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ public function testObjectEmptyStringIsValid()`
	`44`	`+ {`
	`45`	`+ $this->validator->validate(new EmptyEmailObject(), new Email());`
	`46`	`+`
	`47`	`+ $this->assertNoViolation();`
	`48`	`+ }`
	`49`	`+`
`43`	`50`	`public function testExpectsStringCompatibleType()`
`44`	`51`	`{`
`45`	`52`	`$this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');`
`@@ -256,3 +263,11 @@ public function provideCheckTypes()`
`256`	`263`	`];`
`257`	`264`	`}`
`258`	`265`	`}`
	`266`	`+`
	`267`	`+class EmptyEmailObject`
	`268`	`+{`
	`269`	`+ public function __toString()`
	`270`	`+ {`
	`271`	`+ return '';`
	`272`	`+ }`
	`273`	`+}`