Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit 890e909376e7 · 2021-07-03T11:16:21.000+02:00
* 5.3:
  Backport type fixes
  fix annot
  Backport type fixes
  Fix CS
  Avoid triggering the autoloader in Deprecation::isLegacy()
  fix markdown markup
  Backport type fixes
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [GHA] restore phpunit-bridge job
  rethrow caught exception
  [Form] better form doc types to support static analysis
diff --git a/Validator/Constraints/UserPasswordValidator.php b/Validator/Constraints/UserPasswordValidator.php
@@ -56,6 +56,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
`@@ -56,6 +56,10 @@ public function validate($password, Constraint $constraint)`
`56`	`56`	`return;`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ if (!\is_string($password)) {`
	`60`	`+ throw new UnexpectedTypeException($password, 'string');`
	`61`	`+ }`
	`62`	`+`
`59`	`63`	`$user = $this->tokenStorage->getToken()->getUser();`
`60`	`64`
`61`	`65`	`if (!$user instanceof UserInterface) {`