Merge branch '5.4' into 6.0

javiereguiluz · javiereguiluz · commit 766077ff0b84 · 2022-05-16T17:49:14.000+02:00
* 5.4:
  [Security] Fix typehint in custom user provider
diff --git a/security/user_providers.rst b/security/user_providers.rst
@@ -279,6 +279,7 @@ command will generate a nice skeleton to get you started::
 
     use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
     use Symfony\Component\Security\Core\Exception\UserNotFoundException;
+    use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
     use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
     use Symfony\Component\Security\Core\User\UserInterface;
     use Symfony\Component\Security\Core\User\UserProviderInterface;
@@ -333,13 +334,13 @@ command will generate a nice skeleton to get you started::
         }
 
         /**
-         * Upgrades the encoded password of a user, typically for using a better hash algorithm.
+         * Upgrades the hashed password of a user, typically for using a better hash algorithm.
          */
-        public function upgradePassword(UserInterface $user, string $newEncodedPassword): void
+        public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void
         {
-            // TODO: when encoded passwords are in use, this method should:
+            // TODO: when hashed passwords are in use, this method should:
             // 1. persist the new password in the user storage
-            // 2. update the $user object with $user->setPassword($newEncodedPassword);
+            // 2. update the $user object with $user->setPassword($newHashedPassword);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,7 @@ command will generate a nice skeleton to get you started::`
`279`	`279`
`280`	`280`	`use Symfony\Component\Security\Core\Exception\UnsupportedUserException;`
`281`	`281`	`use Symfony\Component\Security\Core\Exception\UserNotFoundException;`
	`282`	`+ use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;`
`282`	`283`	`use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;`
`283`	`284`	`use Symfony\Component\Security\Core\User\UserInterface;`
`284`	`285`	`use Symfony\Component\Security\Core\User\UserProviderInterface;`
`@@ -333,13 +334,13 @@ command will generate a nice skeleton to get you started::`
`333`	`334`	`}`
`334`	`335`
`335`	`336`	`/**`
`336`		`- * Upgrades the encoded password of a user, typically for using a better hash algorithm.`
	`337`	`+ * Upgrades the hashed password of a user, typically for using a better hash algorithm.`
`337`	`338`	`*/`
`338`		`- public function upgradePassword(UserInterface $user, string $newEncodedPassword): void`
	`339`	`+ public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void`
`339`	`340`	`{`
`340`		`- // TODO: when encoded passwords are in use, this method should:`
	`341`	`+ // TODO: when hashed passwords are in use, this method should:`
`341`	`342`	`// 1. persist the new password in the user storage`
`342`		`- // 2. update the $user object with $user->setPassword($newEncodedPassword);`
	`343`	`+ // 2. update the $user object with $user->setPassword($newHashedPassword);`
`343`	`344`	`}`
`344`	`345`	`}`
`345`	`346`