refactor: Apply rector changes

Signed-off-by: GitHub <noreply@github.com>

Author: nextcloud-command

apps/comments/lib/MaxAutoCompleteResultsInitialState.php

@@ -10,11 +10,13 @@
 namespace OCA\Comments;
 
 use OCP\AppFramework\Services\InitialStateProvider;
+use OCP\IAppConfig;
 use OCP\IConfig;
 
 class MaxAutoCompleteResultsInitialState extends InitialStateProvider {
 	public function __construct(
 		private IConfig $config,
+		private IAppConfig $appConfig,
 	) {
 	}
 
@@ -25,6 +27,6 @@ public function getKey(): string {
 
 	#[\Override]
 	public function getData(): int {
-		return (int)$this->config->getAppValue('comments', 'maxAutoCompleteResults', '10');
+		return (int)$this->appConfig->getValue('comments', 'maxAutoCompleteResults', '10');
 	}
 }

apps/dav/lib/BackgroundJob/EventReminderJob.php

@@ -14,6 +14,7 @@
 use OCA\DAV\CalDAV\Reminder\ReminderService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\TimedJob;
+use OCP\IAppConfig;
 use OCP\IConfig;
 
 class EventReminderJob extends TimedJob {
@@ -22,6 +23,7 @@ public function __construct(
 		ITimeFactory $time,
 		private ReminderService $reminderService,
 		private IConfig $config,
+		private IAppConfig $appConfig,
 	) {
 		parent::__construct($time);
 
@@ -36,11 +38,11 @@ public function __construct(
 	 */
 	#[\Override]
 	public function run($argument):void {
-		if ($this->config->getAppValue('dav', 'sendEventReminders', 'yes') !== 'yes') {
+		if ($this->appConfig->getValue('dav', 'sendEventReminders', 'yes') !== 'yes') {
 			return;
 		}
 
-		if ($this->config->getAppValue('dav', 'sendEventRemindersMode', 'backgroundjob') !== 'backgroundjob') {
+		if ($this->appConfig->getValue('dav', 'sendEventRemindersMode', 'backgroundjob') !== 'backgroundjob') {
 			return;
 		}
 

apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php

@@ -12,6 +12,7 @@
 use OCA\DAV\CalDAV\BirthdayService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\QueuedJob;
+use OCP\IAppConfig;
 use OCP\IConfig;
 
 class GenerateBirthdayCalendarBackgroundJob extends QueuedJob {
@@ -20,6 +21,7 @@ public function __construct(
 		ITimeFactory $time,
 		private BirthdayService $birthdayService,
 		private IConfig $config,
+		private IAppConfig $appConfig,
 	) {
 		parent::__construct($time);
 	}
@@ -30,7 +32,7 @@ public function run($argument) {
 		$purgeBeforeGenerating = $argument['purgeBeforeGenerating'] ?? false;
 
 		// make sure admin didn't change their mind
-		$isGloballyEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
+		$isGloballyEnabled = $this->appConfig->getValue('dav', 'generateBirthdayCalendar', 'yes');
 		if ($isGloballyEnabled !== 'yes') {
 			return;
 		}

apps/dav/lib/BackgroundJob/PruneOutdatedSyncTokensJob.php

@@ -14,6 +14,7 @@
 use OCA\DAV\CardDAV\CardDavBackend;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\TimedJob;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use Psr\Log\LoggerInterface;
 
@@ -25,6 +26,7 @@ public function __construct(
 		private CardDavBackend $cardDavBackend,
 		private IConfig $config,
 		private LoggerInterface $logger,
+		private IAppConfig $appConfig,
 	) {
 		parent::__construct($timeFactory);
 		$this->setInterval(60 * 60 * 24); // One day
@@ -33,8 +35,8 @@ public function __construct(
 
 	#[\Override]
 	public function run($argument) {
-		$limit = max(1, (int)$this->config->getAppValue(Application::APP_ID, 'totalNumberOfSyncTokensToKeep', '10000'));
-		$retention = max(7, (int)$this->config->getAppValue(Application::APP_ID, 'syncTokensRetentionDays', '60')) * 24 * 3600;
+		$limit = max(1, (int)$this->appConfig->getValue(Application::APP_ID, 'totalNumberOfSyncTokensToKeep', '10000'));
+		$retention = max(7, (int)$this->appConfig->getValue(Application::APP_ID, 'syncTokensRetentionDays', '60')) * 24 * 3600;
 
 		$prunedCalendarSyncTokens = $this->calDavBackend->pruneOutdatedSyncTokens($limit, $retention);
 		$prunedAddressBookSyncTokens = $this->cardDavBackend->pruneOutdatedSyncTokens($limit, $retention);

apps/dav/lib/BackgroundJob/RefreshWebcalJob.php

@@ -14,6 +14,7 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
 use OCP\BackgroundJob\Job;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use Psr\Log\LoggerInterface;
 use Sabre\VObject\DateTimeParser;
@@ -25,6 +26,7 @@ public function __construct(
 		private IConfig $config,
 		private LoggerInterface $logger,
 		ITimeFactory $timeFactory,
+		private IAppConfig $appConfig,
 	) {
 		parent::__construct($timeFactory);
 	}
@@ -44,7 +46,7 @@ public function start(IJobList $jobList): void {
 		$this->fixSubscriptionRowTyping($subscription);
 
 		// if no refresh rate was configured, just refresh once a day
-		$defaultRefreshRate = $this->config->getAppValue('dav', 'calendarSubscriptionRefreshRate', 'P1D');
+		$defaultRefreshRate = $this->appConfig->getValue('dav', 'calendarSubscriptionRefreshRate', 'P1D');
 		$refreshRate = $subscription[RefreshWebcalService::REFRESH_RATE] ?? $defaultRefreshRate;
 
 		$subscriptionId = $subscription['id'];

apps/dav/lib/CalDAV/BirthdayService.php

@@ -13,6 +13,7 @@
 use Exception;
 use OCA\DAV\CardDAV\CardDavBackend;
 use OCA\DAV\DAV\GroupPrincipalBackend;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IL10N;
@@ -43,6 +44,7 @@ public function __construct(
 		private IConfig $config,
 		private IDBConnection $dbConnection,
 		private IL10N $l10n,
+		private IAppConfig $appConfig,
 	) {
 	}
 
@@ -375,7 +377,7 @@ private function updateCalendar(string $cardUri,
 	 * @return bool
 	 */
 	private function isGloballyEnabled():bool {
-		return $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes') === 'yes';
+		return $this->appConfig->getValue('dav', 'generateBirthdayCalendar', 'yes') === 'yes';
 	}
 
 	/**

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -45,6 +45,7 @@
 use OCP\DB\Exception;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IAppConfig;
 use OCP\ICache;
 use OCP\ICacheFactory;
 use OCP\IConfig;
@@ -220,6 +221,7 @@ public function __construct(
 		private FederatedCalendarMapper $federatedCalendarMapper,
 		ICacheFactory $cacheFactory,
 		private bool $legacyEndpoint = false,
+		private IAppConfig $appConfig,
 	) {
 		$this->publishStatusCache = $cacheFactory->createInMemory();
 	}
@@ -943,7 +945,7 @@ public function deleteCalendar($calendarId, bool $forceDeletePermanently = false
 			// retention (0 seconds) is set, which signals a disabled trashbin.
 			$calendarData = $this->getCalendarById($calendarId);
 			$isBirthdayCalendar = isset($calendarData['uri']) && $calendarData['uri'] === BirthdayService::BIRTHDAY_CALENDAR_URI;
-			$trashbinDisabled = $this->config->getAppValue(Application::APP_ID, RetentionService::RETENTION_CONFIG_KEY) === '0';
+			$trashbinDisabled = $this->appConfig->getValue(Application::APP_ID, RetentionService::RETENTION_CONFIG_KEY) === '0';
 			if ($forceDeletePermanently || $isBirthdayCalendar || $trashbinDisabled) {
 				$calendarData = $this->getCalendarById($calendarId);
 				$shares = $this->getShares($calendarId);
@@ -1775,7 +1777,7 @@ public function deleteCalendarObject($calendarId, $objectUri, $calendarType = se
 				return;
 			}
 
-			if ($forceDeletePermanently || $this->config->getAppValue(Application::APP_ID, RetentionService::RETENTION_CONFIG_KEY) === '0') {
+			if ($forceDeletePermanently || $this->appConfig->getValue(Application::APP_ID, RetentionService::RETENTION_CONFIG_KEY) === '0') {
 				$qb = $this->db->getQueryBuilder();
 				$qb->delete('calendarobjects')
 					->where($qb->expr()->eq('calendarid', $qb->createNamedParameter($calendarId)))

apps/dav/lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php

@@ -7,6 +7,7 @@
 
 namespace OCA\DAV\CalDAV\ICSExportPlugin;
 
+use OCP\IAppConfig;
 use OCP\IConfig;
 use Psr\Log\LoggerInterface;
 use Sabre\HTTP\ResponseInterface;
@@ -29,6 +30,7 @@ class ICSExportPlugin extends \Sabre\CalDAV\ICSExportPlugin {
 	public function __construct(
 		private IConfig $config,
 		private LoggerInterface $logger,
+		private IAppConfig $appConfig,
 	) {
 	}
 
@@ -38,7 +40,7 @@ public function __construct(
 	#[\Override]
 	protected function generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, ResponseInterface $response) {
 		if (!isset($properties['{http://nextcloud.com/ns}refresh-interval'])) {
-			$value = $this->config->getAppValue('dav', 'defaultRefreshIntervalExportedCalendars', self::DEFAULT_REFRESH_INTERVAL);
+			$value = $this->appConfig->getValue('dav', 'defaultRefreshIntervalExportedCalendars', self::DEFAULT_REFRESH_INTERVAL);
 			$properties['{http://nextcloud.com/ns}refresh-interval'] = $value;
 		}
 

apps/dav/lib/CalDAV/Outbox.php

@@ -9,6 +9,7 @@
 
 namespace OCA\DAV\CalDAV;
 
+use OCP\IAppConfig;
 use OCP\IConfig;
 use Sabre\CalDAV\Plugin as CalDAVPlugin;
 
@@ -31,6 +32,7 @@ class Outbox extends \Sabre\CalDAV\Schedule\Outbox {
 	public function __construct(
 		private IConfig $config,
 		string $principalUri,
+		private IAppConfig $appConfig,
 	) {
 		parent::__construct($principalUri);
 	}
@@ -51,7 +53,7 @@ public function __construct(
 	public function getACL() {
 		// getACL is called so frequently that we cache the config result
 		if ($this->disableFreeBusy === null) {
-			$this->disableFreeBusy = ($this->config->getAppValue('dav', 'disableFreeBusy', 'no') === 'yes');
+			$this->disableFreeBusy = ($this->appConfig->getValue('dav', 'disableFreeBusy', 'no') === 'yes');
 		}
 
 		$commonAcl = [

apps/dav/lib/CalDAV/Publishing/PublishPlugin.php

@@ -12,6 +12,7 @@
 use OCA\DAV\CalDAV\CalendarHome;
 use OCA\DAV\CalDAV\Publishing\Xml\Publisher;
 use OCP\AppFramework\Http;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\IURLGenerator;
 use Sabre\CalDAV\Xml\Property\AllowedSharingModes;
@@ -48,6 +49,7 @@ public function __construct(
 		 * URL Generator for absolute URLs.
 		 */
 		protected IURLGenerator $urlGenerator,
+		private IAppConfig $appConfig,
 	) {
 	}
 
@@ -126,7 +128,7 @@ public function propFind(PropFind $propFind, INode $node) {
 				$canShare = (!$node->isSubscription() && $node->canWrite());
 				$canPublish = (!$node->isSubscription() && $node->canWrite());
 
-				if ($this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes') {
+				if ($this->appConfig->getValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes') {
 					$canShare = $canShare && ($node->getOwner() === $node->getPrincipalURI());
 					$canPublish = $canPublish && ($node->getOwner() === $node->getPrincipalURI());
 				}
@@ -190,7 +192,7 @@ public function httpPost(RequestInterface $request, ResponseInterface $response)
 					/** @var \Sabre\DAVACL\Plugin $acl */
 					$acl->checkPrivileges($path, '{DAV:}write');
 
-					$limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
+					$limitSharingToOwner = $this->appConfig->getValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
 					$isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
 					if ($limitSharingToOwner && !$isOwner) {
 						return;
@@ -224,7 +226,7 @@ public function httpPost(RequestInterface $request, ResponseInterface $response)
 					/** @var \Sabre\DAVACL\Plugin $acl */
 					$acl->checkPrivileges($path, '{DAV:}write');
 
-					$limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
+					$limitSharingToOwner = $this->appConfig->getValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
 					$isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
 					if ($limitSharingToOwner && !$isOwner) {
 						return;