From 9dfda465706d70a1ddd9beeec62c96b4d06c36b3 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Mon, 13 Apr 2020 10:32:17 +0800 Subject: [PATCH] Clean up unused $displayPassword return value This is a follow-up to f12a3edff708a1fb73a09d154693dba49b69d921 to remove the now unused $password return variable. Change-Id: I2b12bd7c9f84e915f1bda659a95bab3d63a611d2 --- includes/user/PasswordReset.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/includes/user/PasswordReset.php b/includes/user/PasswordReset.php index faf09eefef..b5f7f6a513 100644 --- a/includes/user/PasswordReset.php +++ b/includes/user/PasswordReset.php @@ -122,10 +122,9 @@ class PasswordReset implements LoggerAwareInterface { * * @since 1.29 Fourth argument for displayPassword removed. * @param User $performingUser The user that does the password reset - * @param string $username The user whose password is reset - * @param string $email Alternative way to specify the user - * @return StatusValue Will contain the passwords as a username => password array if the - * $displayPassword flag was set + * @param string|null $username The user whose password is reset + * @param string|null $email Alternative way to specify the user + * @return StatusValue * @throws LogicException When the user is not allowed to perform the action * @throws MWException On unexpected DB errors */ @@ -238,7 +237,6 @@ class PasswordReset implements LoggerAwareInterface { return $result; } - $passwords = []; foreach ( $reqs as $req ) { $this->authManager->changeAuthenticationData( $req ); } @@ -248,7 +246,7 @@ class PasswordReset implements LoggerAwareInterface { $logContext ); - return StatusValue::newGood( $passwords ); + return StatusValue::newGood(); } /** -- 2.20.1