Skip validation when email is an empty object

acrobat · acrobat · commit de5d68ef2a6d · 2020-05-03T21:36:20.000+02:00
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`	`+}`