refactor(apps): Use constructor property promotion when possible

Signed-off-by: provokateurin <[email protected]>
nextcloud · Oct 21, 2024 · 3810770 · 3810770
1 parent 4d8d11d
commit 3810770
Show file tree

Hide file tree

Showing 590 changed files with 2,827 additions and 6,646 deletions.
diff --git a/apps/cloud_federation_api/lib/Config.php b/apps/cloud_federation_api/lib/Config.php
@@ -16,11 +16,9 @@
  */
 class Config {
 
-	/** @var ICloudFederationProviderManager */
-	private $cloudFederationProviderManager;
-
-	public function __construct(ICloudFederationProviderManager $cloudFederationProviderManager) {
-		$this->cloudFederationProviderManager = $cloudFederationProviderManager;
+	public function __construct(
+		private ICloudFederationProviderManager $cloudFederationProviderManager,
+	) {
 	}
 
 	/**

diff --git a/apps/comments/lib/Search/Result.php b/apps/comments/lib/Search/Result.php
@@ -25,10 +25,6 @@ class Result extends BaseResult {
 	 * @deprecated 20.0.0
 	 */
 	public $authorId;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public string $authorName;
 	/**
 	 * @deprecated 20.0.0
 	 */
@@ -45,7 +41,10 @@ class Result extends BaseResult {
 	public function __construct(
 		string $search,
 		IComment $comment,
-		string $authorName,
+		/**
+		 * @deprecated 20.0.0
+		 */
+		public string $authorName,
 		string $path,
 	) {
 		parent::__construct(
@@ -56,7 +55,6 @@ public function __construct(
 
 		$this->comment = $this->getRelevantMessagePart($comment->getMessage(), $search);
 		$this->authorId = $comment->getActorId();
-		$this->authorName = $authorName;
 		$this->fileName = basename($path);
 		$this->path = $this->getVisiblePath($path);
 	}

diff --git a/apps/dav/lib/AppInfo/PluginManager.php b/apps/dav/lib/AppInfo/PluginManager.php
@@ -27,16 +27,6 @@
  */
 class PluginManager {
 
-	/**
-	 * @var ServerContainer
-	 */
-	private $container;
-
-	/**
-	 * @var IAppManager
-	 */
-	private $appManager;
-
 	/**
 	 * App plugins
 	 *
@@ -74,9 +64,10 @@ class PluginManager {
 	 * @param ServerContainer $container server container for resolving plugin classes
 	 * @param IAppManager $appManager app manager to loading apps and their info
 	 */
-	public function __construct(ServerContainer $container, IAppManager $appManager) {
-		$this->container = $container;
-		$this->appManager = $appManager;
+	public function __construct(
+		private ServerContainer $container,
+		private IAppManager $appManager,
+	) {
 	}
 
 	/**

diff --git a/apps/dav/lib/Avatars/AvatarHome.php b/apps/dav/lib/Avatars/AvatarHome.php
@@ -16,20 +16,16 @@
 
 class AvatarHome implements ICollection {
 
-	/** @var array */
-	private $principalInfo;
-	/** @var IAvatarManager */
-	private $avatarManager;
-
 	/**
 	 * AvatarHome constructor.
 	 *
 	 * @param array $principalInfo
 	 * @param IAvatarManager $avatarManager
 	 */
-	public function __construct($principalInfo, IAvatarManager $avatarManager) {
-		$this->principalInfo = $principalInfo;
-		$this->avatarManager = $avatarManager;
+	public function __construct(
+		private $principalInfo,
+		private IAvatarManager $avatarManager,
+	) {
 	}
 
 	public function createFile($name, $data = null) {

diff --git a/apps/dav/lib/Avatars/AvatarNode.php b/apps/dav/lib/Avatars/AvatarNode.php
@@ -11,21 +11,18 @@
 use Sabre\DAV\File;
 
 class AvatarNode extends File {
-	private $ext;
-	private $size;
-	private $avatar;
-
 	/**
 	 * AvatarNode constructor.
 	 *
 	 * @param integer $size
 	 * @param string $ext
 	 * @param IAvatar $avatar
 	 */
-	public function __construct($size, $ext, $avatar) {
-		$this->size = $size;
-		$this->ext = $ext;
-		$this->avatar = $avatar;
+	public function __construct(
+		private $size,
+		private $ext,
+		private $avatar,
+	) {
 	}
 
 	/**

diff --git a/apps/dav/lib/BackgroundJob/BuildReminderIndexBackgroundJob.php b/apps/dav/lib/BackgroundJob/BuildReminderIndexBackgroundJob.php
@@ -22,33 +22,20 @@
  */
 class BuildReminderIndexBackgroundJob extends QueuedJob {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var ReminderService */
-	private $reminderService;
-
-	private LoggerInterface $logger;
-
-	/** @var IJobList */
-	private $jobList;
-
 	/** @var ITimeFactory */
 	private $timeFactory;
 
 	/**
 	 * BuildReminderIndexBackgroundJob constructor.
 	 */
-	public function __construct(IDBConnection $db,
-		ReminderService $reminderService,
-		LoggerInterface $logger,
-		IJobList $jobList,
-		ITimeFactory $timeFactory) {
+	public function __construct(
+		private IDBConnection $db,
+		private ReminderService $reminderService,
+		private LoggerInterface $logger,
+		private IJobList $jobList,
+		ITimeFactory $timeFactory,
+	) {
 		parent::__construct($timeFactory);
-		$this->db = $db;
-		$this->reminderService = $reminderService;
-		$this->logger = $logger;
-		$this->jobList = $jobList;
 		$this->timeFactory = $timeFactory;
 	}
 

diff --git a/apps/dav/lib/BackgroundJob/CalendarRetentionJob.php b/apps/dav/lib/BackgroundJob/CalendarRetentionJob.php
@@ -13,13 +13,11 @@
 use OCP\BackgroundJob\TimedJob;
 
 class CalendarRetentionJob extends TimedJob {
-	/** @var RetentionService */
-	private $service;
-
-	public function __construct(ITimeFactory $time,
-		RetentionService $service) {
+	public function __construct(
+		ITimeFactory $time,
+		private RetentionService $service,
+	) {
 		parent::__construct($time);
-		$this->service = $service;
 
 		// Run four times a day
 		$this->setInterval(6 * 60 * 60);

diff --git a/apps/dav/lib/BackgroundJob/CleanupDirectLinksJob.php b/apps/dav/lib/BackgroundJob/CleanupDirectLinksJob.php
@@ -13,12 +13,11 @@
 use OCP\BackgroundJob\TimedJob;
 
 class CleanupDirectLinksJob extends TimedJob {
-	/** @var DirectMapper */
-	private $mapper;
-
-	public function __construct(ITimeFactory $timeFactory, DirectMapper $mapper) {
+	public function __construct(
+		ITimeFactory $timeFactory,
+		private DirectMapper $mapper,
+	) {
 		parent::__construct($timeFactory);
-		$this->mapper = $mapper;
 
 		// Run once a day at off-peak time
 		$this->setInterval(24 * 60 * 60);

diff --git a/apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php b/apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php
@@ -14,12 +14,11 @@
 
 class CleanupInvitationTokenJob extends TimedJob {
 
-	/** @var IDBConnection */
-	private $db;
-
-	public function __construct(IDBConnection $db, ITimeFactory $time) {
+	public function __construct(
+		private IDBConnection $db,
+		ITimeFactory $time,
+	) {
 		parent::__construct($time);
-		$this->db = $db;
 
 		// Run once a day at off-peak time
 		$this->setInterval(24 * 60 * 60);

diff --git a/apps/dav/lib/BackgroundJob/EventReminderJob.php b/apps/dav/lib/BackgroundJob/EventReminderJob.php
@@ -8,6 +8,7 @@
  */
 namespace OCA\DAV\BackgroundJob;
 
+use OC\User\NoUserException;
 use OCA\DAV\CalDAV\Reminder\NotificationProvider\ProviderNotAvailableException;
 use OCA\DAV\CalDAV\Reminder\NotificationTypeDoesNotExistException;
 use OCA\DAV\CalDAV\Reminder\ReminderService;
@@ -17,18 +18,12 @@
 
 class EventReminderJob extends TimedJob {
 
-	/** @var ReminderService */
-	private $reminderService;
-
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(ITimeFactory $time,
-		ReminderService $reminderService,
-		IConfig $config) {
+	public function __construct(
+		ITimeFactory $time,
+		private ReminderService $reminderService,
+		private IConfig $config,
+	) {
 		parent::__construct($time);
-		$this->reminderService = $reminderService;
-		$this->config = $config;
 
 		// Run every 5 minutes
 		$this->setInterval(5 * 60);
@@ -38,7 +33,7 @@ public function __construct(ITimeFactory $time,
 	/**
 	 * @throws ProviderNotAvailableException
 	 * @throws NotificationTypeDoesNotExistException
-	 * @throws \OC\User\NoUserException
+	 * @throws NoUserException
 	 */
 	public function run($argument):void {
 		if ($this->config->getAppValue('dav', 'sendEventReminders', 'yes') !== 'yes') {

diff --git a/apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php b/apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php
@@ -15,19 +15,12 @@
 
 class GenerateBirthdayCalendarBackgroundJob extends QueuedJob {
 
-	/** @var BirthdayService */
-	private $birthdayService;
-
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(ITimeFactory $time,
-		BirthdayService $birthdayService,
-		IConfig $config) {
+	public function __construct(
+		ITimeFactory $time,
+		private BirthdayService $birthdayService,
+		private IConfig $config,
+	) {
 		parent::__construct($time);
-
-		$this->birthdayService = $birthdayService;
-		$this->config = $config;
 	}
 
 	public function run($argument) {

diff --git a/apps/dav/lib/BackgroundJob/PruneOutdatedSyncTokensJob.php b/apps/dav/lib/BackgroundJob/PruneOutdatedSyncTokensJob.php
@@ -18,17 +18,14 @@
 
 class PruneOutdatedSyncTokensJob extends TimedJob {
 
-	private IConfig $config;
-	private LoggerInterface $logger;
-	private CardDavBackend $cardDavBackend;
-	private CalDavBackend $calDavBackend;
-
-	public function __construct(ITimeFactory $timeFactory, CalDavBackend $calDavBackend, CardDavBackend $cardDavBackend, IConfig $config, LoggerInterface $logger) {
+	public function __construct(
+		ITimeFactory $timeFactory,
+		private CalDavBackend $calDavBackend,
+		private CardDavBackend $cardDavBackend,
+		private IConfig $config,
+		private LoggerInterface $logger,
+	) {
 		parent::__construct($timeFactory);
-		$this->calDavBackend = $calDavBackend;
-		$this->cardDavBackend = $cardDavBackend;
-		$this->config = $config;
-		$this->logger = $logger;
 		$this->setInterval(60 * 60 * 24); // One day
 		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
 	}

diff --git a/apps/dav/lib/BackgroundJob/RegisterRegenerateBirthdayCalendars.php b/apps/dav/lib/BackgroundJob/RegisterRegenerateBirthdayCalendars.php
@@ -16,25 +16,19 @@
 
 class RegisterRegenerateBirthdayCalendars extends QueuedJob {
 
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IJobList */
-	private $jobList;
-
 	/**
 	 * RegisterRegenerateBirthdayCalendars constructor.
 	 *
 	 * @param ITimeFactory $time
 	 * @param IUserManager $userManager
 	 * @param IJobList $jobList
 	 */
-	public function __construct(ITimeFactory $time,
-		IUserManager $userManager,
-		IJobList $jobList) {
+	public function __construct(
+		ITimeFactory $time,
+		private IUserManager $userManager,
+		private IJobList $jobList,
+	) {
 		parent::__construct($time);
-		$this->userManager = $userManager;
-		$this->jobList = $jobList;
 	}
 
 	/**

diff --git a/apps/dav/lib/BackgroundJob/UploadCleanup.php b/apps/dav/lib/BackgroundJob/UploadCleanup.php
@@ -19,15 +19,13 @@
 use Psr\Log\LoggerInterface;
 
 class UploadCleanup extends TimedJob {
-	private IRootFolder $rootFolder;
-	private IJobList $jobList;
-	private LoggerInterface $logger;
-
-	public function __construct(ITimeFactory $time, IRootFolder $rootFolder, IJobList $jobList, LoggerInterface $logger) {
+	public function __construct(
+		ITimeFactory $time,
+		private IRootFolder $rootFolder,
+		private IJobList $jobList,
+		private LoggerInterface $logger,
+	) {
 		parent::__construct($time);
-		$this->rootFolder = $rootFolder;
-		$this->jobList = $jobList;
-		$this->logger = $logger;
 
 		// Run once a day
 		$this->setInterval(60 * 60 * 24);

diff --git a/apps/dav/lib/BulkUpload/BulkUploadPlugin.php b/apps/dav/lib/BulkUpload/BulkUploadPlugin.php
@@ -17,15 +17,10 @@
 use Sabre\HTTP\ResponseInterface;
 
 class BulkUploadPlugin extends ServerPlugin {
-	private Folder $userFolder;
-	private LoggerInterface $logger;
-
 	public function __construct(
-		Folder $userFolder,
-		LoggerInterface $logger,
+		private Folder $userFolder,
+		private LoggerInterface $logger,
 	) {
-		$this->userFolder = $userFolder;
-		$this->logger = $logger;
 	}
 
 	/**