3 files changed, 33 insertions, 88 deletions

diff --git a/apps/encryption/lib/Controller/RecoveryController.php b/apps/encryption/lib/Controller/RecoveryController.php
index 3f39b0d929f..d75406e6319 100644
--- a/apps/encryption/lib/Controller/RecoveryController.php
+++ b/apps/encryption/lib/Controller/RecoveryController.php
@@ -10,6 +10,7 @@ namespace OCA\Encryption\Controller;
 use OCA\Encryption\Recovery;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IConfig;
 use OCP\IL10N;
@@ -17,34 +18,20 @@ use OCP\IRequest;
 
 class RecoveryController extends Controller {
 	/**
-	 * @var IConfig
-	 */
-	private $config;
-	/**
-	 * @var IL10N
-	 */
-	private $l;
-	/**
-	 * @var Recovery
-	 */
-	private $recovery;
-
-	/**
 	 * @param string $AppName
 	 * @param IRequest $request
 	 * @param IConfig $config
-	 * @param IL10N $l10n
+	 * @param IL10N $l
 	 * @param Recovery $recovery
 	 */
-	public function __construct($AppName,
+	public function __construct(
+		$AppName,
 		IRequest $request,
-		IConfig $config,
-		IL10N $l10n,
-		Recovery $recovery) {
+		private IConfig $config,
+		private IL10N $l,
+		private Recovery $recovery,
+	) {
 		parent::__construct($AppName, $request);
-		$this->config = $config;
-		$this->l = $l10n;
-		$this->recovery = $recovery;
 	}
 
 	/**
@@ -136,11 +123,10 @@ class RecoveryController extends Controller {
 	}
 
 	/**
-	 * @NoAdminRequired
-	 *
 	 * @param string $userEnableRecovery
 	 * @return DataResponse
 	 */
+	#[NoAdminRequired]
 	public function userSetRecovery($userEnableRecovery) {
 		if ($userEnableRecovery === '0' || $userEnableRecovery === '1') {
 			$result = $this->recovery->setRecoveryForUser($userEnableRecovery);
diff --git a/apps/encryption/lib/Controller/SettingsController.php b/apps/encryption/lib/Controller/SettingsController.php
index a28f2a11af2..8548ea51c04 100644
--- a/apps/encryption/lib/Controller/SettingsController.php
+++ b/apps/encryption/lib/Controller/SettingsController.php
@@ -13,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;
@@ -22,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
@@ -58,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();
@@ -137,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();
diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php
index 8f2732477a7..341ad6bc49f 100644
--- a/apps/encryption/lib/Controller/StatusController.php
+++ b/apps/encryption/lib/Controller/StatusController.php
@@ -9,6 +9,7 @@ namespace OCA\Encryption\Controller;
 
 use OCA\Encryption\Session;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\Encryption\IManager;
 use OCP\IL10N;
@@ -16,38 +17,27 @@ use OCP\IRequest;
 
 class StatusController extends Controller {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var Session */
-	private $session;
-
-	/** @var IManager */
-	private $encryptionManager;
-
 	/**
 	 * @param string $AppName
 	 * @param IRequest $request
-	 * @param IL10N $l10n
+	 * @param IL10N $l
 	 * @param Session $session
 	 * @param IManager $encryptionManager
 	 */
-	public function __construct($AppName,
+	public function __construct(
+		$AppName,
 		IRequest $request,
-		IL10N $l10n,
-		Session $session,
-		IManager $encryptionManager
+		private IL10N $l,
+		private Session $session,
+		private IManager $encryptionManager,
 	) {
 		parent::__construct($AppName, $request);
-		$this->l = $l10n;
-		$this->session = $session;
-		$this->encryptionManager = $encryptionManager;
 	}
 
 	/**
-	 * @NoAdminRequired
 	 * @return DataResponse
 	 */
+	#[NoAdminRequired]
 	public function getStatus() {
 		$status = 'error';
 		$message = 'no valid init status';