1 files changed, 20 insertions, 67 deletions

diff --git a/apps/encryption/lib/Controller/SettingsController.php b/apps/encryption/lib/Controller/SettingsController.php
index fa4c3d2ae2b..8548ea51c04 100644
--- a/apps/encryption/lib/Controller/SettingsController.php
+++ b/apps/encryption/lib/Controller/SettingsController.php
@@ -1,25 +1,9 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OCA\Encryption\Controller;
 
@@ -29,6 +13,8 @@ use OCA\Encryption\Session;
 use OCA\Encryption\Util;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\UseSession;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IL10N;
 use OCP\IRequest;
@@ -38,34 +24,10 @@ use OCP\IUserSession;
 
 class SettingsController extends Controller {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var KeyManager */
-	private $keyManager;
-
-	/** @var Crypt */
-	private $crypt;
-
-	/** @var Session */
-	private $session;
-
-	/** @var ISession  */
-	private $ocSession;
-
-	/** @var  Util */
-	private $util;
-
 	/**
 	 * @param string $AppName
 	 * @param IRequest $request
-	 * @param IL10N $l10n
+	 * @param IL10N $l
 	 * @param IUserManager $userManager
 	 * @param IUserSession $userSession
 	 * @param KeyManager $keyManager
@@ -74,37 +36,29 @@ class SettingsController extends Controller {
 	 * @param ISession $ocSession
 	 * @param Util $util
 	 */
-	public function __construct($AppName,
+	public function __construct(
+		$AppName,
 		IRequest $request,
-		IL10N $l10n,
-		IUserManager $userManager,
-		IUserSession $userSession,
-		KeyManager $keyManager,
-		Crypt $crypt,
-		Session $session,
-		ISession $ocSession,
-		Util $util
+		private IL10N $l,
+		private IUserManager $userManager,
+		private IUserSession $userSession,
+		private KeyManager $keyManager,
+		private Crypt $crypt,
+		private Session $session,
+		private ISession $ocSession,
+		private Util $util,
 	) {
 		parent::__construct($AppName, $request);
-		$this->l = $l10n;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-		$this->keyManager = $keyManager;
-		$this->crypt = $crypt;
-		$this->session = $session;
-		$this->ocSession = $ocSession;
-		$this->util = $util;
 	}
 
 
 	/**
-	 * @NoAdminRequired
-	 * @UseSession
-	 *
 	 * @param string $oldPassword
 	 * @param string $newPassword
 	 * @return DataResponse
 	 */
+	#[NoAdminRequired]
+	#[UseSession]
 	public function updatePrivateKeyPassword($oldPassword, $newPassword) {
 		$result = false;
 		$uid = $this->userSession->getUser()->getUID();
@@ -153,11 +107,10 @@ class SettingsController extends Controller {
 	}
 
 	/**
-	 * @UseSession
-	 *
 	 * @param bool $encryptHomeStorage
 	 * @return DataResponse
 	 */
+	#[UseSession]
 	public function setEncryptHomeStorage($encryptHomeStorage) {
 		$this->util->setEncryptHomeStorage($encryptHomeStorage);
 		return new DataResponse();