[Security] Do not make PasswordUpgraderInterface a generic

wouterj · wouterj · commit d473b909e8a7 · 2023-08-05T12:32:37.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php b/src/Symfony/Bridge/Doctrine/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);
         }
     }
diff --git a/src/Symfony/Component/Security/Core/User/PasswordUpgraderInterface.php b/src/Symfony/Component/Security/Core/User/PasswordUpgraderInterface.php
@@ -13,8 +13,6 @@
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
- *
- * @template TUser of PasswordAuthenticatedUserInterface
  */
 interface PasswordUpgraderInterface
 {
@@ -24,8 +22,6 @@ interface PasswordUpgraderInterface
      * This method should persist the new password in the user storage and update the $user object accordingly.
      * Because you don't want your users not being able to log in, this method should be opportunistic:
      * it's fine if it does nothing or if it fails without throwing any exception.
-     *
-     * @param TUser $user
      */
     public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void;
 }

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`	`}`