chore(deps): Update rector to ^2.0

.github/dependabot.yml

@@ -28,6 +28,7 @@ updates:
     - "/vendor-bin/openapi-extractor"
     - "/vendor-bin/phpunit"
     - "/vendor-bin/psalm"
+    - "/vendor-bin/rector"
   schedule:
     interval: weekly
     day: saturday

apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php

@@ -25,12 +25,6 @@
 
 abstract class AbstractPrincipalBackend implements BackendInterface {
 
-	/** @var ProxyMapper */
-	private $proxyMapper;
-
-	/** @var string */
-	private $principalPrefix;
-
 	/** @var string */
 	private $dbTableName;
 
@@ -45,13 +39,11 @@ public function __construct(
 		private IUserSession $userSession,
 		private IGroupManager $groupManager,
 		private LoggerInterface $logger,
-		ProxyMapper $proxyMapper,
-		string $principalPrefix,
+		private ProxyMapper $proxyMapper,
+		private string $principalPrefix,
 		string $dbPrefix,
 		private string $cuType,
 	) {
-		$this->proxyMapper = $proxyMapper;
-		$this->principalPrefix = $principalPrefix;
 		$this->dbTableName = 'calendar_' . $dbPrefix . 's';
 		$this->dbMetaDataTableName = $this->dbTableName . '_md';
 		$this->dbForeignKeyName = $dbPrefix . '_id';

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

@@ -41,9 +41,6 @@ class Principal implements BackendInterface {
 	/** @var bool */
 	private $hasCircles;
 
-	/** @var ProxyMapper */
-	private $proxyMapper;
-
 	/** @var KnownUserService */
 	private $knownUserService;
 
@@ -54,15 +51,14 @@ public function __construct(
 		private IShareManager $shareManager,
 		private IUserSession $userSession,
 		private IAppManager $appManager,
-		ProxyMapper $proxyMapper,
+		private ProxyMapper $proxyMapper,
 		KnownUserService $knownUserService,
 		private IConfig $config,
 		private IFactory $languageFactory,
 		string $principalPrefix = 'principals/users/',
 	) {
 		$this->principalPrefix = trim($principalPrefix, '/');
 		$this->hasGroups = $this->hasCircles = ($principalPrefix === 'principals/users/');
-		$this->proxyMapper = $proxyMapper;
 		$this->knownUserService = $knownUserService;
 	}
 

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

@@ -15,6 +15,7 @@
 use OCA\DAV\DAV\CustomPropertiesBackend;
 use OCA\DAV\DAV\ViewOnlyPlugin;
 use OCA\DAV\Files\BrowserErrorPagePlugin;
+use OCA\DAV\Files\Sharing\RootCollection;
 use OCA\DAV\Upload\CleanupService;
 use OCA\Theming\ThemingDefaults;
 use OCP\Accounts\IAccountManager;
@@ -150,7 +151,7 @@ public function createServer(
 				);
 
 				// Mount the share collection at /public.php/dav/shares/<share token>
-				$rootCollection->addChild(new \OCA\DAV\Files\Sharing\RootCollection(
+				$rootCollection->addChild(new RootCollection(
 					$root,
 					$userPrincipalBackend,
 					'principals/shares',

apps/dav/lib/Events/CalendarShareUpdatedEvent.php

@@ -8,6 +8,7 @@
  */
 namespace OCA\DAV\Events;
 
+use OCA\DAV\CalDAV\CalDavBackend;
 use OCP\EventDispatcher\Event;
 
 /**
@@ -16,7 +17,7 @@
  * @package OCA\DAV\Events
  * @since 20.0.0
  *
- * @psalm-import-type CalendarInfo from \OCA\DAV\CalDAV\CalDavBackend
+ * @psalm-import-type CalendarInfo from CalDavBackend
  */
 class CalendarShareUpdatedEvent extends Event {
 	/**

apps/dav/templates/settings-example-content.php

@@ -4,7 +4,7 @@
  * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-script('dav', 'settings-example-content');
+\OCP\Util::addScript('dav', 'settings-example-content', 'core');
 
 ?>
 

apps/dav/tests/integration/DAV/Sharing/CalDavSharingBackendTest.php

@@ -9,7 +9,9 @@
 
 namespace OCA\DAV\Tests\integration\DAV\Sharing;
 
+use OC\Memcache\NullCache;
 use OCA\DAV\CalDAV\Calendar;
+use OCA\DAV\CalDAV\Sharing\Service;
 use OCA\DAV\Connector\Sabre\Principal;
 use OCA\DAV\DAV\Sharing\Backend;
 use OCA\DAV\DAV\Sharing\SharingMapper;
@@ -50,11 +52,11 @@ protected function setUp(): void {
 		$this->principalBackend = $this->createMock(Principal::class);
 		$this->cacheFactory = $this->createMock(ICacheFactory::class);
 		$this->cacheFactory->method('createInMemory')
-			->willReturn(new \OC\Memcache\NullCache());
+			->willReturn(new NullCache());
 		$this->logger = new \Psr\Log\NullLogger();
 
 		$this->sharingMapper = new SharingMapper($this->db);
-		$this->sharingService = new \OCA\DAV\CalDAV\Sharing\Service($this->sharingMapper);
+		$this->sharingService = new Service($this->sharingMapper);
 
 		$this->sharingBackend = new \OCA\DAV\CalDAV\Sharing\Backend(
 			$this->userManager,

apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php

@@ -15,6 +15,7 @@
 use OCA\DAV\Connector\Sabre\Directory;
 use OCA\DAV\Connector\Sabre\Exception\Forbidden;
 use OCA\DAV\Connector\Sabre\Exception\InvalidPath;
+use OCA\Files_Sharing\External\Storage;
 use OCP\Constants;
 use OCP\Files\ForbiddenException;
 use OCP\Files\InvalidPathException;
@@ -286,7 +287,7 @@ public function testGetQuotaInfoUnlimited(): void {
 			->willReturnMap([
 				['\OCA\Files_Sharing\SharedStorage', false],
 				['\OC\Files\Storage\Wrapper\Quota', false],
-				[\OCA\Files_Sharing\External\Storage::class, false],
+				[Storage::class, false],
 			]);
 
 		$storage->expects($this->once())
@@ -342,7 +343,7 @@ public function testGetQuotaInfoSpecific(): void {
 			->willReturnMap([
 				['\OCA\Files_Sharing\SharedStorage', false],
 				['\OC\Files\Storage\Wrapper\Quota', true],
-				[\OCA\Files_Sharing\External\Storage::class, false],
+				[Storage::class, false],
 			]);
 
 		$storage->expects($this->once())

apps/files_sharing/lib/External/Scanner.php

@@ -6,6 +6,7 @@
  */
 namespace OCA\Files_Sharing\External;
 
+use OC\Files\Cache\CacheEntry;
 use OC\ForbiddenException;
 use OCP\Files\NotFoundException;
 use OCP\Files\StorageInvalidException;
@@ -29,7 +30,7 @@ public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $loc
 	 * @param string $file file to scan
 	 * @param int $reuseExisting
 	 * @param int $parentId
-	 * @param \OC\Files\Cache\CacheEntry|array|null|false $cacheData existing data in the cache for the file to be scanned
+	 * @param CacheEntry|array|null|false $cacheData existing data in the cache for the file to be scanned
 	 * @param bool $lock set to false to disable getting an additional read lock during scanning
 	 * @param array|null $data the metadata for the file, as returned by the storage
 	 * @return array|null an array of metadata of the scanned file

apps/files_trashbin/lib/Command/CleanUp.php

@@ -11,6 +11,7 @@
 use OCP\IDBConnection;
 use OCP\IUserBackend;
 use OCP\IUserManager;
+use OCP\Util;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Exception\InvalidOptionException;
 use Symfony\Component\Console\Input\InputArgument;
@@ -96,7 +97,7 @@ protected function removeDeletedFiles(string $uid, OutputInterface $output, bool
 			$node = $this->rootFolder->get($path);
 
 			if ($verbose) {
-				$output->writeln('Deleting <info>' . \OCP\Util::humanFileSize($node->getSize()) . "</info> in trash for <info>$uid</info>.");
+				$output->writeln('Deleting <info>' . Util::humanFileSize($node->getSize()) . "</info> in trash for <info>$uid</info>.");
 			}
 			$node->delete();
 			if ($this->rootFolder->nodeExists($path)) {

apps/files_trashbin/lib/Command/Size.php

@@ -13,6 +13,7 @@
 use OCP\IConfig;
 use OCP\IUser;
 use OCP\IUserManager;
+use OCP\Util;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -45,7 +46,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$size = $input->getArgument('size');
 
 		if ($size) {
-			$parsedSize = \OCP\Util::computerFileSize($size);
+			$parsedSize = Util::computerFileSize($size);
 			if ($parsedSize === false) {
 				$output->writeln('<error>Failed to parse input size</error>');
 				return -1;
@@ -70,7 +71,7 @@ private function printTrashbinSize(InputInterface $input, OutputInterface $outpu
 		if ($globalSize < 0) {
 			$globalHumanSize = 'default (50% of available space)';
 		} else {
-			$globalHumanSize = \OCP\Util::humanFileSize($globalSize);
+			$globalHumanSize = Util::humanFileSize($globalSize);
 		}
 
 		if ($user) {
@@ -79,7 +80,7 @@ private function printTrashbinSize(InputInterface $input, OutputInterface $outpu
 			if ($userSize < 0) {
 				$userHumanSize = ($globalSize < 0) ? $globalHumanSize : "default($globalHumanSize)";
 			} else {
-				$userHumanSize = \OCP\Util::humanFileSize($userSize);
+				$userHumanSize = Util::humanFileSize($userSize);
 			}
 
 			if ($input->getOption('output') == self::OUTPUT_FORMAT_PLAIN) {
@@ -106,7 +107,7 @@ private function printTrashbinSize(InputInterface $input, OutputInterface $outpu
 				if (count($userValues)) {
 					$output->writeln('Per-user sizes:');
 					$this->writeArrayInOutputFormat($input, $output, array_map(function ($size) {
-						return \OCP\Util::humanFileSize($size);
+						return Util::humanFileSize($size);
 					}, $userValues));
 				} else {
 					$output->writeln('No per-user sizes configured');

apps/files_trashbin/tests/TrashbinTest.php

@@ -12,6 +12,7 @@
 use OC\Files\Storage\Local;
 use OC\Files\View;
 use OC\SystemConfig;
+use OC\User\Database;
 use OCA\Files_Sharing\AppInfo\Application;
 use OCA\Files_Trashbin\AppInfo\Application as TrashbinApplication;
 use OCA\Files_Trashbin\Expiration;
@@ -59,7 +60,7 @@ public static function setUpBeforeClass(): void {
 
 		// reset backend
 		Server::get(IUserManager::class)->clearBackends();
-		Server::get(IUserManager::class)->registerBackend(new \OC\User\Database());
+		Server::get(IUserManager::class)->registerBackend(new Database());
 
 		// clear share hooks
 		\OC_Hook::clear('OCP\\Share');

apps/files_versions/lib/Listener/FileEventsListener.php

@@ -36,6 +36,7 @@
 use OCP\Files\IMimeTypeLoader;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
+use OCP\Files\NotFoundException;
 use OCP\IUserSession;
 use Psr\Log\LoggerInterface;
 
@@ -378,7 +379,7 @@ private function getPathForNode(Node $node): ?string {
 
 		try {
 			$owner = $node->getOwner()?->getUid();
-		} catch (\OCP\Files\NotFoundException) {
+		} catch (NotFoundException) {
 			$owner = null;
 		}
 

apps/files_versions/tests/VersioningTest.php

@@ -808,7 +808,7 @@ private function doTestRestore() {
 
 		$eventDispatcher = Server::get(IEventDispatcher::class);
 		$eventFired = false;
-		$eventDispatcher->addListener(VersionRestoredEvent::class, function ($event) use (&$eventFired, $t2) {
+		$eventDispatcher->addListener(VersionRestoredEvent::class, function ($event) use (&$eventFired, $t2): void {
 			$eventFired = true;
 			$this->assertEquals('/sub/test.txt', $event->getVersion()->getVersionPath());
 			$this->assertTrue($event->getVersion()->getRevisionId() > 0);

apps/settings/lib/Settings/Admin/Mail.php

@@ -9,6 +9,7 @@
 use OCP\IBinaryFinder;
 use OCP\IConfig;
 use OCP\IL10N;
+use OCP\Server;
 use OCP\Settings\IDelegatedSettings;
 
 class Mail implements IDelegatedSettings {
@@ -26,7 +27,7 @@ public function __construct(
 	 * @return TemplateResponse
 	 */
 	public function getForm() {
-		$finder = \OCP\Server::get(IBinaryFinder::class);
+		$finder = Server::get(IBinaryFinder::class);
 
 		$parameters = [
 			// Mail

apps/settings/lib/Settings/Personal/PersonalInfo.php

@@ -29,6 +29,7 @@
 use OCP\Notification\IManager;
 use OCP\Server;
 use OCP\Settings\ISettings;
+use OCP\Util;
 
 class PersonalInfo implements ISettings {
 
@@ -71,7 +72,7 @@ public function getForm(): TemplateResponse {
 		if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
 			$totalSpace = $this->l->t('Unlimited');
 		} else {
-			$totalSpace = \OCP\Util::humanFileSize($storageInfo['total']);
+			$totalSpace = Util::humanFileSize($storageInfo['total']);
 		}
 
 		$messageParameters = $this->getMessageParameters($account);
@@ -88,7 +89,7 @@ public function getForm(): TemplateResponse {
 			'groups' => $this->getGroups($user),
 			'quota' => $storageInfo['quota'],
 			'totalSpace' => $totalSpace,
-			'usage' => \OCP\Util::humanFileSize($storageInfo['used']),
+			'usage' => Util::humanFileSize($storageInfo['used']),
 			'usageRelative' => round($storageInfo['relative']),
 			'displayName' => $this->getProperty($account, IAccountManager::PROPERTY_DISPLAYNAME),
 			'emailMap' => $this->getEmailMap($account),

apps/user_ldap/lib/User/User.php

@@ -563,7 +563,7 @@ public function updateQuota(?string $valueFromLDAP = null): void {
 	}
 
 	private function verifyQuotaValue(string $quotaValue): bool {
-		return $quotaValue === 'none' || $quotaValue === 'default' || \OCP\Util::computerFileSize($quotaValue) !== false;
+		return $quotaValue === 'none' || $quotaValue === 'default' || Util::computerFileSize($quotaValue) !== false;
 	}
 
 	/**

vendor-bin/rector/composer.json

@@ -1,6 +1,6 @@
 {
     "require-dev": {
-        "rector/rector": "^1.2",
-        "nextcloud/rector": "^0.3.1"
+        "rector/rector": "^2.0",
+        "nextcloud/rector": "^0.4.1"
     }
 }