1 files changed, 24 insertions, 29 deletions

diff --git a/apps/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php
index ff136ded981..a874a47c16a 100644
--- a/apps/settings/lib/Controller/ChangePasswordController.php
+++ b/apps/settings/lib/Controller/ChangePasswordController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -11,48 +12,44 @@ namespace OCA\Settings\Controller;
 
 use OC\Group\Manager as GroupManager;
 use OC\User\Session;
+use OCA\Encryption\KeyManager;
+use OCA\Encryption\Recovery;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Attribute\BruteForceProtection;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\HintException;
-use OCP\IGroupManager;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IUserSession;
+use OCP\Server;
 
 class ChangePasswordController extends Controller {
-	private ?string $userId;
-	private IUserManager $userManager;
-	private IL10N $l;
-	private GroupManager $groupManager;
 	private Session $userSession;
-	private IAppManager $appManager;
 
-	public function __construct(string $appName,
+	public function __construct(
+		string $appName,
 		IRequest $request,
-		?string $userId,
-		IUserManager $userManager,
+		private ?string $userId,
+		private IUserManager $userManager,
 		IUserSession $userSession,
-		IGroupManager $groupManager,
-		IAppManager $appManager,
-		IL10N $l) {
+		private GroupManager $groupManager,
+		private IAppManager $appManager,
+		private IL10N $l,
+	) {
 		parent::__construct($appName, $request);
-
-		$this->userId = $userId;
-		$this->userManager = $userManager;
 		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->appManager = $appManager;
-		$this->l = $l;
 	}
 
 	/**
-	 * @NoAdminRequired
 	 * @NoSubAdminRequired
-	 * @BruteForceProtection(action=changePersonalPassword)
 	 */
+	#[NoAdminRequired]
+	#[BruteForceProtection(action: 'changePersonalPassword')]
 	public function changePersonalPassword(string $oldpassword = '', ?string $newpassword = null): JSONResponse {
 		$loginName = $this->userSession->getLoginName();
 		/** @var IUser $user */
@@ -97,10 +94,8 @@ class ChangePasswordController extends Controller {
 		]);
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @PasswordConfirmationRequired
-	 */
+	#[NoAdminRequired]
+	#[PasswordConfirmationRequired]
 	public function changeUserPassword(?string $username = null, ?string $password = null, ?string $recoveryPassword = null): JSONResponse {
 		if ($username === null) {
 			return new JSONResponse([
@@ -131,9 +126,9 @@ class ChangePasswordController extends Controller {
 
 		$currentUser = $this->userSession->getUser();
 		$targetUser = $this->userManager->get($username);
-		if ($currentUser === null || $targetUser === null ||
-			!($this->groupManager->isAdmin($this->userId) ||
-			 $this->groupManager->getSubAdmin()->isUserAccessible($currentUser, $targetUser))
+		if ($currentUser === null || $targetUser === null
+			|| !($this->groupManager->isAdmin($this->userId)
+			 || $this->groupManager->getSubAdmin()->isUserAccessible($currentUser, $targetUser))
 		) {
 			return new JSONResponse([
 				'status' => 'error',
@@ -145,8 +140,8 @@ class ChangePasswordController extends Controller {
 
 		if ($this->appManager->isEnabledForUser('encryption')) {
 			//handle the recovery case
-			$keyManager = \OCP\Server::get(\OCA\Encryption\KeyManager::class);
-			$recovery = \OCP\Server::get(\OCA\Encryption\Recovery::class);
+			$keyManager = Server::get(KeyManager::class);
+			$recovery = Server::get(Recovery::class);
 			$recoveryAdminEnabled = $recovery->isRecoveryKeyEnabled();
 
 			$validRecoveryPassword = false;