Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 30726e942d90 · 2023-08-05T16:39:51.000+02:00
* 6.4:
  [HttpKernel][MonologBridge][FrameworkBundle] Revisit wiring of debug loggers
  Improve 6.4 UPGRADE guide
  Add before/after examples to 6.3 UPGRADE guide
  [Security] Do not make PasswordUpgraderInterface a generic
diff --git a/Security/User/EntityUserProvider.php b/Security/User/EntityUserProvider.php
@@ -125,7 +125,7 @@ public function upgradePassword(PasswordAuthenticatedUserInterface $user, string
         }
 
         $repository = $this->getRepository();
-        if ($repository instanceof PasswordUpgraderInterface) {
+        if ($user instanceof PasswordAuthenticatedUserInterface && $repository instanceof PasswordUpgraderInterface) {
             $repository->upgradePassword($user, $newHashedPassword);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function upgradePassword(PasswordAuthenticatedUserInterface $user, string`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`$repository = $this->getRepository();`
`128`		`- if ($repository instanceof PasswordUpgraderInterface) {`
	`128`	`+ if ($user instanceof PasswordAuthenticatedUserInterface && $repository instanceof PasswordUpgraderInterface) {`
`129`	`129`	`$repository->upgradePassword($user, $newHashedPassword);`
`130`	`130`	`}`
`131`	`131`	`}`