chore(rector): Run rector on apps, core and tests directory

Signed-off-by: Carl Schwan <[email protected]>

Author: CarlSchwan

apps/dav/lib/CalDAV/Security/RateLimitingPlugin.php

@@ -24,17 +24,14 @@
 
 class RateLimitingPlugin extends ServerPlugin {
 
-	private Limiter $limiter;
-
 	public function __construct(
-		Limiter $limiter,
+		private Limiter $limiter,
 		private IUserManager $userManager,
 		private CalDavBackend $calDavBackend,
 		private LoggerInterface $logger,
 		private IAppConfig $config,
 		private ?string $userId,
 	) {
-		$this->limiter = $limiter;
 	}
 
 	public function initialize(DAV\Server $server): void {

apps/dav/lib/Connector/Sabre/Principal.php

@@ -42,9 +42,6 @@ class Principal implements BackendInterface {
 	/** @var bool */
 	private $hasCircles;
 
-	/** @var KnownUserService */
-	private $knownUserService;
-
 	public function __construct(
 		private IUserManager $userManager,
 		private IGroupManager $groupManager,
@@ -53,14 +50,13 @@ public function __construct(
 		private IUserSession $userSession,
 		private IAppManager $appManager,
 		private ProxyMapper $proxyMapper,
-		KnownUserService $knownUserService,
+		private KnownUserService $knownUserService,
 		private IConfig $config,
 		private IFactory $languageFactory,
 		string $principalPrefix = 'principals/users/',
 	) {
 		$this->principalPrefix = trim($principalPrefix, '/');
 		$this->hasGroups = $this->hasCircles = ($principalPrefix === 'principals/users/');
-		$this->knownUserService = $knownUserService;
 	}
 
 	use PrincipalProxyTrait {

apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php

@@ -22,23 +22,17 @@ class AppleProvisioningPlugin extends ServerPlugin {
 	 */
 	protected $server;
 
-	/**
-	 * @var \OC_Defaults
-	 */
-	protected $themingDefaults;
-
 	/**
 	 * AppleProvisioningPlugin constructor.
 	 */
 	public function __construct(
 		protected IUserSession $userSession,
 		protected IURLGenerator $urlGenerator,
-		\OC_Defaults $themingDefaults,
+		protected \OC_Defaults $themingDefaults,
 		protected IRequest $request,
 		protected IL10N $l10n,
 		protected \Closure $uuidClosure,
 	) {
-		$this->themingDefaults = $themingDefaults;
 	}
 
 	/**

apps/dav/lib/Settings/AvailabilitySettings.php

@@ -17,6 +17,7 @@
 use OCP\IConfig;
 use OCP\Settings\ISettings;
 use OCP\User\IAvailabilityCoordinator;
+use OCP\Util;
 use Psr\Log\LoggerInterface;
 
 class AvailabilitySettings implements ISettings {
@@ -56,8 +57,8 @@ public function getForm(): TemplateResponse {
 			}
 		}
 
-		\OCP\Util::addStyle(Application::APP_ID, 'settings-personal-availability');
-		\OCP\Util::addScript(Application::APP_ID, 'settings-personal-availability');
+		Util::addStyle(Application::APP_ID, 'settings-personal-availability');
+		Util::addScript(Application::APP_ID, 'settings-personal-availability');
 		return new TemplateResponse(Application::APP_ID, 'settings-personal-availability');
 	}
 

apps/dav/lib/Settings/CalDAVSettings.php

@@ -13,6 +13,7 @@
 use OCP\IConfig;
 use OCP\IURLGenerator;
 use OCP\Settings\IDelegatedSettings;
+use OCP\Util;
 
 class CalDAVSettings implements IDelegatedSettings {
 
@@ -45,8 +46,8 @@ public function getForm(): TemplateResponse {
 			$this->initialState->provideInitialState($key, $value === 'yes');
 		}
 
-		\OCP\Util::addScript(Application::APP_ID, 'settings-admin-caldav');
-		\OCP\Util::addStyle(Application::APP_ID, 'settings-admin-caldav');
+		Util::addScript(Application::APP_ID, 'settings-admin-caldav');
+		Util::addStyle(Application::APP_ID, 'settings-admin-caldav');
 		return new TemplateResponse(Application::APP_ID, 'settings-admin-caldav');
 	}
 

apps/dav/lib/Settings/ExampleContentSettings.php

@@ -16,6 +16,7 @@
 use OCP\AppFramework\Services\IAppConfig;
 use OCP\AppFramework\Services\IInitialState;
 use OCP\Settings\ISettings;
+use OCP\Util;
 
 class ExampleContentSettings implements ISettings {
 	public function __construct(
@@ -53,8 +54,8 @@ public function getForm(): TemplateResponse {
 			);
 		}
 
-		\OCP\Util::addStyle(Application::APP_ID, 'settings-admin-example-content');
-		\OCP\Util::addScript(Application::APP_ID, 'settings-admin-example-content');
+		Util::addStyle(Application::APP_ID, 'settings-admin-example-content');
+		Util::addScript(Application::APP_ID, 'settings-admin-example-content');
 		return new TemplateResponse(Application::APP_ID, 'settings-admin-example-content');
 	}
 

apps/dav/lib/SystemTag/SystemTagsInUseCollection.php

@@ -22,18 +22,15 @@
 use Sabre\DAV\SimpleCollection;
 
 class SystemTagsInUseCollection extends SimpleCollection {
-	protected SystemTagsInFilesDetector $systemTagsInFilesDetector;
-
 	/** @noinspection PhpMissingParentConstructorInspection */
 	public function __construct(
 		protected IUserSession $userSession,
 		protected IRootFolder $rootFolder,
 		protected ISystemTagManager $systemTagManager,
 		protected ISystemTagObjectMapper $tagMapper,
-		SystemTagsInFilesDetector $systemTagsInFilesDetector,
+		protected SystemTagsInFilesDetector $systemTagsInFilesDetector,
 		protected string $mediaType = '',
 	) {
-		$this->systemTagsInFilesDetector = $systemTagsInFilesDetector;
 		$this->name = 'systemtags-assigned';
 		if ($this->mediaType != '') {
 			$this->name .= '/' . $this->mediaType;

apps/dav/tests/unit/Paginate/PaginatePluginTest.php

@@ -134,7 +134,7 @@ private function initializePlugin(): void {
 	private function expectSequentialCalls(MockObject $mock, string $method, array $expectedCalls): void {
 		$mock->expects(self::exactly(\count($expectedCalls)))
 			->method($method)
-			->willReturnCallback(function (...$args) use (&$expectedCalls) {
+			->willReturnCallback(function (...$args) use (&$expectedCalls): void {
 				$expected = array_shift($expectedCalls);
 				self::assertNotNull($expected);
 				self::assertSame($expected, $args);

apps/federatedfilesharing/lib/Notifications.php

@@ -7,6 +7,7 @@
  */
 namespace OCA\FederatedFileSharing;
 
+use OC\ServerNotAvailableException;
 use OCA\FederatedFileSharing\Events\FederatedShareAddedEvent;
 use OCP\AppFramework\Http;
 use OCP\BackgroundJob\IJobList;
@@ -47,7 +48,7 @@ public function __construct(
 	 * @param int $shareType (can be a remote user or group share)
 	 * @return bool
 	 * @throws HintException
-	 * @throws \OC\ServerNotAvailableException
+	 * @throws ServerNotAvailableException
 	 */
 	public function sendRemoteShare($token, $shareWith, $name, $remoteId, $owner, $ownerFederatedId, $sharedBy, $sharedByFederatedId, $shareType) {
 		[$user, $remote] = $this->addressHandler->splitUserRemote($shareWith);
@@ -106,7 +107,7 @@ public function sendRemoteShare($token, $shareWith, $name, $remoteId, $owner, $o
 	 * @param string $filename
 	 * @return array|false
 	 * @throws HintException
-	 * @throws \OC\ServerNotAvailableException
+	 * @throws ServerNotAvailableException
 	 */
 	public function requestReShare($token, $id, $shareId, $remote, $shareWith, $permission, $filename, $shareType) {
 		$fields = [

apps/federation/lib/SyncFederationAddressBooks.php

@@ -10,19 +10,15 @@
 use OC\OCS\DiscoveryService;
 use OCA\DAV\CardDAV\SyncService;
 use OCP\AppFramework\Http;
-use OCP\OCS\IDiscoveryService;
 use Psr\Log\LoggerInterface;
 
 class SyncFederationAddressBooks {
-	private DiscoveryService $ocsDiscoveryService;
-
 	public function __construct(
 		protected DbHandler $dbHandler,
 		private SyncService $syncService,
-		IDiscoveryService $ocsDiscoveryService,
+		private DiscoveryService $ocsDiscoveryService,
 		private LoggerInterface $logger,
 	) {
-		$this->ocsDiscoveryService = $ocsDiscoveryService;
 	}
 
 	/**