[Security][Validator] do not validate empty values

xabbuh · xabbuh · commit 010c61a39df6 · 2017-06-30T20:22:00.000+02:00
diff --git a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
@@ -39,6 +39,10 @@ public function validate($password, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\UserPassword');
         }
 
+        if (null === $password || '' === $password) {
+            return;
+        }
+
         $user = $this->tokenStorage->getToken()->getUser();
 
         if (!$user instanceof UserInterface) {
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) {
+        if (null === $value || '' === $value) {
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ public function validate($password, Constraint $constraint)`
`39`	`39`	`throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\UserPassword');`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ if (null === $password \|\| '' === $password) {`
	`43`	`+ return;`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`$user = $this->tokenStorage->getToken()->getUser();`
`43`	`47`
`44`	`48`	`if (!$user instanceof UserInterface) {`
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) {`
	`51`	`+ if (null === $value \|\| '' === $value) {`
`52`	`52`	`return;`
`53`	`53`	`}`
`54`	`54`