refactor(apps): Use constructor property promotion when possible

Signed-off-by: provokateurin <kate@provokateurin.de>

48 files changed, 250 insertions, 678 deletions

diff --git a/apps/settings/lib/Activity/GroupProvider.php b/apps/settings/lib/Activity/GroupProvider.php
index abf3e5613c0..72c9ca0d719 100644
--- a/apps/settings/lib/Activity/GroupProvider.php
+++ b/apps/settings/lib/Activity/GroupProvider.php
@@ -19,31 +19,17 @@ class GroupProvider implements IProvider {
 	public const ADDED_TO_GROUP = 'group_added';
 	public const REMOVED_FROM_GROUP = 'group_removed';
 
-	/** @var L10nFactory */
-	private $l10n;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IManager */
-	private $activityManager;
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IGroupManager */
-	protected $groupManager;
-
 	/** @var string[] */
 	protected $groupDisplayNames = [];
 
 
-	public function __construct(L10nFactory $l10n,
-		IURLGenerator $urlGenerator,
-		IManager $activityManager,
-		IUserManager $userManager,
-		IGroupManager $groupManager) {
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
+	public function __construct(
+		private L10nFactory $l10n,
+		private IURLGenerator $urlGenerator,
+		private IManager $activityManager,
+		protected IUserManager $userManager,
+		protected IGroupManager $groupManager,
+	) {
 	}
 
 	public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
diff --git a/apps/settings/lib/Activity/GroupSetting.php b/apps/settings/lib/Activity/GroupSetting.php
index 30a4b6a6aeb..9433bdb25d2 100644
--- a/apps/settings/lib/Activity/GroupSetting.php
+++ b/apps/settings/lib/Activity/GroupSetting.php
@@ -10,14 +10,12 @@ use OCP\IL10N;
 
 class GroupSetting implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
-
 	/**
-	 * @param IL10N $l10n
+	 * @param IL10N $l
 	 */
-	public function __construct(IL10N $l10n) {
-		$this->l = $l10n;
+	public function __construct(
+		protected IL10N $l,
+	) {
 	}
 
 	/**
diff --git a/apps/settings/lib/Activity/Provider.php b/apps/settings/lib/Activity/Provider.php
index e1de18554d9..fb95423a4c1 100644
--- a/apps/settings/lib/Activity/Provider.php
+++ b/apps/settings/lib/Activity/Provider.php
@@ -31,29 +31,15 @@ class Provider implements IProvider {
 	public const APP_TOKEN_FILESYSTEM_GRANTED = 'app_token_filesystem_granted';
 	public const APP_TOKEN_FILESYSTEM_REVOKED = 'app_token_filesystem_revoked';
 
-	/** @var IFactory */
-	protected $languageFactory;
-
 	/** @var IL10N */
 	protected $l;
 
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IManager */
-	private $activityManager;
-
-	public function __construct(IFactory $languageFactory,
-		IURLGenerator $url,
-		IUserManager $userManager,
-		IManager $activityManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->userManager = $userManager;
-		$this->activityManager = $activityManager;
+	public function __construct(
+		protected IFactory $languageFactory,
+		protected IURLGenerator $url,
+		protected IUserManager $userManager,
+		private IManager $activityManager,
+	) {
 	}
 
 	/**
diff --git a/apps/settings/lib/Activity/SecurityFilter.php b/apps/settings/lib/Activity/SecurityFilter.php
index 61d657193fd..5ff6685f449 100644
--- a/apps/settings/lib/Activity/SecurityFilter.php
+++ b/apps/settings/lib/Activity/SecurityFilter.php
@@ -11,15 +11,10 @@ use OCP\IURLGenerator;
 
 class SecurityFilter implements IFilter {
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var IL10N */
-	private $l10n;
-
-	public function __construct(IURLGenerator $urlGenerator, IL10N $l10n) {
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
+	public function __construct(
+		private IURLGenerator $urlGenerator,
+		private IL10N $l10n,
+	) {
 	}
 
 	public function allowedApps() {
diff --git a/apps/settings/lib/Activity/SecurityProvider.php b/apps/settings/lib/Activity/SecurityProvider.php
index 8e2b4f8f45a..658e2e7b949 100644
--- a/apps/settings/lib/Activity/SecurityProvider.php
+++ b/apps/settings/lib/Activity/SecurityProvider.php
@@ -17,19 +17,11 @@ use OCP\L10N\IFactory as L10nFactory;
 
 class SecurityProvider implements IProvider {
 
-	/** @var L10nFactory */
-	private $l10n;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var IManager */
-	private $activityManager;
-
-	public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, IManager $activityManager) {
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->activityManager = $activityManager;
+	public function __construct(
+		private L10nFactory $l10n,
+		private IURLGenerator $urlGenerator,
+		private IManager $activityManager,
+	) {
 	}
 
 	public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
diff --git a/apps/settings/lib/Activity/SecuritySetting.php b/apps/settings/lib/Activity/SecuritySetting.php
index 3253640aca3..997e63a97b1 100644
--- a/apps/settings/lib/Activity/SecuritySetting.php
+++ b/apps/settings/lib/Activity/SecuritySetting.php
@@ -10,11 +10,9 @@ use OCP\IL10N;
 
 class SecuritySetting implements ISetting {
 
-	/** @var IL10N */
-	private $l10n;
-
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
+	public function __construct(
+		private IL10N $l10n,
+	) {
 	}
 
 	public function canChangeMail() {
diff --git a/apps/settings/lib/Activity/Setting.php b/apps/settings/lib/Activity/Setting.php
index ace10546f82..621dadda11d 100644
--- a/apps/settings/lib/Activity/Setting.php
+++ b/apps/settings/lib/Activity/Setting.php
@@ -10,14 +10,12 @@ use OCP\IL10N;
 
 class Setting implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
-
 	/**
-	 * @param IL10N $l10n
+	 * @param IL10N $l
 	 */
-	public function __construct(IL10N $l10n) {
-		$this->l = $l10n;
+	public function __construct(
+		protected IL10N $l,
+	) {
 	}
 
 	/**
diff --git a/apps/settings/lib/AppInfo/Application.php b/apps/settings/lib/AppInfo/Application.php
index bd06483fa63..d3d12a6c53d 100644
--- a/apps/settings/lib/AppInfo/Application.php
+++ b/apps/settings/lib/AppInfo/Application.php
@@ -80,6 +80,7 @@ use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\IAppContainer;
+use OCP\AppFramework\QueryException;
 use OCP\Defaults;
 use OCP\Group\Events\GroupDeletedEvent;
 use OCP\Group\Events\UserAddedEvent;
@@ -221,7 +222,7 @@ class Application extends App implements IBootstrap {
 	 * @throws \InvalidArgumentException
 	 * @throws \BadMethodCallException
 	 * @throws \Exception
-	 * @throws \OCP\AppFramework\QueryException
+	 * @throws QueryException
 	 */
 	public function onChangePassword(array $parameters) {
 		/** @var Hooks $hooks */
@@ -234,7 +235,7 @@ class Application extends App implements IBootstrap {
 	 * @throws \InvalidArgumentException
 	 * @throws \BadMethodCallException
 	 * @throws \Exception
-	 * @throws \OCP\AppFramework\QueryException
+	 * @throws QueryException
 	 */
 	public function onChangeInfo(array $parameters) {
 		if ($parameters['feature'] !== 'eMailAddress') {
diff --git a/apps/settings/lib/Controller/AuthSettingsController.php b/apps/settings/lib/Controller/AuthSettingsController.php
index 4b126e879d2..8652a49fb1d 100644
--- a/apps/settings/lib/Controller/AuthSettingsController.php
+++ b/apps/settings/lib/Controller/AuthSettingsController.php
@@ -35,27 +35,9 @@ class AuthSettingsController extends Controller {
 	/** @var IProvider */
 	private $tokenProvider;
 
-	/** @var ISession */
-	private $session;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var string */
-	private $uid;
-
-	/** @var ISecureRandom */
-	private $random;
-
-	/** @var IManager */
-	private $activityManager;
-
 	/** @var RemoteWipe */
 	private $remoteWipe;
 
-	/** @var LoggerInterface */
-	private $logger;
-
 	/**
 	 * @param string $appName
 	 * @param IRequest $request
@@ -68,25 +50,21 @@ class AuthSettingsController extends Controller {
 	 * @param RemoteWipe $remoteWipe
 	 * @param LoggerInterface $logger
 	 */
-	public function __construct(string $appName,
+	public function __construct(
+		string $appName,
 		IRequest $request,
 		IProvider $tokenProvider,
-		ISession $session,
-		ISecureRandom $random,
-		?string $userId,
-		IUserSession $userSession,
-		IManager $activityManager,
+		private ISession $session,
+		private ISecureRandom $random,
+		private ?string $userId,
+		private IUserSession $userSession,
+		private IManager $activityManager,
 		RemoteWipe $remoteWipe,
-		LoggerInterface $logger) {
+		private LoggerInterface $logger,
+	) {
 		parent::__construct($appName, $request);
 		$this->tokenProvider = $tokenProvider;
-		$this->uid = $userId;
-		$this->userSession = $userSession;
-		$this->session = $session;
-		$this->random = $random;
-		$this->activityManager = $activityManager;
 		$this->remoteWipe = $remoteWipe;
-		$this->logger = $logger;
 	}
 
 	/**
@@ -128,7 +106,7 @@ class AuthSettingsController extends Controller {
 		}
 
 		$token = $this->generateRandomDeviceToken();
-		$deviceToken = $this->tokenProvider->generateToken($token, $this->uid, $loginName, $password, $name, IToken::PERMANENT_TOKEN);
+		$deviceToken = $this->tokenProvider->generateToken($token, $this->userId, $loginName, $password, $name, IToken::PERMANENT_TOKEN);
 		$tokenData = $deviceToken->jsonSerialize();
 		$tokenData['canDelete'] = true;
 		$tokenData['canRename'] = true;
@@ -191,7 +169,7 @@ class AuthSettingsController extends Controller {
 			return new JSONResponse([], Http::STATUS_NOT_FOUND);
 		}
 
-		$this->tokenProvider->invalidateTokenById($this->uid, $token->getId());
+		$this->tokenProvider->invalidateTokenById($this->userId, $token->getId());
 		$this->publishActivity(Provider::APP_TOKEN_DELETED, $token->getId(), ['name' => $token->getName()]);
 		return [];
 	}
@@ -245,8 +223,8 @@ class AuthSettingsController extends Controller {
 		$event = $this->activityManager->generateEvent();
 		$event->setApp('settings')
 			->setType('security')
-			->setAffectedUser($this->uid)
-			->setAuthor($this->uid)
+			->setAffectedUser($this->userId)
+			->setAuthor($this->userId)
 			->setSubject($subject, $parameters)
 			->setObject('app_token', $id, 'App Password');
 
@@ -270,7 +248,7 @@ class AuthSettingsController extends Controller {
 		} catch (ExpiredTokenException $e) {
 			$token = $e->getToken();
 		}
-		if ($token->getUID() !== $this->uid) {
+		if ($token->getUID() !== $this->userId) {
 			/** @psalm-suppress DeprecatedClass We have to throw the OC version so both OC and OCP catches catch it */
 			throw new OcInvalidTokenException('This token does not belong to you!');
 		}
diff --git a/apps/settings/lib/Controller/AuthorizedGroupController.php b/apps/settings/lib/Controller/AuthorizedGroupController.php
index f4a018b0555..ad01b590440 100644
--- a/apps/settings/lib/Controller/AuthorizedGroupController.php
+++ b/apps/settings/lib/Controller/AuthorizedGroupController.php
@@ -15,12 +15,12 @@ use OCP\DB\Exception;
 use OCP\IRequest;
 
 class AuthorizedGroupController extends Controller {
-	/** @var AuthorizedGroupService $authorizedGroupService */
-	private $authorizedGroupService;
-
-	public function __construct(string $AppName, IRequest $request, AuthorizedGroupService $authorizedGroupService) {
+	public function __construct(
+		string $AppName,
+		IRequest $request,
+		private AuthorizedGroupService $authorizedGroupService,
+	) {
 		parent::__construct($AppName, $request);
-		$this->authorizedGroupService = $authorizedGroupService;
 	}
 
 	/**
diff --git a/apps/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php
index 13a83e17549..2154a9ab11b 100644
--- a/apps/settings/lib/Controller/ChangePasswordController.php
+++ b/apps/settings/lib/Controller/ChangePasswordController.php
@@ -20,7 +20,6 @@ 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;
@@ -29,29 +28,20 @@ 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;
 	}
 
 	/**
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
index a8db2a0e297..2a189a37ce6 100644
--- a/apps/settings/lib/Controller/CheckSetupController.php
+++ b/apps/settings/lib/Controller/CheckSetupController.php
@@ -27,34 +27,21 @@ use Psr\Log\LoggerInterface;
 
 #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
 class CheckSetupController extends Controller {
-	/** @var IConfig */
-	private $config;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IL10N */
-	private $l10n;
 	/** @var Checker */
 	private $checker;
-	/** @var LoggerInterface */
-	private $logger;
-	private ISetupCheckManager $setupCheckManager;
 
-	public function __construct($AppName,
+	public function __construct(
+		$AppName,
 		IRequest $request,
-		IConfig $config,
-		IURLGenerator $urlGenerator,
-		IL10N $l10n,
+		private IConfig $config,
+		private IURLGenerator $urlGenerator,
+		private IL10N $l10n,
 		Checker $checker,
-		LoggerInterface $logger,
-		ISetupCheckManager $setupCheckManager,
+		private LoggerInterface $logger,
+		private ISetupCheckManager $setupCheckManager,
 	) {
 		parent::__construct($AppName, $request);
-		$this->config = $config;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
 		$this->checker = $checker;
-		$this->logger = $logger;
-		$this->setupCheckManager = $setupCheckManager;
 	}
 
 	/**
diff --git a/apps/settings/lib/Controller/CommonSettingsTrait.php b/apps/settings/lib/Controller/CommonSettingsTrait.php
index 26cbadd76a1..56760c10f81 100644
--- a/apps/settings/lib/Controller/CommonSettingsTrait.php
+++ b/apps/settings/lib/Controller/CommonSettingsTrait.php
@@ -109,7 +109,7 @@ trait CommonSettingsTrait {
 	}
 
 	/**
-	 * @param list<\OCP\Settings\ISettings> $settings
+	 * @param list<ISettings> $settings
 	 * @param list<DeclarativeSettingsFormSchemaWithValues> $declarativeSettings
 	 * @return array{content: string}
 	 */
diff --git a/apps/settings/lib/Controller/HelpController.php b/apps/settings/lib/Controller/HelpController.php
index 9fdab414d30..05bff158ee6 100644
--- a/apps/settings/lib/Controller/HelpController.php
+++ b/apps/settings/lib/Controller/HelpController.php
@@ -25,43 +25,19 @@ use OCP\IURLGenerator;
 #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
 class HelpController extends Controller {
 
-	/** @var INavigationManager */
-	private $navigationManager;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var string */
-	private $userId;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IAppConfig */
-	private $appConfig;
-
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		INavigationManager $navigationManager,
-		IURLGenerator $urlGenerator,
-		?string $userId,
-		IGroupManager $groupManager,
-		IL10N $l10n,
-		IConfig $config,
-		IAppConfig $appConfig,
+		private INavigationManager $navigationManager,
+		private IURLGenerator $urlGenerator,
+		/** @var string */
+		private ?string $userId,
+		private IGroupManager $groupManager,
+		private IL10N $l10n,
+		private IConfig $config,
+		private IAppConfig $appConfig,
 	) {
 		parent::__construct($appName, $request);
-		$this->navigationManager = $navigationManager;
-		$this->urlGenerator = $urlGenerator;
-		$this->userId = $userId;
-		$this->groupManager = $groupManager;
-		$this->l10n = $l10n;
-		$this->config = $config;
-		$this->appConfig = $appConfig;
 	}
 
 	/**
diff --git a/apps/settings/lib/Controller/MailSettingsController.php b/apps/settings/lib/Controller/MailSettingsController.php
index f6b86c7970e..ca037f409b3 100644
--- a/apps/settings/lib/Controller/MailSettingsController.php
+++ b/apps/settings/lib/Controller/MailSettingsController.php
@@ -21,17 +21,6 @@ use OCP\Mail\IMailer;
 
 class MailSettingsController extends Controller {
 
-	/** @var IL10N */
-	private $l10n;
-	/** @var IConfig */
-	private $config;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IMailer */
-	private $mailer;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
 	/**
 	 * @param string $appName
 	 * @param IRequest $request
@@ -41,19 +30,16 @@ class MailSettingsController extends Controller {
 	 * @param IURLGenerator $urlGenerator,
 	 * @param IMailer $mailer
 	 */
-	public function __construct($appName,
+	public function __construct(
+		$appName,
 		IRequest $request,
-		IL10N $l10n,
-		IConfig $config,
-		IUserSession $userSession,
-		IURLGenerator $urlGenerator,
-		IMailer $mailer) {
+		private IL10N $l10n,
+		private IConfig $config,
+		private IUserSession $userSession,
+		private IURLGenerator $urlGenerator,
+		private IMailer $mailer,
+	) {
 		parent::__construct($appName, $request);
-		$this->l10n = $l10n;
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-		$this->mailer = $mailer;
 	}
 
 	/**
diff --git a/apps/settings/lib/Hooks.php b/apps/settings/lib/Hooks.php
index eb77b676914..8a68aed106e 100644
--- a/apps/settings/lib/Hooks.php
+++ b/apps/settings/lib/Hooks.php
@@ -19,43 +19,17 @@ use OCP\Mail\IMailer;
 
 class Hooks {
 
-	/** @var IActivityManager */
-	protected $activityManager;
-	/** @var IGroupManager|\OC\Group\Manager */
-	protected $groupManager;
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IUserSession */
-	protected $userSession;
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IMailer */
-	protected $mailer;
-	/** @var IConfig */
-	protected $config;
-	/** @var IFactory */
-	protected $languageFactory;
-	/** @var Defaults */
-	protected $defaults;
-
-	public function __construct(IActivityManager $activityManager,
-		IGroupManager $groupManager,
-		IUserManager $userManager,
-		IUserSession $userSession,
-		IURLGenerator $urlGenerator,
-		IMailer $mailer,
-		IConfig $config,
-		IFactory $languageFactory,
-		Defaults $defaults) {
-		$this->activityManager = $activityManager;
-		$this->groupManager = $groupManager;
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-		$this->mailer = $mailer;
-		$this->config = $config;
-		$this->languageFactory = $languageFactory;
-		$this->defaults = $defaults;
+	public function __construct(
+		protected IActivityManager $activityManager,
+		protected IGroupManager $groupManager,
+		protected IUserManager $userManager,
+		protected IUserSession $userSession,
+		protected IURLGenerator $urlGenerator,
+		protected IMailer $mailer,
+		protected IConfig $config,
+		protected IFactory $languageFactory,
+		protected Defaults $defaults,
+	) {
 	}
 
 	/**
diff --git a/apps/settings/lib/Listener/AppPasswordCreatedActivityListener.php b/apps/settings/lib/Listener/AppPasswordCreatedActivityListener.php
index 8bc045a38fb..a51eee1a799 100644
--- a/apps/settings/lib/Listener/AppPasswordCreatedActivityListener.php
+++ b/apps/settings/lib/Listener/AppPasswordCreatedActivityListener.php
@@ -21,21 +21,11 @@ use Psr\Log\LoggerInterface;
  * @template-implements IEventListener<\OC\Authentication\Events\AppPasswordCreatedEvent>
  */
 class AppPasswordCreatedActivityListener implements IEventListener {
-	/** @var IActivityManager */
-	private $activityManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	public function __construct(IActivityManager $activityManager,
-		IUserSession $userSession,
-		LoggerInterface $logger) {
-		$this->activityManager = $activityManager;
-		$this->userSession = $userSession;
-		$this->logger = $logger;
+	public function __construct(
+		private IActivityManager $activityManager,
+		private IUserSession $userSession,
+		private LoggerInterface $logger,
+	) {
 	}
 
 	public function handle(Event $event): void {
diff --git a/apps/settings/lib/Listener/GroupRemovedListener.php b/apps/settings/lib/Listener/GroupRemovedListener.php
index 8375433f15a..c1b3f888ea8 100644
--- a/apps/settings/lib/Listener/GroupRemovedListener.php
+++ b/apps/settings/lib/Listener/GroupRemovedListener.php
@@ -14,11 +14,9 @@ use OCP\Group\Events\GroupDeletedEvent;
 /** @template-implements IEventListener<GroupDeletedEvent> */
 class GroupRemovedListener implements IEventListener {
 
-	/** @var AuthorizedGroupService $authorizedGroupService */
-	private $authorizedGroupService;
-
-	public function __construct(AuthorizedGroupService $authorizedGroupService) {
-		$this->authorizedGroupService = $authorizedGroupService;
+	public function __construct(
+		private AuthorizedGroupService $authorizedGroupService,
+	) {
 	}
 
 	/**
diff --git a/apps/settings/lib/Listener/UserAddedToGroupActivityListener.php b/apps/settings/lib/Listener/UserAddedToGroupActivityListener.php
index 36feeaa1035..87cd66efdbc 100644
--- a/apps/settings/lib/Listener/UserAddedToGroupActivityListener.php
+++ b/apps/settings/lib/Listener/UserAddedToGroupActivityListener.php
@@ -20,23 +20,11 @@ use OCP\IUserSession;
 /** @template-implements IEventListener<UserAddedEvent> */
 class UserAddedToGroupActivityListener implements IEventListener {
 
-	/** @var Manager */
-	private $groupManager;
-
-	/** @var IManager */
-	private $activityManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
 	public function __construct(
-		Manager $groupManager,
-		IManager $activityManager,
-		IUserSession $userSession,
+		private Manager $groupManager,
+		private IManager $activityManager,
+		private IUserSession $userSession,
 	) {
-		$this->groupManager = $groupManager;
-		$this->activityManager = $activityManager;
-		$this->userSession = $userSession;
 	}
 
 	public function handle(Event $event): void {
diff --git a/apps/settings/lib/Listener/UserRemovedFromGroupActivityListener.php b/apps/settings/lib/Listener/UserRemovedFromGroupActivityListener.php
index 82302f748ec..803d86d555d 100644
--- a/apps/settings/lib/Listener/UserRemovedFromGroupActivityListener.php
+++ b/apps/settings/lib/Listener/UserRemovedFromGroupActivityListener.php
@@ -20,23 +20,11 @@ use OCP\IUserSession;
 /** @template-implements IEventListener<UserRemovedEvent> */
 class UserRemovedFromGroupActivityListener implements IEventListener {
 
-	/** @var Manager */
-	private $groupManager;
-
-	/** @var IManager */
-	private $activityManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
 	public function __construct(
-		Manager $groupManager,
-		IManager $activityManager,
-		IUserSession $userSession,
+		private Manager $groupManager,
+		private IManager $activityManager,
+		private IUserSession $userSession,
 	) {
-		$this->groupManager = $groupManager;
-		$this->activityManager = $activityManager;
-		$this->userSession = $userSession;
 	}
 
 	public function handle(Event $event): void {
diff --git a/apps/settings/lib/Mailer/NewUserMailHelper.php b/apps/settings/lib/Mailer/NewUserMailHelper.php
index 737da8d7b9a..bd4de2b2087 100644
--- a/apps/settings/lib/Mailer/NewUserMailHelper.php
+++ b/apps/settings/lib/Mailer/NewUserMailHelper.php
@@ -18,25 +18,6 @@ use OCP\Security\ICrypto;
 use OCP\Security\ISecureRandom;
 
 class NewUserMailHelper {
-	/** @var Defaults */
-	private $themingDefaults;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var IMailer */
-	private $mailer;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var IConfig */
-	private $config;
-	/** @var ICrypto */
-	private $crypto;
-	/** @var string */
-	private $fromAddress;
-
 	/**
 	 * @param Defaults $themingDefaults
 	 * @param IURLGenerator $urlGenerator
@@ -48,24 +29,17 @@ class NewUserMailHelper {
 	 * @param ICrypto $crypto
 	 * @param string $fromAddress
 	 */
-	public function __construct(Defaults $themingDefaults,
-		IURLGenerator $urlGenerator,
-		IFactory $l10nFactory,
-		IMailer $mailer,
-		ISecureRandom $secureRandom,
-		ITimeFactory $timeFactory,
-		IConfig $config,
-		ICrypto $crypto,
-		$fromAddress) {
-		$this->themingDefaults = $themingDefaults;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10nFactory = $l10nFactory;
-		$this->mailer = $mailer;
-		$this->secureRandom = $secureRandom;
-		$this->timeFactory = $timeFactory;
-		$this->config = $config;
-		$this->crypto = $crypto;
-		$this->fromAddress = $fromAddress;
+	public function __construct(
+		private Defaults $themingDefaults,
+		private IURLGenerator $urlGenerator,
+		private IFactory $l10nFactory,
+		private IMailer $mailer,
+		private ISecureRandom $secureRandom,
+		private ITimeFactory $timeFactory,
+		private IConfig $config,
+		private ICrypto $crypto,
+		private $fromAddress,
+	) {
 	}
 
 	/**
diff --git a/apps/settings/lib/Middleware/SubadminMiddleware.php b/apps/settings/lib/Middleware/SubadminMiddleware.php
index f985cdf278c..fe92661d24e 100644
--- a/apps/settings/lib/Middleware/SubadminMiddleware.php
+++ b/apps/settings/lib/Middleware/SubadminMiddleware.php
@@ -19,24 +19,20 @@ use OCP\IL10N;
  * To bypass use the `@NoSubAdminRequired` annotation
  */
 class SubadminMiddleware extends Middleware {
-	/** @var bool */
-	protected $isSubAdmin;
 	/** @var ControllerMethodReflector */
 	protected $reflector;
-	/** @var IL10N */
-	private $l10n;
 
 	/**
 	 * @param ControllerMethodReflector $reflector
 	 * @param bool $isSubAdmin
 	 * @param IL10N $l10n
 	 */
-	public function __construct(ControllerMethodReflector $reflector,
-		$isSubAdmin,
-		IL10N $l10n) {
+	public function __construct(
+		ControllerMethodReflector $reflector,
+		protected $isSubAdmin,
+		private IL10N $l10n,
+	) {
 		$this->reflector = $reflector;
-		$this->isSubAdmin = $isSubAdmin;
-		$this->l10n = $l10n;
 	}
 
 	/**
diff --git a/apps/settings/lib/Search/SectionSearch.php b/apps/settings/lib/Search/SectionSearch.php
index 15d98fbd1b9..08a6f9f76b0 100644
--- a/apps/settings/lib/Search/SectionSearch.php
+++ b/apps/settings/lib/Search/SectionSearch.php
@@ -21,26 +21,12 @@ use OCP\Settings\IManager;
 
 class SectionSearch implements IProvider {
 
-	/** @var IManager */
-	protected $settingsManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var IL10N */
-	protected $l;
-
-	public function __construct(IManager $settingsManager,
-		IGroupManager $groupManager,
-		IURLGenerator $urlGenerator,
-		IL10N $l) {
-		$this->settingsManager = $settingsManager;
-		$this->groupManager = $groupManager;
-		$this->urlGenerator = $urlGenerator;
-		$this->l = $l;
+	public function __construct(
+		protected IManager $settingsManager,
+		protected IGroupManager $groupManager,
+		protected IURLGenerator $urlGenerator,
+		protected IL10N $l,
+	) {
 	}
 
 	/**
diff --git a/apps/settings/lib/Sections/Admin/Additional.php b/apps/settings/lib/Sections/Admin/Additional.php
index 19ae2b43f95..0d83a98bbe5 100644
--- a/apps/settings/lib/Sections/Admin/Additional.php
+++ b/apps/settings/lib/Sections/Admin/Additional.php
@@ -14,15 +14,10 @@ use OCP\Settings\IIconSection;
 
 class Additional implements IIconSection {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IL10N $l,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	public function getIcon(): string {
diff --git a/apps/settings/lib/Sections/Admin/ArtificialIntelligence.php b/apps/settings/lib/Sections/Admin/ArtificialIntelligence.php
index adfcc08c4d4..ab43dfd2eef 100644
--- a/apps/settings/lib/Sections/Admin/ArtificialIntelligence.php
+++ b/apps/settings/lib/Sections/Admin/ArtificialIntelligence.php
@@ -14,15 +14,10 @@ use OCP\Settings\IIconSection;
 
 class ArtificialIntelligence implements IIconSection {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IL10N $l,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	public function getIcon(): string {
diff --git a/apps/settings/lib/Sections/Admin/Delegation.php b/apps/settings/lib/Sections/Admin/Delegation.php
index cc8aa3e3e84..2a455f1e549 100644
--- a/apps/settings/lib/Sections/Admin/Delegation.php
+++ b/apps/settings/lib/Sections/Admin/Delegation.php
@@ -11,18 +11,14 @@ use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
 
 class Delegation implements IIconSection {
-	/** @var IL10N */
-	private $l;
-	/** @var IURLGenerator */
-	private $url;
-
 	/**
 	 * @param IURLGenerator $url
 	 * @param IL10N $l
 	 */
-	public function __construct(IURLGenerator $url, IL10N $l) {
-		$this->url = $url;
-		$this->l = $l;
+	public function __construct(
+		private IURLGenerator $url,
+		private IL10N $l,
+	) {
 	}
 
 	/**
diff --git a/apps/settings/lib/Sections/Admin/Groupware.php b/apps/settings/lib/Sections/Admin/Groupware.php
index ed790f00fe5..57d92b9cc72 100644
--- a/apps/settings/lib/Sections/Admin/Groupware.php
+++ b/apps/settings/lib/Sections/Admin/Groupware.php
@@ -14,15 +14,10 @@ use OCP\Settings\IIconSection;
 
 class Groupware implements IIconSection {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IL10N $l,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	public function getIcon(): string {
diff --git a/apps/settings/lib/Sections/Admin/Overview.php b/apps/settings/lib/Sections/Admin/Overview.php
index 518042b4380..0145a2eca93 100644
--- a/apps/settings/lib/Sections/Admin/Overview.php
+++ b/apps/settings/lib/Sections/Admin/Overview.php
@@ -14,15 +14,10 @@ use OCP\Settings\IIconSection;
 
 class Overview implements IIconSection {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IL10N $l,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	public function getIcon(): string {
diff --git a/apps/settings/lib/Sections/Admin/Security.php b/apps/settings/lib/Sections/Admin/Security.php
index 2eb1dd73715..10027be32fb 100644
--- a/apps/settings/lib/Sections/Admin/Security.php
+++ b/apps/settings/lib/Sections/Admin/Security.php
@@ -14,15 +14,10 @@ use OCP\Settings\IIconSection;
 
 class Security implements IIconSection {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IL10N $l,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	public function getIcon(): string {
diff --git a/apps/settings/lib/Sections/Admin/Server.php b/apps/settings/lib/Sections/Admin/Server.php
index 9eb3d103b74..c6a02efa4e3 100644
--- a/apps/settings/lib/Sections/Admin/Server.php
+++ b/apps/settings/lib/Sections/Admin/Server.php
@@ -14,15 +14,10 @@ use OCP\Settings\IIconSection;
 
 class Server implements IIconSection {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IL10N $l,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	public function getIcon(): string {
diff --git a/apps/settings/lib/Sections/Admin/Sharing.php b/apps/settings/lib/Sections/Admin/Sharing.php
index c15a0ff43a3..c7598bb1157 100644
--- a/apps/settings/lib/Sections/Admin/Sharing.php
+++ b/apps/settings/lib/Sections/Admin/Sharing.php
@@ -14,15 +14,10 @@ use OCP\Settings\IIconSection;
 
 class Sharing implements IIconSection {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IL10N $l,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	public function getIcon(): string {
diff --git a/apps/settings/lib/Sections/Personal/Availability.php b/apps/settings/lib/Sections/Personal/Availability.php
index a6b8878733e..e12e41ea800 100644
--- a/apps/settings/lib/Sections/Personal/Availability.php
+++ b/apps/settings/lib/Sections/Personal/Availability.php
@@ -15,15 +15,10 @@ use OCP\Settings\IIconSection;
 
 class Availability implements IIconSection {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IL10N $l,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	public function getIcon(): string {
diff --git a/apps/settings/lib/Sections/Personal/Calendar.php b/apps/settings/lib/Sections/Personal/Calendar.php
index 32c99ad9c7b..602b7598f15 100644
--- a/apps/settings/lib/Sections/Personal/Calendar.php
+++ b/apps/settings/lib/Sections/Personal/Calendar.php
@@ -15,12 +15,10 @@ use OCP\Settings\IIconSection;
 
 class Calendar implements IIconSection {
 
-	private IL10N $l;
-	private IURLGenerator $urlGenerator;
-
-	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IL10N $l,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	public function getIcon(): string {
diff --git a/apps/settings/lib/Sections/Personal/PersonalInfo.php b/apps/settings/lib/Sections/Personal/PersonalInfo.php
index 9729e1ffa38..35c3e6d2926 100644
--- a/apps/settings/lib/Sections/Personal/PersonalInfo.php
+++ b/apps/settings/lib/Sections/Personal/PersonalInfo.php
@@ -14,15 +14,10 @@ use OCP\Settings\IIconSection;
 
 class PersonalInfo implements IIconSection {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IL10N $l,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	public function getIcon() {
diff --git a/apps/settings/lib/Sections/Personal/Security.php b/apps/settings/lib/Sections/Personal/Security.php
index 7b9423c5602..d7eb65724ec 100644
--- a/apps/settings/lib/Sections/Personal/Security.php
+++ b/apps/settings/lib/Sections/Personal/Security.php
@@ -14,15 +14,10 @@ use OCP\Settings\IIconSection;
 
 class Security implements IIconSection {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IL10N $l,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	public function getIcon() {
diff --git a/apps/settings/lib/Sections/Personal/SyncClients.php b/apps/settings/lib/Sections/Personal/SyncClients.php
index 5e55c6a3b6b..3f221956f0c 100644
--- a/apps/settings/lib/Sections/Personal/SyncClients.php
+++ b/apps/settings/lib/Sections/Personal/SyncClients.php
@@ -14,15 +14,10 @@ use OCP\Settings\IIconSection;
 
 class SyncClients implements IIconSection {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IL10N $l,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	public function getIcon() {
diff --git a/apps/settings/lib/Service/AuthorizedGroupService.php b/apps/settings/lib/Service/AuthorizedGroupService.php
index 31ffc765f32..20966446d61 100644
--- a/apps/settings/lib/Service/AuthorizedGroupService.php
+++ b/apps/settings/lib/Service/AuthorizedGroupService.php
@@ -16,11 +16,9 @@ use OCP\IGroup;
 
 class AuthorizedGroupService {
 
-	/** @var AuthorizedGroupMapper $mapper */
-	private $mapper;
-
-	public function __construct(AuthorizedGroupMapper $mapper) {
-		$this->mapper = $mapper;
+	public function __construct(
+		private AuthorizedGroupMapper $mapper,
+	) {
 	}
 
 	/**
diff --git a/apps/settings/lib/Settings/Admin/Delegation.php b/apps/settings/lib/Settings/Admin/Delegation.php
index 72798a30673..59a26d1ac04 100644
--- a/apps/settings/lib/Settings/Admin/Delegation.php
+++ b/apps/settings/lib/Settings/Admin/Delegation.php
@@ -17,24 +17,13 @@ use OCP\Settings\IManager;
 use OCP\Settings\ISettings;
 
 class Delegation implements ISettings {
-	private IManager $settingManager;
-	private IInitialState $initialStateService;
-	private IGroupManager $groupManager;
-	private AuthorizedGroupService $authorizedGroupService;
-	private IURLGenerator $urlGenerator;
-
 	public function __construct(
-		IManager $settingManager,
-		IInitialState $initialStateService,
-		IGroupManager $groupManager,
-		AuthorizedGroupService $authorizedGroupService,
-		IURLGenerator $urlGenerator,
+		private IManager $settingManager,
+		private IInitialState $initialStateService,
+		private IGroupManager $groupManager,
+		private AuthorizedGroupService $authorizedGroupService,
+		private IURLGenerator $urlGenerator,
 	) {
-		$this->settingManager = $settingManager;
-		$this->initialStateService = $initialStateService;
-		$this->groupManager = $groupManager;
-		$this->authorizedGroupService = $authorizedGroupService;
-		$this->urlGenerator = $urlGenerator;
 	}
 
 	/**
diff --git a/apps/settings/lib/Settings/Admin/Mail.php b/apps/settings/lib/Settings/Admin/Mail.php
index 3614c637f41..ca0f4ef33ad 100644
--- a/apps/settings/lib/Settings/Admin/Mail.php
+++ b/apps/settings/lib/Settings/Admin/Mail.php
@@ -13,19 +13,14 @@ use OCP\Server;
 use OCP\Settings\IDelegatedSettings;
 
 class Mail implements IDelegatedSettings {
-	/** @var IConfig */
-	private $config;
-
-	/** @var IL10N $l */
-	private $l;
-
 	/**
 	 * @param IConfig $config
 	 * @param IL10N $l
 	 */
-	public function __construct(IConfig $config, IL10N $l) {
-		$this->config = $config;
-		$this->l = $l;
+	public function __construct(
+		private IConfig $config,
+		private IL10N $l,
+	) {
 	}
 
 	/**
diff --git a/apps/settings/lib/Settings/Admin/Security.php b/apps/settings/lib/Settings/Admin/Security.php
index 8f01626789f..72485b8f8f3 100644
--- a/apps/settings/lib/Settings/Admin/Security.php
+++ b/apps/settings/lib/Settings/Admin/Security.php
@@ -14,22 +14,16 @@ use OCP\IUserManager;
 use OCP\Settings\ISettings;
 
 class Security implements ISettings {
-	private IManager $manager;
-	private IUserManager $userManager;
 	private MandatoryTwoFactor $mandatoryTwoFactor;
-	private IInitialState $initialState;
-	private IURLGenerator $urlGenerator;
 
-	public function __construct(IManager $manager,
-		IUserManager $userManager,
+	public function __construct(
+		private IManager $manager,
+		private IUserManager $userManager,
 		MandatoryTwoFactor $mandatoryTwoFactor,
-		IInitialState $initialState,
-		IURLGenerator $urlGenerator) {
-		$this->manager = $manager;
-		$this->userManager = $userManager;
+		private IInitialState $initialState,
+		private IURLGenerator $urlGenerator,
+	) {
 		$this->mandatoryTwoFactor = $mandatoryTwoFactor;
-		$this->initialState = $initialState;
-		$this->urlGenerator = $urlGenerator;
 	}
 
 	/**
diff --git a/apps/settings/lib/Settings/Personal/PersonalInfo.php b/apps/settings/lib/Settings/Personal/PersonalInfo.php
index 9aa0f9ee807..6a1f7e97e4a 100644
--- a/apps/settings/lib/Settings/Personal/PersonalInfo.php
+++ b/apps/settings/lib/Settings/Personal/PersonalInfo.php
@@ -31,58 +31,22 @@ use OCP\Settings\ISettings;
 
 class PersonalInfo implements ISettings {
 
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IAccountManager */
-	private $accountManager;
-
 	/** @var ProfileManager */
 	private $profileManager;
 
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var IFactory */
-	private $l10nFactory;
-
-	/** @var IL10N */
-	private $l;
-
-	/** @var IInitialState */
-	private $initialStateService;
-
-	/** @var IManager */
-	private $manager;
-
 	public function __construct(
-		IConfig $config,
-		IUserManager $userManager,
-		IGroupManager $groupManager,
-		IAccountManager $accountManager,
+		private IConfig $config,
+		private IUserManager $userManager,
+		private IGroupManager $groupManager,
+		private IAccountManager $accountManager,
 		ProfileManager $profileManager,
-		IAppManager $appManager,
-		IFactory $l10nFactory,
-		IL10N $l,
-		IInitialState $initialStateService,
-		IManager $manager,
+		private IAppManager $appManager,
+		private IFactory $l10nFactory,
+		private IL10N $l,
+		private IInitialState $initialStateService,
+		private IManager $manager,
 	) {
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->accountManager = $accountManager;
 		$this->profileManager = $profileManager;
-		$this->groupManager = $groupManager;
-		$this->appManager = $appManager;
-		$this->l10nFactory = $l10nFactory;
-		$this->l = $l;
-		$this->initialStateService = $initialStateService;
-		$this->manager = $manager;
 	}
 
 	public function getForm(): TemplateResponse {
diff --git a/apps/settings/lib/Settings/Personal/Security/Authtokens.php b/apps/settings/lib/Settings/Personal/Security/Authtokens.php
index 90f6e23cbb7..147a4687f66 100644
--- a/apps/settings/lib/Settings/Personal/Security/Authtokens.php
+++ b/apps/settings/lib/Settings/Personal/Security/Authtokens.php
@@ -22,31 +22,13 @@ use function array_map;
 
 class Authtokens implements ISettings {
 
-	/** @var IAuthTokenProvider */
-	private $tokenProvider;
-
-	/** @var ISession */
-	private $session;
-
-	/** @var IInitialState */
-	private $initialState;
-
-	/** @var string|null */
-	private $uid;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	public function __construct(IAuthTokenProvider $tokenProvider,
-		ISession $session,
-		IUserSession $userSession,
-		IInitialState $initialState,
-		?string $UserId) {
-		$this->tokenProvider = $tokenProvider;
-		$this->session = $session;
-		$this->initialState = $initialState;
-		$this->uid = $UserId;
-		$this->userSession = $userSession;
+	public function __construct(
+		private IAuthTokenProvider $tokenProvider,
+		private ISession $session,
+		private IUserSession $userSession,
+		private IInitialState $initialState,
+		private ?string $uid,
+	) {
 	}
 
 	public function getForm(): TemplateResponse {
diff --git a/apps/settings/lib/Settings/Personal/Security/Password.php b/apps/settings/lib/Settings/Personal/Security/Password.php
index 753dacf3bdb..82e56fe5a21 100644
--- a/apps/settings/lib/Settings/Personal/Security/Password.php
+++ b/apps/settings/lib/Settings/Personal/Security/Password.php
@@ -14,16 +14,10 @@ use OCP\Settings\ISettings;
 
 class Password implements ISettings {
 
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var string|null */
-	private $uid;
-
-	public function __construct(IUserManager $userManager,
-		?string $UserId) {
-		$this->userManager = $userManager;
-		$this->uid = $UserId;
+	public function __construct(
+		private IUserManager $userManager,
+		private ?string $uid,
+	) {
 	}
 
 	public function getForm(): TemplateResponse {
diff --git a/apps/settings/lib/Settings/Personal/Security/TwoFactor.php b/apps/settings/lib/Settings/Personal/Security/TwoFactor.php
index 63b647f7c44..486b79ae0cb 100644
--- a/apps/settings/lib/Settings/Personal/Security/TwoFactor.php
+++ b/apps/settings/lib/Settings/Personal/Security/TwoFactor.php
@@ -30,25 +30,15 @@ class TwoFactor implements ISettings {
 	/** @var MandatoryTwoFactor */
 	private $mandatoryTwoFactor;
 
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var string|null */
-	private $uid;
-
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(ProviderLoader $providerLoader,
+	public function __construct(
+		ProviderLoader $providerLoader,
 		MandatoryTwoFactor $mandatoryTwoFactor,
-		IUserSession $userSession,
-		IConfig $config,
-		?string $UserId) {
+		private IUserSession $userSession,
+		private IConfig $config,
+		private ?string $uid,
+	) {
 		$this->providerLoader = $providerLoader;
 		$this->mandatoryTwoFactor = $mandatoryTwoFactor;
-		$this->userSession = $userSession;
-		$this->uid = $UserId;
-		$this->config = $config;
 	}
 
 	public function getForm(): TemplateResponse {
diff --git a/apps/settings/lib/Settings/Personal/Security/WebAuthn.php b/apps/settings/lib/Settings/Personal/Security/WebAuthn.php
index e65004e7dd3..cfb29e4d493 100644
--- a/apps/settings/lib/Settings/Personal/Security/WebAuthn.php
+++ b/apps/settings/lib/Settings/Personal/Security/WebAuthn.php
@@ -20,22 +20,16 @@ class WebAuthn implements ISettings {
 	/** @var PublicKeyCredentialMapper */
 	private $mapper;
 
-	/** @var string */
-	private $uid;
-
-	/** @var IInitialStateService */
-	private $initialStateService;
-
 	/** @var Manager */
 	private $manager;
 
-	public function __construct(PublicKeyCredentialMapper $mapper,
-		string $UserId,
-		IInitialStateService $initialStateService,
-		Manager $manager) {
+	public function __construct(
+		PublicKeyCredentialMapper $mapper,
+		private string $uid,
+		private IInitialStateService $initialStateService,
+		Manager $manager,
+	) {
 		$this->mapper = $mapper;
-		$this->uid = $UserId;
-		$this->initialStateService = $initialStateService;
 		$this->manager = $manager;
 	}
 
diff --git a/apps/settings/lib/Settings/Personal/ServerDevNotice.php b/apps/settings/lib/Settings/Personal/ServerDevNotice.php
index 5a2901e4af9..71c83740b92 100644
--- a/apps/settings/lib/Settings/Personal/ServerDevNotice.php
+++ b/apps/settings/lib/Settings/Personal/ServerDevNotice.php
@@ -18,36 +18,14 @@ use OCP\Util;
 
 class ServerDevNotice implements ISettings {
 
-	/** @var IRegistry */
-	private $registry;
-
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IInitialState */
-	private $initialState;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IRegistry $registry,
-		IEventDispatcher $eventDispatcher,
-		IRootFolder $rootFolder,
-		IUserSession $userSession,
-		IInitialState $initialState,
-		IURLGenerator $urlGenerator) {
-		$this->registry = $registry;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->rootFolder = $rootFolder;
-		$this->userSession = $userSession;
-		$this->initialState = $initialState;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IRegistry $registry,
+		private IEventDispatcher $eventDispatcher,
+		private IRootFolder $rootFolder,
+		private IUserSession $userSession,
+		private IInitialState $initialState,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	/**
diff --git a/apps/settings/lib/UserMigration/AccountMigrator.php b/apps/settings/lib/UserMigration/AccountMigrator.php
index 4306c63560e..15ac06687b6 100644
--- a/apps/settings/lib/UserMigration/AccountMigrator.php
+++ b/apps/settings/lib/UserMigration/AccountMigrator.php
@@ -33,16 +33,10 @@ class AccountMigrator implements IMigrator, ISizeEstimationMigrator {
 
 	use TAccountsHelper;
 
-	private IAccountManager $accountManager;
-
-	private IAvatarManager $avatarManager;
-
 	private ProfileManager $profileManager;
 
 	private ProfileConfigMapper $configMapper;
 
-	private IL10N $l10n;
-
 	private const PATH_ROOT = Application::APP_ID . '/';
 
 	private const PATH_ACCOUNT_FILE = AccountMigrator::PATH_ROOT . 'account.json';
@@ -52,17 +46,14 @@ class AccountMigrator implements IMigrator, ISizeEstimationMigrator {
 	private const PATH_CONFIG_FILE = AccountMigrator::PATH_ROOT . 'config.json';
 
 	public function __construct(
-		IAccountManager $accountManager,
-		IAvatarManager $avatarManager,
+		private IAccountManager $accountManager,
+		private IAvatarManager $avatarManager,
 		ProfileManager $profileManager,
 		ProfileConfigMapper $configMapper,
-		IL10N $l10n,
+		private IL10N $l10n,
 	) {
-		$this->accountManager = $accountManager;
-		$this->avatarManager = $avatarManager;
 		$this->profileManager = $profileManager;
 		$this->configMapper = $configMapper;
-		$this->l10n = $l10n;
 	}
 
 	/**
diff --git a/apps/settings/lib/WellKnown/ChangePasswordHandler.php b/apps/settings/lib/WellKnown/ChangePasswordHandler.php
index 0057a7ff330..9609579ef0a 100644
--- a/apps/settings/lib/WellKnown/ChangePasswordHandler.php
+++ b/apps/settings/lib/WellKnown/ChangePasswordHandler.php
@@ -18,10 +18,9 @@ use OCP\IURLGenerator;
 
 class ChangePasswordHandler implements IHandler {
 
-	private IURLGenerator $urlGenerator;
-
-	public function __construct(IURLGenerator $urlGenerator) {
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	public function handle(string $service, IRequestContext $context, ?IResponse $previousResponse): ?IResponse {