diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
index 84bc3d11242a9..51ef8992c6c94 100644
--- a/src/Symfony/Component/Validator/Constraints/UrlValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
@@ -41,7 +41,7 @@ class UrlValidator extends ConstraintValidator
*/
public function validate($value, Constraint $constraint)
{
- if (null === $value || '' === $value) {
+ if (null === $value) {
return;
}
@@ -50,6 +50,10 @@ public function validate($value, Constraint $constraint)
}
$value = (string) $value;
+ if ('' === $value) {
+ return;
+ }
+
$pattern = sprintf(static::PATTERN, implode('|', $constraint->protocols));
if (!preg_match($pattern, $value)) {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
index 5406b354ce065..e496245c0ae67 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
@@ -35,6 +35,13 @@ public function testEmptyStringIsValid()
$this->assertNoViolation();
}
+ public function testEmptyStringFromObjectIsValid()
+ {
+ $this->validator->validate(new EmailProvider(), new Url());
+
+ $this->assertNoViolation();
+ }
+
/**
* @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
*/
@@ -171,3 +178,11 @@ public function getValidCustomUrls()
);
}
}
+
+class EmailProvider
+{
+ public function __toString()
+ {
+ return '';
+ }
+}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy