Fix URL validator failure with empty string

bocharsky-bw · bocharsky-bw · commit 396a366ae545 · 2015-09-26T11:59:31.000+03:00
diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
@@ -48,7 +48,7 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Url');
         }
 
-        if (null === $value || '' === $value) {
+        if (null === $value) {
             return;
         }
 
@@ -57,6 +57,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
`@@ -48,7 +48,7 @@ public function validate($value, Constraint $constraint)`
`48`	`48`	`throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Url');`
`49`	`49`	`}`
`50`	`50`
`51`		`- if (null === $value \|\| '' === $value) {`
	`51`	`+ if (null === $value) {`
`52`	`52`	`return;`
`53`	`53`	`}`
`54`	`54`
`@@ -57,6 +57,10 @@ public function validate($value, Constraint $constraint)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`$value = (string) $value;`
	`60`	`+ if ('' === $value) {`
	`61`	`+ return;`
	`62`	`+ }`
	`63`	`+`
`60`	`64`	`$pattern = sprintf(static::PATTERN, implode('\|', $constraint->protocols));`
`61`	`65`
`62`	`66`	`if (!preg_match($pattern, $value)) {`