Skip validation when email is an empty object

acrobat · acrobat · commit 6136c94a970d · 2020-05-03T21:30:24.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,16 @@ public function testEmptyStringIsValid()
         $this->assertNoViolation();
     }
 
+    public function testObjectEmptyStringIsValid()
+    {
+        $this->validator->validate(new EmptyEmailObject(), new Email());
+
+        $this->assertNoViolation();
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
+     */
     public function testExpectsStringCompatibleType()
     {
         $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
@@ -256,3 +266,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;`