Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit 8a8255384e0a · 2021-07-02T17:14:39.000+02:00
* 4.4:
  Backport type fixes
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [Form] better form doc types to support static analysis
diff --git a/Validator/Constraints/UserPasswordValidator.php b/Validator/Constraints/UserPasswordValidator.php
@@ -45,6 +45,10 @@ public function validate($password, Constraint $constraint)
             return;
         }
 
+        if (!\is_string($password)) {
+            throw new UnexpectedTypeException($password, 'string');
+        }
+
         $user = $this->tokenStorage->getToken()->getUser();
 
         if (!$user instanceof UserInterface) {

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,10 @@ public function validate($password, Constraint $constraint)`
`45`	`45`	`return;`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ if (!\is_string($password)) {`
	`49`	`+ throw new UnexpectedTypeException($password, 'string');`
	`50`	`+ }`
	`51`	`+`
`48`	`52`	`$user = $this->tokenStorage->getToken()->getUser();`
`49`	`53`
`50`	`54`	`if (!$user instanceof UserInterface) {`