bug #23341 [DoctrineBridge][Security][Validator] do not validate empty values (xabbuh)

fabpot · fabpot · commit 77d06b5d39a9 · 2017-07-03T10:38:34.000+03:00
This PR was merged into the 2.7 branch. Discussion ---------- [DoctrineBridge][Security][Validator] do not validate empty values | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23319 | License | MIT | Doc PR | Nearly all validators operating on scalar values (except for some special constraints) do ignore empty values. If you want to forbid them, you have to use the `NotBlank` constraint instead. Commits ------- fd7ad23 do not validate empty values
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -62,6 +62,10 @@ public function validate($entity, Constraint $constraint)
             throw new ConstraintDefinitionException('At least one field has to be specified.');
         }
 
+        if (null === $entity) {
+            return;
+        }
+
         if ($constraint->em) {
             $em = $this->registry->getManager($constraint->em);
 
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
`@@ -62,6 +62,10 @@ public function validate($entity, Constraint $constraint)`
`62`	`62`	`throw new ConstraintDefinitionException('At least one field has to be specified.');`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ if (null === $entity) {`
	`66`	`+ return;`
	`67`	`+ }`
	`68`	`+`
`65`	`69`	`if ($constraint->em) {`
`66`	`70`	`$em = $this->registry->getManager($constraint->em);`
`67`	`71`
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`