From 596ba7866e9e0f3c6ed38dba0f6b3288db1362c0 Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Fri, 11 Jun 2021 16:36:11 +0200
Subject: [PATCH] [PasswordHasher] Remove PasswordHasherAwareInterface from
 UserPasswordHasherInterface API

---
 .../Component/PasswordHasher/Hasher/UserPasswordHasher.php  | 6 +++---
 .../PasswordHasher/Hasher/UserPasswordHasherInterface.php   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/PasswordHasher/Hasher/UserPasswordHasher.php b/src/Symfony/Component/PasswordHasher/Hasher/UserPasswordHasher.php
index 5d36f86db1002..f26164d7e51af 100644
--- a/src/Symfony/Component/PasswordHasher/Hasher/UserPasswordHasher.php
+++ b/src/Symfony/Component/PasswordHasher/Hasher/UserPasswordHasher.php
@@ -32,7 +32,7 @@ public function __construct(PasswordHasherFactoryInterface $hasherFactory)
     }
 
     /**
-     * @param PasswordAuthenticatedUserInterface|PasswordHasherAwareInterface $user
+     * @param PasswordAuthenticatedUserInterface $user
      */
     public function hashPassword($user, string $plainPassword): string
     {
@@ -54,7 +54,7 @@ public function hashPassword($user, string $plainPassword): string
     }
 
     /**
-     * @param PasswordAuthenticatedUserInterface|PasswordHasherAwareInterface $user
+     * @param PasswordAuthenticatedUserInterface $user
      */
     public function isPasswordValid($user, string $plainPassword): bool
     {
@@ -80,7 +80,7 @@ public function isPasswordValid($user, string $plainPassword): bool
     }
 
     /**
-     * @param PasswordAuthenticatedUserInterface|PasswordHasherAwareInterface $user
+     * @param PasswordAuthenticatedUserInterface $user
      */
     public function needsRehash($user): bool
     {
diff --git a/src/Symfony/Component/PasswordHasher/Hasher/UserPasswordHasherInterface.php b/src/Symfony/Component/PasswordHasher/Hasher/UserPasswordHasherInterface.php
index b78309df4e400..cf29220740542 100644
--- a/src/Symfony/Component/PasswordHasher/Hasher/UserPasswordHasherInterface.php
+++ b/src/Symfony/Component/PasswordHasher/Hasher/UserPasswordHasherInterface.php
@@ -18,9 +18,9 @@
  *
  * @author Ariel Ferrandini <arielferrandini@gmail.com>
  *
- * @method string hashPassword(PasswordAuthenticatedUserInterface|PasswordHasherAwareInterface $user, string $plainPassword)    Hashes the plain password for the given user.
- * @method bool   isPasswordValid(PasswordAuthenticatedUserInterface|PasswordHasherAwareInterface $user, string $plainPassword) Checks if the plaintext password matches the user's password.
- * @method bool   needsRehash(PasswordAuthenticatedUserInterface|PasswordHasherAwareInterface $user)                            Checks if an encoded password would benefit from rehashing.
+ * @method string hashPassword(PasswordAuthenticatedUserInterface $user, string $plainPassword)    Hashes the plain password for the given user.
+ * @method bool   isPasswordValid(PasswordAuthenticatedUserInterface $user, string $plainPassword) Checks if the plaintext password matches the user's password.
+ * @method bool   needsRehash(PasswordAuthenticatedUserInterface $user)                            Checks if an encoded password would benefit from rehashing.
  */
 interface UserPasswordHasherInterface
 {