Merge pull request #48790 from nextcloud/refactor/apps/constructor-property-promotion

38 files changed, 189 insertions, 384 deletions

diff --git a/apps/user_ldap/lib/BackendUtility.php b/apps/user_ldap/lib/BackendUtility.php
index 0e797abb8dc..88d7311cde0 100644
--- a/apps/user_ldap/lib/BackendUtility.php
+++ b/apps/user_ldap/lib/BackendUtility.php
@@ -8,13 +8,12 @@
 namespace OCA\User_LDAP;
 
 abstract class BackendUtility {
-	protected $access;
-
 	/**
 	 * constructor, make sure the subclasses call this one!
 	 * @param Access $access an instance of Access for LDAP interaction
 	 */
-	public function __construct(Access $access) {
-		$this->access = $access;
+	public function __construct(
+		protected Access $access,
+	) {
 	}
 }
diff --git a/apps/user_ldap/lib/Command/CheckUser.php b/apps/user_ldap/lib/Command/CheckUser.php
index d5bd0235b2c..8bb26ce3d0e 100644
--- a/apps/user_ldap/lib/Command/CheckUser.php
+++ b/apps/user_ldap/lib/Command/CheckUser.php
@@ -18,15 +18,12 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class CheckUser extends Command {
-	protected User_Proxy $backend;
-
 	public function __construct(
-		User_Proxy $uBackend,
+		protected User_Proxy $backend,
 		protected Helper $helper,
 		protected DeletedUsersIndex $dui,
 		protected UserMapping $mapping,
 	) {
-		$this->backend = $uBackend;
 		parent::__construct();
 	}
 
diff --git a/apps/user_ldap/lib/Configuration.php b/apps/user_ldap/lib/Configuration.php
index 658ade62f5d..77f8ed0575f 100644
--- a/apps/user_ldap/lib/Configuration.php
+++ b/apps/user_ldap/lib/Configuration.php
@@ -92,11 +92,6 @@ class Configuration {
 	public const LDAP_SERVER_FEATURE_UNKNOWN = 'unknown';
 	public const LDAP_SERVER_FEATURE_AVAILABLE = 'available';
 	public const LDAP_SERVER_FEATURE_UNAVAILABLE = 'unavailable';
-
-	/**
-	 * @var string
-	 */
-	protected $configPrefix;
 	/**
 	 * @var bool
 	 */
@@ -185,8 +180,10 @@ class Configuration {
 		'ldapAttributePronouns' => null,
 	];
 
-	public function __construct(string $configPrefix, bool $autoRead = true) {
-		$this->configPrefix = $configPrefix;
+	public function __construct(
+		protected string $configPrefix,
+		bool $autoRead = true,
+	) {
 		if ($autoRead) {
 			$this->readConfiguration();
 		}
diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php
index 757ba2d8e8a..f0b1fa17ee6 100644
--- a/apps/user_ldap/lib/Connection.php
+++ b/apps/user_ldap/lib/Connection.php
@@ -8,6 +8,7 @@
 namespace OCA\User_LDAP;
 
 use OC\ServerNotAvailableException;
+use OCP\ICache;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -89,8 +90,6 @@ use Psr\Log\LoggerInterface;
  */
 class Connection extends LDAPUtility {
 	private ?\LDAP\Connection $ldapConnectionRes = null;
-	private string $configPrefix;
-	private ?string $configID;
 	private bool $configured = false;
 
 	/**
@@ -109,7 +108,7 @@ class Connection extends LDAPUtility {
 	public $hasGidNumber = true;
 
 	/**
-	 * @var \OCP\ICache|null
+	 * @var ICache|null
 	 */
 	protected $cache = null;
 
@@ -139,11 +138,13 @@ class Connection extends LDAPUtility {
 	 * @param string $configPrefix a string with the prefix for the configkey column (appconfig table)
 	 * @param string|null $configID a string with the value for the appid column (appconfig table) or null for on-the-fly connections
 	 */
-	public function __construct(ILDAPWrapper $ldap, string $configPrefix = '', ?string $configID = 'user_ldap') {
+	public function __construct(
+		ILDAPWrapper $ldap,
+		private string $configPrefix = '',
+		private ?string $configID = 'user_ldap',
+	) {
 		parent::__construct($ldap);
-		$this->configPrefix = $configPrefix;
-		$this->configID = $configID;
-		$this->configuration = new Configuration($configPrefix, !is_null($configID));
+		$this->configuration = new Configuration($this->configPrefix, !is_null($this->configID));
 		$memcache = \OC::$server->getMemCacheFactory();
 		if ($memcache->isAvailable()) {
 			$this->cache = $memcache->createDistributed();
diff --git a/apps/user_ldap/lib/ConnectionFactory.php b/apps/user_ldap/lib/ConnectionFactory.php
index 1e86699c427..fbc30f6b73f 100644
--- a/apps/user_ldap/lib/ConnectionFactory.php
+++ b/apps/user_ldap/lib/ConnectionFactory.php
@@ -6,11 +6,9 @@
 namespace OCA\User_LDAP;
 
 class ConnectionFactory {
-	/** @var ILDAPWrapper */
-	private $ldap;
-
-	public function __construct(ILDAPWrapper $ldap) {
-		$this->ldap = $ldap;
+	public function __construct(
+		private ILDAPWrapper $ldap,
+	) {
 	}
 
 	public function get($prefix) {
diff --git a/apps/user_ldap/lib/Controller/RenewPasswordController.php b/apps/user_ldap/lib/Controller/RenewPasswordController.php
index 2b76858d127..275e2671bf7 100644
--- a/apps/user_ldap/lib/Controller/RenewPasswordController.php
+++ b/apps/user_ldap/lib/Controller/RenewPasswordController.php
@@ -23,17 +23,6 @@ use OCP\IUserManager;
 
 #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
 class RenewPasswordController extends Controller {
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var ISession */
-	private $session;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
 	/**
 	 * @param string $appName
 	 * @param IRequest $request
@@ -41,14 +30,16 @@ class RenewPasswordController extends Controller {
 	 * @param IConfig $config
 	 * @param IURLGenerator $urlGenerator
 	 */
-	public function __construct($appName, IRequest $request, IUserManager $userManager,
-		IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
+	public function __construct(
+		$appName,
+		IRequest $request,
+		private IUserManager $userManager,
+		private IConfig $config,
+		protected IL10N $l10n,
+		private ISession $session,
+		private IURLGenerator $urlGenerator,
+	) {
 		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-		$this->config = $config;
-		$this->l10n = $l10n;
-		$this->session = $session;
-		$this->urlGenerator = $urlGenerator;
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/Events/GroupBackendRegistered.php b/apps/user_ldap/lib/Events/GroupBackendRegistered.php
index 273b668946b..a94c239c1b3 100644
--- a/apps/user_ldap/lib/Events/GroupBackendRegistered.php
+++ b/apps/user_ldap/lib/Events/GroupBackendRegistered.php
@@ -19,14 +19,10 @@ use OCP\EventDispatcher\Event;
  */
 class GroupBackendRegistered extends Event {
 
-	/** @var GroupPluginManager */
-	private $pluginManager;
-	/** @var IGroupLDAP */
-	private $backend;
-
-	public function __construct(IGroupLDAP $backend, GroupPluginManager $pluginManager) {
-		$this->pluginManager = $pluginManager;
-		$this->backend = $backend;
+	public function __construct(
+		private IGroupLDAP $backend,
+		private GroupPluginManager $pluginManager,
+	) {
 	}
 
 	public function getBackend(): IGroupLDAP {
diff --git a/apps/user_ldap/lib/Events/UserBackendRegistered.php b/apps/user_ldap/lib/Events/UserBackendRegistered.php
index ba824d80d22..a26e23f8f83 100644
--- a/apps/user_ldap/lib/Events/UserBackendRegistered.php
+++ b/apps/user_ldap/lib/Events/UserBackendRegistered.php
@@ -19,14 +19,10 @@ use OCP\EventDispatcher\Event;
  */
 class UserBackendRegistered extends Event {
 
-	/** @var IUserLDAP */
-	private $backend;
-	/** @var UserPluginManager */
-	private $pluginManager;
-
-	public function __construct(IUserLDAP $backend, UserPluginManager $pluginManager) {
-		$this->backend = $backend;
-		$this->pluginManager = $pluginManager;
+	public function __construct(
+		private IUserLDAP $backend,
+		private UserPluginManager $pluginManager,
+	) {
 	}
 
 	public function getBackend(): IUserLDAP {
diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php
index 5fe5abf4c13..2c99fadfcc9 100644
--- a/apps/user_ldap/lib/Group_LDAP.php
+++ b/apps/user_ldap/lib/Group_LDAP.php
@@ -31,24 +31,19 @@ class Group_LDAP extends ABackend implements GroupInterface, IGroupLDAP, IGetDis
 	protected CappedMemoryCache $cachedGroupsByMember;
 	/** @var CappedMemoryCache<string[]> $cachedNestedGroups array of groups with gid (DN) as key */
 	protected CappedMemoryCache $cachedNestedGroups;
-	protected GroupPluginManager $groupPluginManager;
 	protected LoggerInterface $logger;
-	protected Access $access;
 
 	/**
 	 * @var string $ldapGroupMemberAssocAttr contains the LDAP setting (in lower case) with the same name
 	 */
 	protected string $ldapGroupMemberAssocAttr;
-	private IConfig $config;
-	private IUserManager $ncUserManager;
 
 	public function __construct(
-		Access $access,
-		GroupPluginManager $groupPluginManager,
-		IConfig $config,
-		IUserManager $ncUserManager,
+		protected Access $access,
+		protected GroupPluginManager $groupPluginManager,
+		private IConfig $config,
+		private IUserManager $ncUserManager,
 	) {
-		$this->access = $access;
 		$filter = $this->access->connection->ldapGroupFilter;
 		$gAssoc = $this->access->connection->ldapGroupMemberAssocAttr;
 		if (!empty($filter) && !empty($gAssoc)) {
@@ -58,11 +53,8 @@ class Group_LDAP extends ABackend implements GroupInterface, IGroupLDAP, IGetDis
 		$this->cachedGroupMembers = new CappedMemoryCache();
 		$this->cachedGroupsByMember = new CappedMemoryCache();
 		$this->cachedNestedGroups = new CappedMemoryCache();
-		$this->groupPluginManager = $groupPluginManager;
 		$this->logger = Server::get(LoggerInterface::class);
 		$this->ldapGroupMemberAssocAttr = strtolower((string)$gAssoc);
-		$this->config = $config;
-		$this->ncUserManager = $ncUserManager;
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/Group_Proxy.php b/apps/user_ldap/lib/Group_Proxy.php
index 931ad7d181a..11b7498fbed 100644
--- a/apps/user_ldap/lib/Group_Proxy.php
+++ b/apps/user_ldap/lib/Group_Proxy.php
@@ -21,25 +21,17 @@ use OCP\IUserManager;
 class Group_Proxy extends Proxy implements GroupInterface, IGroupLDAP, IGetDisplayNameBackend, INamedBackend, IDeleteGroupBackend, IBatchMethodsBackend, IIsAdminBackend {
 	private $backends = [];
 	private ?Group_LDAP $refBackend = null;
-	private Helper $helper;
-	private GroupPluginManager $groupPluginManager;
 	private bool $isSetUp = false;
-	private IConfig $config;
-	private IUserManager $ncUserManager;
 
 	public function __construct(
-		Helper $helper,
+		private Helper $helper,
 		ILDAPWrapper $ldap,
 		AccessFactory $accessFactory,
-		GroupPluginManager $groupPluginManager,
-		IConfig $config,
-		IUserManager $ncUserManager,
+		private GroupPluginManager $groupPluginManager,
+		private IConfig $config,
+		private IUserManager $ncUserManager,
 	) {
 		parent::__construct($ldap, $accessFactory);
-		$this->helper = $helper;
-		$this->groupPluginManager = $groupPluginManager;
-		$this->config = $config;
-		$this->ncUserManager = $ncUserManager;
 	}
 
 	protected function setup(): void {
diff --git a/apps/user_ldap/lib/Helper.php b/apps/user_ldap/lib/Helper.php
index 9bca3eec26b..09be9e081e5 100644
--- a/apps/user_ldap/lib/Helper.php
+++ b/apps/user_ldap/lib/Helper.php
@@ -13,15 +13,13 @@ use OCP\IConfig;
 use OCP\IDBConnection;
 
 class Helper {
-	private IConfig $config;
-	private IDBConnection $connection;
 	/** @var CappedMemoryCache<string> */
 	protected CappedMemoryCache $sanitizeDnCache;
 
-	public function __construct(IConfig $config,
-		IDBConnection $connection) {
-		$this->config = $config;
-		$this->connection = $connection;
+	public function __construct(
+		private IConfig $config,
+		private IDBConnection $connection,
+	) {
 		$this->sanitizeDnCache = new CappedMemoryCache(10000);
 	}
 
diff --git a/apps/user_ldap/lib/Jobs/CleanUp.php b/apps/user_ldap/lib/Jobs/CleanUp.php
index 12dcc1673d6..6e624419424 100644
--- a/apps/user_ldap/lib/Jobs/CleanUp.php
+++ b/apps/user_ldap/lib/Jobs/CleanUp.php
@@ -10,10 +10,11 @@ namespace OCA\User_LDAP\Jobs;
 use OCA\User_LDAP\Helper;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\User\DeletedUsersIndex;
-use OCA\User_LDAP\User_LDAP;
 use OCA\User_LDAP\User_Proxy;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\TimedJob;
+use OCP\IConfig;
+use OCP\IDBConnection;
 use OCP\Server;
 
 /**
@@ -30,13 +31,10 @@ class CleanUp extends TimedJob {
 	/** @var int $defaultIntervalMin default interval in minutes */
 	protected $defaultIntervalMin = 60;
 
-	/** @var User_LDAP|User_Proxy $userBackend */
-	protected $userBackend;
-
-	/** @var \OCP\IConfig $ocConfig */
+	/** @var IConfig $ocConfig */
 	protected $ocConfig;
 
-	/** @var \OCP\IDBConnection $db */
+	/** @var IDBConnection $db */
 	protected $db;
 
 	/** @var Helper $ldapHelper */
@@ -45,20 +43,15 @@ class CleanUp extends TimedJob {
 	/** @var UserMapping */
 	protected $mapping;
 
-	/** @var DeletedUsersIndex */
-	protected $dui;
-
 	public function __construct(
 		ITimeFactory $timeFactory,
-		User_Proxy $userBackend,
-		DeletedUsersIndex $dui,
+		protected User_Proxy $userBackend,
+		protected DeletedUsersIndex $dui,
 	) {
 		parent::__construct($timeFactory);
 		$minutes = \OC::$server->getConfig()->getSystemValue(
 			'ldapUserCleanupInterval', (string)$this->defaultIntervalMin);
 		$this->setInterval((int)$minutes * 60);
-		$this->userBackend = $userBackend;
-		$this->dui = $dui;
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/LDAP.php b/apps/user_ldap/lib/LDAP.php
index 5e801dec720..44d8493b925 100644
--- a/apps/user_ldap/lib/LDAP.php
+++ b/apps/user_ldap/lib/LDAP.php
@@ -16,15 +16,14 @@ use OCP\Server;
 use Psr\Log\LoggerInterface;
 
 class LDAP implements ILDAPWrapper {
-	protected string $logFile = '';
 	protected array $curArgs = [];
 	protected LoggerInterface $logger;
 
 	private ?LdapDataCollector $dataCollector = null;
 
-	public function __construct(string $logFile = '') {
-		$this->logFile = $logFile;
-
+	public function __construct(
+		protected string $logFile = '',
+	) {
 		/** @var IProfiler $profiler */
 		$profiler = \OC::$server->get(IProfiler::class);
 		if ($profiler->isEnabled()) {
diff --git a/apps/user_ldap/lib/LDAPProvider.php b/apps/user_ldap/lib/LDAPProvider.php
index e7c507a265f..d9750ae3fcf 100644
--- a/apps/user_ldap/lib/LDAPProvider.php
+++ b/apps/user_ldap/lib/LDAPProvider.php
@@ -20,20 +20,20 @@ class LDAPProvider implements ILDAPProvider, IDeletionFlagSupport {
 	private $userBackend;
 	private $groupBackend;
 	private $logger;
-	private $helper;
-	private $deletedUsersIndex;
 
 	/**
 	 * Create new LDAPProvider
-	 * @param \OCP\IServerContainer $serverContainer
+	 * @param IServerContainer $serverContainer
 	 * @param Helper $helper
 	 * @param DeletedUsersIndex $deletedUsersIndex
 	 * @throws \Exception if user_ldap app was not enabled
 	 */
-	public function __construct(IServerContainer $serverContainer, Helper $helper, DeletedUsersIndex $deletedUsersIndex) {
+	public function __construct(
+		IServerContainer $serverContainer,
+		private Helper $helper,
+		private DeletedUsersIndex $deletedUsersIndex,
+	) {
 		$this->logger = $serverContainer->get(LoggerInterface::class);
-		$this->helper = $helper;
-		$this->deletedUsersIndex = $deletedUsersIndex;
 		$userBackendFound = false;
 		$groupBackendFound = false;
 		foreach ($serverContainer->getUserManager()->getBackends() as $backend) {
@@ -118,8 +118,8 @@ class LDAPProvider implements ILDAPProvider, IDeletionFlagSupport {
 
 	/**
 	 * Sanitize a DN received from the LDAP server.
-	 * @param array $dn the DN in question
-	 * @return array the sanitized DN
+	 * @param array|string $dn the DN in question
+	 * @return array|string the sanitized DN
 	 */
 	public function sanitizeDN($dn) {
 		return $this->helper->sanitizeDN($dn);
diff --git a/apps/user_ldap/lib/LDAPProviderFactory.php b/apps/user_ldap/lib/LDAPProviderFactory.php
index cf76233c412..8fad9d52206 100644
--- a/apps/user_ldap/lib/LDAPProviderFactory.php
+++ b/apps/user_ldap/lib/LDAPProviderFactory.php
@@ -12,11 +12,10 @@ use OCP\LDAP\ILDAPProvider;
 use OCP\LDAP\ILDAPProviderFactory;
 
 class LDAPProviderFactory implements ILDAPProviderFactory {
-	/** * @var IServerContainer */
-	private $serverContainer;
-
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
+	public function __construct(
+		/** * @var IServerContainer */
+		private IServerContainer $serverContainer,
+	) {
 	}
 
 	public function getLDAPProvider(): ILDAPProvider {
diff --git a/apps/user_ldap/lib/LDAPUtility.php b/apps/user_ldap/lib/LDAPUtility.php
index bca6ec37ecf..39b517528e2 100644
--- a/apps/user_ldap/lib/LDAPUtility.php
+++ b/apps/user_ldap/lib/LDAPUtility.php
@@ -8,13 +8,12 @@
 namespace OCA\User_LDAP;
 
 abstract class LDAPUtility {
-	protected ILDAPWrapper $ldap;
-
 	/**
 	 * constructor, make sure the subclasses call this one!
-	 * @param ILDAPWrapper $ldapWrapper an instance of an ILDAPWrapper
+	 * @param ILDAPWrapper $ldap an instance of an ILDAPWrapper
 	 */
-	public function __construct(ILDAPWrapper $ldapWrapper) {
-		$this->ldap = $ldapWrapper;
+	public function __construct(
+		protected ILDAPWrapper $ldap,
+	) {
 	}
 }
diff --git a/apps/user_ldap/lib/Mapping/AbstractMapping.php b/apps/user_ldap/lib/Mapping/AbstractMapping.php
index 673789f946b..fa10312a915 100644
--- a/apps/user_ldap/lib/Mapping/AbstractMapping.php
+++ b/apps/user_ldap/lib/Mapping/AbstractMapping.php
@@ -21,11 +21,6 @@ use Psr\Log\LoggerInterface;
  */
 abstract class AbstractMapping {
 	/**
-	 * @var \OCP\IDBConnection $dbc
-	 */
-	protected $dbc;
-
-	/**
 	 * returns the DB table name which holds the mappings
 	 *
 	 * @return string
@@ -33,10 +28,11 @@ abstract class AbstractMapping {
 	abstract protected function getTableName(bool $includePrefix = true);
 
 	/**
-	 * @param \OCP\IDBConnection $dbc
+	 * @param IDBConnection $dbc
 	 */
-	public function __construct(IDBConnection $dbc) {
-		$this->dbc = $dbc;
+	public function __construct(
+		protected IDBConnection $dbc,
+	) {
 	}
 
 	/** @var array caches Names (value) by DN (key) */
diff --git a/apps/user_ldap/lib/Mapping/UserMapping.php b/apps/user_ldap/lib/Mapping/UserMapping.php
index 0eeaaef12fd..a030cd0ab52 100644
--- a/apps/user_ldap/lib/Mapping/UserMapping.php
+++ b/apps/user_ldap/lib/Mapping/UserMapping.php
@@ -20,11 +20,12 @@ use OCP\Support\Subscription\IAssertion;
  */
 class UserMapping extends AbstractMapping {
 
-	private IAssertion $assertion;
 	protected const PROV_API_REGEX = '/\/ocs\/v[1-9].php\/cloud\/(groups|users)/';
 
-	public function __construct(IDBConnection $dbc, IAssertion $assertion) {
-		$this->assertion = $assertion;
+	public function __construct(
+		IDBConnection $dbc,
+		private IAssertion $assertion,
+	) {
 		parent::__construct($dbc);
 	}
 
diff --git a/apps/user_ldap/lib/Migration/GroupMappingMigration.php b/apps/user_ldap/lib/Migration/GroupMappingMigration.php
index 437bb202bba..7dfb8705770 100644
--- a/apps/user_ldap/lib/Migration/GroupMappingMigration.php
+++ b/apps/user_ldap/lib/Migration/GroupMappingMigration.php
@@ -14,11 +14,9 @@ use OCP\Migration\SimpleMigrationStep;
 
 abstract class GroupMappingMigration extends SimpleMigrationStep {
 
-	/** @var IDBConnection */
-	private $dbc;
-
-	public function __construct(IDBConnection $dbc) {
-		$this->dbc = $dbc;
+	public function __construct(
+		private IDBConnection $dbc,
+	) {
 	}
 
 	protected function copyGroupMappingData(string $sourceTable, string $destinationTable): void {
diff --git a/apps/user_ldap/lib/Migration/SetDefaultProvider.php b/apps/user_ldap/lib/Migration/SetDefaultProvider.php
index b4d6b5650fb..0bb04438a1d 100644
--- a/apps/user_ldap/lib/Migration/SetDefaultProvider.php
+++ b/apps/user_ldap/lib/Migration/SetDefaultProvider.php
@@ -16,16 +16,10 @@ use OCP\Migration\IRepairStep;
 
 class SetDefaultProvider implements IRepairStep {
 
-	/** @var IConfig */
-	private $config;
-
-	/** @var Helper */
-	private $helper;
-
-	public function __construct(IConfig $config,
-		Helper $helper) {
-		$this->config = $config;
-		$this->helper = $helper;
+	public function __construct(
+		private IConfig $config,
+		private Helper $helper,
+	) {
 	}
 
 	public function getName(): string {
diff --git a/apps/user_ldap/lib/Migration/UUIDFixInsert.php b/apps/user_ldap/lib/Migration/UUIDFixInsert.php
index 52c52190654..de777f6f010 100644
--- a/apps/user_ldap/lib/Migration/UUIDFixInsert.php
+++ b/apps/user_ldap/lib/Migration/UUIDFixInsert.php
@@ -14,23 +14,12 @@ use OCP\Migration\IRepairStep;
 
 class UUIDFixInsert implements IRepairStep {
 
-	/** @var IConfig */
-	protected $config;
-
-	/** @var UserMapping */
-	protected $userMapper;
-
-	/** @var GroupMapping */
-	protected $groupMapper;
-
-	/** @var IJobList */
-	protected $jobList;
-
-	public function __construct(IConfig $config, UserMapping $userMapper, GroupMapping $groupMapper, IJobList $jobList) {
-		$this->config = $config;
-		$this->userMapper = $userMapper;
-		$this->groupMapper = $groupMapper;
-		$this->jobList = $jobList;
+	public function __construct(
+		protected IConfig $config,
+		protected UserMapping $userMapper,
+		protected GroupMapping $groupMapper,
+		protected IJobList $jobList,
+	) {
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/Migration/UnsetDefaultProvider.php b/apps/user_ldap/lib/Migration/UnsetDefaultProvider.php
index 2b368f5d2c9..025415cf712 100644
--- a/apps/user_ldap/lib/Migration/UnsetDefaultProvider.php
+++ b/apps/user_ldap/lib/Migration/UnsetDefaultProvider.php
@@ -15,11 +15,9 @@ use OCP\Migration\IRepairStep;
 
 class UnsetDefaultProvider implements IRepairStep {
 
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(IConfig $config) {
-		$this->config = $config;
+	public function __construct(
+		private IConfig $config,
+	) {
 	}
 
 	public function getName(): string {
diff --git a/apps/user_ldap/lib/Migration/Version1120Date20210917155206.php b/apps/user_ldap/lib/Migration/Version1120Date20210917155206.php
index 9b6ebbfc5de..dc3823bf771 100644
--- a/apps/user_ldap/lib/Migration/Version1120Date20210917155206.php
+++ b/apps/user_ldap/lib/Migration/Version1120Date20210917155206.php
@@ -22,17 +22,11 @@ use Psr\Log\LoggerInterface;
 
 class Version1120Date20210917155206 extends SimpleMigrationStep {
 
-	/** @var IDBConnection */
-	private $dbc;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var LoggerInterface */
-	private $logger;
-
-	public function __construct(IDBConnection $dbc, IUserManager $userManager, LoggerInterface $logger) {
-		$this->dbc = $dbc;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
+	public function __construct(
+		private IDBConnection $dbc,
+		private IUserManager $userManager,
+		private LoggerInterface $logger,
+	) {
 	}
 
 	public function getName() {
diff --git a/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php b/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php
index ff8b113d3e9..2457acd840d 100644
--- a/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php
+++ b/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php
@@ -22,16 +22,13 @@ use Psr\Log\LoggerInterface;
 
 class Version1130Date20211102154716 extends SimpleMigrationStep {
 
-	/** @var IDBConnection */
-	private $dbc;
-	/** @var LoggerInterface */
-	private $logger;
 	/** @var string[] */
 	private $hashColumnAddedToTables = [];
 
-	public function __construct(IDBConnection $dbc, LoggerInterface $logger) {
-		$this->dbc = $dbc;
-		$this->logger = $logger;
+	public function __construct(
+		private IDBConnection $dbc,
+		private LoggerInterface $logger,
+	) {
 	}
 
 	public function getName() {
diff --git a/apps/user_ldap/lib/Migration/Version1141Date20220323143801.php b/apps/user_ldap/lib/Migration/Version1141Date20220323143801.php
index 86f10a26c3e..ecedbf1de20 100644
--- a/apps/user_ldap/lib/Migration/Version1141Date20220323143801.php
+++ b/apps/user_ldap/lib/Migration/Version1141Date20220323143801.php
@@ -18,10 +18,9 @@ use OCP\Migration\SimpleMigrationStep;
 
 class Version1141Date20220323143801 extends SimpleMigrationStep {
 
-	private IDBConnection $dbc;
-
-	public function __construct(IDBConnection $dbc) {
-		$this->dbc = $dbc;
+	public function __construct(
+		private IDBConnection $dbc,
+	) {
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/Notification/Notifier.php b/apps/user_ldap/lib/Notification/Notifier.php
index 8858bc33f80..8d8bc8be5a3 100644
--- a/apps/user_ldap/lib/Notification/Notifier.php
+++ b/apps/user_ldap/lib/Notification/Notifier.php
@@ -12,14 +12,12 @@ use OCP\Notification\UnknownNotificationException;
 
 class Notifier implements INotifier {
 
-	/** @var IFactory */
-	protected $l10nFactory;
-
 	/**
 	 * @param IFactory $l10nFactory
 	 */
-	public function __construct(IFactory $l10nFactory) {
-		$this->l10nFactory = $l10nFactory;
+	public function __construct(
+		protected IFactory $l10nFactory,
+	) {
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/Proxy.php b/apps/user_ldap/lib/Proxy.php
index 88a55f6462d..ab8b9f451f0 100644
--- a/apps/user_ldap/lib/Proxy.php
+++ b/apps/user_ldap/lib/Proxy.php
@@ -15,17 +15,13 @@ use OCP\Server;
 abstract class Proxy {
 	/** @var array<string,Access> */
 	private static array $accesses = [];
-	private ILDAPWrapper $ldap;
 	private ?bool $isSingleBackend = null;
 	private ?ICache $cache = null;
-	private AccessFactory $accessFactory;
 
 	public function __construct(
-		ILDAPWrapper $ldap,
-		AccessFactory $accessFactory,
+		private ILDAPWrapper $ldap,
+		private AccessFactory $accessFactory,
 	) {
-		$this->ldap = $ldap;
-		$this->accessFactory = $accessFactory;
 		$memcache = \OC::$server->getMemCacheFactory();
 		if ($memcache->isAvailable()) {
 			$this->cache = $memcache->createDistributed();
diff --git a/apps/user_ldap/lib/Settings/Admin.php b/apps/user_ldap/lib/Settings/Admin.php
index 8fc0915c6fe..80d1e6437f7 100644
--- a/apps/user_ldap/lib/Settings/Admin.php
+++ b/apps/user_ldap/lib/Settings/Admin.php
@@ -13,14 +13,12 @@ use OCP\Settings\IDelegatedSettings;
 use OCP\Template;
 
 class Admin implements IDelegatedSettings {
-	/** @var IL10N */
-	private $l;
-
 	/**
 	 * @param IL10N $l
 	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
+	public function __construct(
+		private IL10N $l,
+	) {
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/Settings/Section.php b/apps/user_ldap/lib/Settings/Section.php
index e26d85d8771..6e342279f46 100644
--- a/apps/user_ldap/lib/Settings/Section.php
+++ b/apps/user_ldap/lib/Settings/Section.php
@@ -10,18 +10,14 @@ use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
 
 class Section 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/user_ldap/lib/User/DeletedUsersIndex.php b/apps/user_ldap/lib/User/DeletedUsersIndex.php
index 515233b3825..9ce78f15d8b 100644
--- a/apps/user_ldap/lib/User/DeletedUsersIndex.php
+++ b/apps/user_ldap/lib/User/DeletedUsersIndex.php
@@ -7,6 +7,7 @@ namespace OCA\User_LDAP\User;
 
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCP\IConfig;
+use OCP\PreConditionNotMetException;
 use OCP\Share\IManager;
 
 /**
@@ -14,19 +15,13 @@ use OCP\Share\IManager;
  * @package OCA\User_LDAP
  */
 class DeletedUsersIndex {
-	protected IConfig $config;
-	protected UserMapping $mapping;
 	protected ?array $deletedUsers = null;
-	private IManager $shareManager;
 
 	public function __construct(
-		IConfig $config,
-		UserMapping $mapping,
-		IManager $shareManager,
+		protected IConfig $config,
+		protected UserMapping $mapping,
+		private IManager $shareManager,
 	) {
-		$this->config = $config;
-		$this->mapping = $mapping;
-		$this->shareManager = $shareManager;
 	}
 
 	/**
@@ -74,7 +69,7 @@ class DeletedUsersIndex {
 	/**
 	 * marks a user as deleted
 	 *
-	 * @throws \OCP\PreConditionNotMetException
+	 * @throws PreConditionNotMetException
 	 */
 	public function markUser(string $ocName): void {
 		if ($this->isUserMarked($ocName)) {
diff --git a/apps/user_ldap/lib/User/Manager.php b/apps/user_ldap/lib/User/Manager.php
index 7b03483200d..2b09d425721 100644
--- a/apps/user_ldap/lib/User/Manager.php
+++ b/apps/user_ldap/lib/User/Manager.php
@@ -27,40 +27,24 @@ use Psr\Log\LoggerInterface;
  */
 class Manager {
 	protected ?Access $access = null;
-	protected IConfig $ocConfig;
 	protected IDBConnection $db;
-	protected IUserManager $userManager;
-	protected INotificationManager $notificationManager;
-	protected FilesystemHelper $ocFilesystem;
-	protected LoggerInterface $logger;
-	protected Image $image;
-	protected IAvatarManager $avatarManager;
 	/** @var CappedMemoryCache<User> $usersByDN */
 	protected CappedMemoryCache $usersByDN;
 	/** @var CappedMemoryCache<User> $usersByUid */
 	protected CappedMemoryCache $usersByUid;
-	private IManager $shareManager;
 
 	public function __construct(
-		IConfig $ocConfig,
-		FilesystemHelper $ocFilesystem,
-		LoggerInterface $logger,
-		IAvatarManager $avatarManager,
-		Image $image,
-		IUserManager $userManager,
-		INotificationManager $notificationManager,
-		IManager $shareManager,
+		protected IConfig $ocConfig,
+		protected FilesystemHelper $ocFilesystem,
+		protected LoggerInterface $logger,
+		protected IAvatarManager $avatarManager,
+		protected Image $image,
+		protected IUserManager $userManager,
+		protected INotificationManager $notificationManager,
+		private IManager $shareManager,
 	) {
-		$this->ocConfig = $ocConfig;
-		$this->ocFilesystem = $ocFilesystem;
-		$this->logger = $logger;
-		$this->avatarManager = $avatarManager;
-		$this->image = $image;
-		$this->userManager = $userManager;
-		$this->notificationManager = $notificationManager;
 		$this->usersByDN = new CappedMemoryCache();
 		$this->usersByUid = new CappedMemoryCache();
-		$this->shareManager = $shareManager;
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/User/OfflineUser.php b/apps/user_ldap/lib/User/OfflineUser.php
index 873bd597df8..ecaab7188ba 100644
--- a/apps/user_ldap/lib/User/OfflineUser.php
+++ b/apps/user_ldap/lib/User/OfflineUser.php
@@ -15,10 +15,6 @@ use OCP\Share\IShare;
 
 class OfflineUser {
 	/**
-	 * @var string $ocName
-	 */
-	protected $ocName;
-	/**
 	 * @var string $dn
 	 */
 	protected $dn;
@@ -52,30 +48,19 @@ class OfflineUser {
 	 */
 	protected $hasActiveShares;
 	/**
-	 * @var IConfig $config
-	 */
-	protected $config;
-	/**
 	 * @var IDBConnection $db
 	 */
 	protected $db;
+
 	/**
-	 * @var UserMapping
+	 * @param string $ocName
 	 */
-	protected $mapping;
-	/** @var IManager */
-	private $shareManager;
-
 	public function __construct(
-		$ocName,
-		IConfig $config,
-		UserMapping $mapping,
-		IManager $shareManager,
+		protected $ocName,
+		protected IConfig $config,
+		protected UserMapping $mapping,
+		private IManager $shareManager,
 	) {
-		$this->ocName = $ocName;
-		$this->config = $config;
-		$this->mapping = $mapping;
-		$this->shareManager = $shareManager;
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
index 0a310f57012..7ef36ff1512 100644
--- a/apps/user_ldap/lib/User/User.php
+++ b/apps/user_ldap/lib/User/User.php
@@ -22,6 +22,7 @@ use OCP\Image;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Notification\IManager as INotificationManager;
+use OCP\PreConditionNotMetException;
 use OCP\Server;
 use OCP\Util;
 use Psr\Log\LoggerInterface;
@@ -33,42 +34,14 @@ use Psr\Log\LoggerInterface;
  */
 class User {
 	/**
-	 * @var Access
-	 */
-	protected $access;
-	/**
 	 * @var Connection
 	 */
 	protected $connection;
 	/**
-	 * @var IConfig
-	 */
-	protected $config;
-	/**
-	 * @var FilesystemHelper
-	 */
-	protected $fs;
-	/**
-	 * @var Image
-	 */
-	protected $image;
-	/**
 	 * @var LoggerInterface
 	 */
 	protected $logger;
 	/**
-	 * @var IAvatarManager
-	 */
-	protected $avatarManager;
-	/**
-	 * @var IUserManager
-	 */
-	protected $userManager;
-	/**
-	 * @var INotificationManager
-	 */
-	protected $notificationManager;
-	/**
 	 * @var string
 	 */
 	protected $dn;
@@ -97,10 +70,18 @@ class User {
 	 * @param string $username the internal username
 	 * @param string $dn the LDAP DN
 	 */
-	public function __construct($username, $dn, Access $access,
-		IConfig $config, FilesystemHelper $fs, Image $image,
-		LoggerInterface $logger, IAvatarManager $avatarManager, IUserManager $userManager,
-		INotificationManager $notificationManager) {
+	public function __construct(
+		$username,
+		$dn,
+		protected Access $access,
+		protected IConfig $config,
+		protected FilesystemHelper $fs,
+		protected Image $image,
+		LoggerInterface $logger,
+		protected IAvatarManager $avatarManager,
+		protected IUserManager $userManager,
+		protected INotificationManager $notificationManager,
+	) {
 		if ($username === null) {
 			$logger->error("uid for '$dn' must not be null!", ['app' => 'user_ldap']);
 			throw new \InvalidArgumentException('uid must not be null!');
@@ -108,18 +89,10 @@ class User {
 			$logger->error("uid for '$dn' must not be an empty string", ['app' => 'user_ldap']);
 			throw new \InvalidArgumentException('uid must not be an empty string!');
 		}
-
-		$this->access = $access;
-		$this->connection = $access->getConnection();
-		$this->config = $config;
-		$this->fs = $fs;
+		$this->connection = $this->access->getConnection();
 		$this->dn = $dn;
 		$this->uid = $username;
-		$this->image = $image;
 		$this->logger = $logger;
-		$this->avatarManager = $avatarManager;
-		$this->userManager = $userManager;
-		$this->notificationManager = $notificationManager;
 		$this->birthdateParser = new BirthdateParserService();
 
 		Util::connectHook('OC_User', 'post_login', $this, 'handlePasswordExpiry');
@@ -128,7 +101,7 @@ class User {
 	/**
 	 * marks a user as deleted
 	 *
-	 * @throws \OCP\PreConditionNotMetException
+	 * @throws PreConditionNotMetException
 	 */
 	public function markUser() {
 		$curValue = $this->config->getUserValue($this->getUsername(), 'user_ldap', 'isDeleted', '0');
@@ -765,7 +738,7 @@ class User {
 	/**
 	 * @throws AttributeNotSet
 	 * @throws \OC\ServerNotAvailableException
-	 * @throws \OCP\PreConditionNotMetException
+	 * @throws PreConditionNotMetException
 	 */
 	public function getExtStorageHome():string {
 		$value = $this->config->getUserValue($this->getUsername(), 'user_ldap', 'extStorageHome', '');
@@ -784,7 +757,7 @@ class User {
 	}
 
 	/**
-	 * @throws \OCP\PreConditionNotMetException
+	 * @throws PreConditionNotMetException
 	 * @throws \OC\ServerNotAvailableException
 	 */
 	public function updateExtStorageHome(?string $valueFromLDAP = null):string {
diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
index 85ed69195b6..6970a52d3d7 100644
--- a/apps/user_ldap/lib/User_LDAP.php
+++ b/apps/user_ldap/lib/User_LDAP.php
@@ -23,23 +23,14 @@ use OCP\UserInterface;
 use Psr\Log\LoggerInterface;
 
 class User_LDAP extends BackendUtility implements IUserBackend, UserInterface, IUserLDAP, ICountUsersBackend, ICountMappedUsersBackend, IProvideEnabledStateBackend {
-	protected INotificationManager $notificationManager;
-	protected UserPluginManager $userPluginManager;
-	protected LoggerInterface $logger;
-	protected DeletedUsersIndex $deletedUsersIndex;
-
 	public function __construct(
 		Access $access,
-		INotificationManager $notificationManager,
-		UserPluginManager $userPluginManager,
-		LoggerInterface $logger,
-		DeletedUsersIndex $deletedUsersIndex,
+		protected INotificationManager $notificationManager,
+		protected UserPluginManager $userPluginManager,
+		protected LoggerInterface $logger,
+		protected DeletedUsersIndex $deletedUsersIndex,
 	) {
 		parent::__construct($access);
-		$this->notificationManager = $notificationManager;
-		$this->userPluginManager = $userPluginManager;
-		$this->logger = $logger;
-		$this->deletedUsersIndex = $deletedUsersIndex;
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/User_Proxy.php b/apps/user_ldap/lib/User_Proxy.php
index 3abaae741d8..7786b8f0497 100644
--- a/apps/user_ldap/lib/User_Proxy.php
+++ b/apps/user_ldap/lib/User_Proxy.php
@@ -24,27 +24,17 @@ class User_Proxy extends Proxy implements IUserBackend, UserInterface, IUserLDAP
 	private ?User_LDAP $refBackend = null;
 
 	private bool $isSetUp = false;
-	private Helper $helper;
-	private INotificationManager $notificationManager;
-	private UserPluginManager $userPluginManager;
-	private LoggerInterface $logger;
-	private DeletedUsersIndex $deletedUsersIndex;
 
 	public function __construct(
-		Helper $helper,
+		private Helper $helper,
 		ILDAPWrapper $ldap,
 		AccessFactory $accessFactory,
-		INotificationManager $notificationManager,
-		UserPluginManager $userPluginManager,
-		LoggerInterface $logger,
-		DeletedUsersIndex $deletedUsersIndex,
+		private INotificationManager $notificationManager,
+		private UserPluginManager $userPluginManager,
+		private LoggerInterface $logger,
+		private DeletedUsersIndex $deletedUsersIndex,
 	) {
 		parent::__construct($ldap, $accessFactory);
-		$this->helper = $helper;
-		$this->notificationManager = $notificationManager;
-		$this->userPluginManager = $userPluginManager;
-		$this->logger = $logger;
-		$this->deletedUsersIndex = $deletedUsersIndex;
 	}
 
 	protected function setup(): void {
diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php
index 262777c5022..6df5aba4cac 100644
--- a/apps/user_ldap/lib/Wizard.php
+++ b/apps/user_ldap/lib/Wizard.php
@@ -16,9 +16,7 @@ use Psr\Log\LoggerInterface;
 
 class Wizard extends LDAPUtility {
 	protected static ?IL10N $l = null;
-	protected Access $access;
 	protected ?\LDAP\Connection $cr = null;
-	protected Configuration $configuration;
 	protected WizardResult $result;
 	protected LoggerInterface $logger;
 
@@ -36,16 +34,14 @@ class Wizard extends LDAPUtility {
 	public const LDAP_NW_TIMEOUT = 4;
 
 	public function __construct(
-		Configuration $configuration,
+		protected Configuration $configuration,
 		ILDAPWrapper $ldap,
-		Access $access,
+		protected Access $access,
 	) {
 		parent::__construct($ldap);
-		$this->configuration = $configuration;
 		if (is_null(static::$l)) {
 			static::$l = \OC::$server->get(IL10NFactory::class)->get('user_ldap');
 		}
-		$this->access = $access;
 		$this->result = new WizardResult();
 		$this->logger = \OC::$server->get(LoggerInterface::class);
 	}
diff --git a/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php b/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php
index 30b3e573cd4..726342a88f7 100644
--- a/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php
+++ b/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php
@@ -37,14 +37,19 @@ abstract class AbstractIntegrationTest {
 	/** @var Helper */
 	protected $helper;
 
-	/** @var string */
-	protected $base;
-
 	/** @var string[] */
 	protected $server;
 
-	public function __construct($host, $port, $bind, $pwd, $base) {
-		$this->base = $base;
+	/**
+	 * @param string $base
+	 */
+	public function __construct(
+		$host,
+		$port,
+		$bind,
+		$pwd,
+		protected $base,
+	) {
 		$this->server = [
 			'host' => $host,
 			'port' => $port,
diff --git a/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php
index 2beab95b71f..78f6df9d7bc 100644
--- a/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php
+++ b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php
@@ -22,21 +22,6 @@ use OCA\User_LDAP\LDAP;
  */
 class ExceptionOnLostConnection {
 	/** @var string */
-	private $toxiProxyHost;
-
-	/** @var string */
-	private $toxiProxyName;
-
-	/** @var string */
-	private $ldapBase;
-
-	/** @var string|null */
-	private $ldapBindDN;
-
-	/** @var string|null */
-	private $ldapBindPwd;
-
-	/** @var string */
 	private $ldapHost;
 
 	/** @var LDAP */
@@ -46,19 +31,19 @@ class ExceptionOnLostConnection {
 	private $originalProxyState;
 
 	/**
-	 * @param string $proxyHost host of toxiproxy as url, like http://localhost:8474
-	 * @param string $proxyName name of the LDAP proxy service as configured in toxiProxy
+	 * @param string $toxiProxyHost host of toxiproxy as url, like http://localhost:8474
+	 * @param string $toxiProxyName name of the LDAP proxy service as configured in toxiProxy
 	 * @param string $ldapBase any valid LDAP base DN
-	 * @param null $bindDN optional, bind DN if anonymous bind is not possible
-	 * @param null $bindPwd optional
+	 * @param null $ldapBindDN optional, bind DN if anonymous bind is not possible
+	 * @param null $ldapBindPwd optional
 	 */
-	public function __construct($proxyHost, $proxyName, $ldapBase, $bindDN = null, $bindPwd = null) {
-		$this->toxiProxyHost = $proxyHost;
-		$this->toxiProxyName = $proxyName;
-		$this->ldapBase = $ldapBase;
-		$this->ldapBindDN = $bindDN;
-		$this->ldapBindPwd = $bindPwd;
-
+	public function __construct(
+		private $toxiProxyHost,
+		private $toxiProxyName,
+		private $ldapBase,
+		private $ldapBindDN = null,
+		private $ldapBindPwd = null,
+	) {
 		$this->setUp();
 	}