Fix URL validator failure with empty string

bocharsky-bw · fabpot · commit e0910d9f493c · 2015-10-06T18:40:02.000+02:00
diff --git 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)) {

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class UrlValidator extends ConstraintValidator`
`41`	`41`	`*/`
`42`	`42`	`public function validate($value, Constraint $constraint)`
`43`	`43`	`{`
`44`		`- if (null === $value \|\| '' === $value) {`
	`44`	`+ if (null === $value) {`
`45`	`45`	`return;`
`46`	`46`	`}`
`47`	`47`
`@@ -50,6 +50,10 @@ public function validate($value, Constraint $constraint)`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`$value = (string) $value;`
	`53`	`+ if ('' === $value) {`
	`54`	`+ return;`
	`55`	`+ }`
	`56`	`+`
`53`	`57`	`$pattern = sprintf(static::PATTERN, implode('\|', $constraint->protocols));`
`54`	`58`
`55`	`59`	`if (!preg_match($pattern, $value)) {`