Merge pull request #55360 from nextcloud/refactor/rector

provokateurin · web-flow · commit 81d0c73700fa · 2025-09-28T12:28:46.000+02:00
diff --git a/REUSE.toml b/REUSE.toml
@@ -250,7 +250,7 @@ SPDX-FileCopyrightText = "2023 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 
 [[annotations]]
-path = ["apps/dav/lib/ExampleContentFiles/exampleContact.vcf", "tests/data/testvideo-remote-file.mp4"]
+path = ["apps/dav/lib/ExampleContentFiles/exampleContact.vcf", "tests/data/testvideo-remote-file.mp4", "tests/lib/AppFramework/Middleware/Mock/UseSessionController.php", "tests/lib/AppFramework/Middleware/Security/Mock/BruteForceMiddlewareController.php", "tests/lib/AppFramework/Middleware/Security/Mock/RateLimitingMiddlewareController.php"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
diff --git a/apps/comments/lib/Search/Result.php b/apps/comments/lib/Search/Result.php
@@ -34,10 +34,6 @@ class Result extends BaseResult {
 	 * @deprecated 20.0.0
 	 */
 	public $fileName;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public int $fileId;
 
 	/**
 	 * @throws NotFoundException
@@ -51,7 +47,10 @@ public function __construct(
 		 */
 		public string $authorName,
 		string $path,
-		int $fileId,
+		/**
+		 * @deprecated 20.0.0
+		 */
+		public int $fileId,
 	) {
 		parent::__construct(
 			$comment->getId(),
@@ -63,7 +62,6 @@ public function __construct(
 		$this->authorId = $comment->getActorId();
 		$this->fileName = basename($path);
 		$this->path = $this->getVisiblePath($path);
-		$this->fileId = $fileId;
 	}
 
 	/**
diff --git a/apps/dav/appinfo/v1/caldav.php b/apps/dav/appinfo/v1/caldav.php
@@ -24,6 +24,7 @@
 use OCP\Accounts\IAccountManager;
 use OCP\App\IAppManager;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
@@ -78,7 +79,7 @@
 	$config,
 	Server::get(\OCA\DAV\CalDAV\Sharing\Backend::class),
 	Server::get(FederatedCalendarMapper::class),
-	Server::get(\OCP\ICacheFactory::class),
+	Server::get(ICacheFactory::class),
 	true
 );
 
diff --git a/apps/dav/lib/CalDAV/Federation/CalendarFederationProvider.php b/apps/dav/lib/CalDAV/Federation/CalendarFederationProvider.php
@@ -11,6 +11,7 @@
 
 use OCA\DAV\BackgroundJob\FederatedCalendarSyncJob;
 use OCA\DAV\CalDAV\Federation\Protocol\CalendarFederationProtocolV1;
+use OCA\DAV\CalDAV\Federation\Protocol\CalendarProtocolParseException;
 use OCA\DAV\CalDAV\Federation\Protocol\ICalendarFederationProtocol;
 use OCA\DAV\DAV\Sharing\Backend as DavSharingBackend;
 use OCP\AppFramework\Http;
@@ -74,7 +75,7 @@ public function shareReceived(ICloudFederationShare $share): string {
 			case CalendarFederationProtocolV1::VERSION:
 				try {
 					$protocol = CalendarFederationProtocolV1::parse($rawProtocol);
-				} catch (Protocol\CalendarProtocolParseException $e) {
+				} catch (CalendarProtocolParseException $e) {
 					throw new ProviderCouldNotAddShareException(
 						'Invalid protocol data (v1)',
 						'',
diff --git a/apps/dav/lib/DAV/RemoteUserPrincipalBackend.php b/apps/dav/lib/DAV/RemoteUserPrincipalBackend.php
@@ -10,6 +10,7 @@
 namespace OCA\DAV\DAV;
 
 use OCA\DAV\DAV\Sharing\SharingMapper;
+use OCP\Federation\ICloudId;
 use OCP\Federation\ICloudIdManager;
 use Sabre\DAVACL\PrincipalBackend\BackendInterface;
 
@@ -102,7 +103,7 @@ public function setGroupMemberSet($principal, array $members) {
 	}
 
 	/**
-	 * @return array{'{DAV:}displayname': string, '{http://nextcloud.com/ns}cloud-id': \OCP\Federation\ICloudId, uri: string}
+	 * @return array{'{DAV:}displayname': string, '{http://nextcloud.com/ns}cloud-id': ICloudId, uri: string}
 	 */
 	private function principalUriToPrincipal(string $principalUri): array {
 		[, $name] = \Sabre\Uri\split($principalUri);
diff --git a/apps/dav/tests/unit/Connector/Sabre/PropFindMonitorPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/PropFindMonitorPluginTest.php
@@ -105,9 +105,7 @@ public static function dataTest(): array {
 		];
 	}
 
-	/**
-	 * @dataProvider dataTest
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTest')]
 	public function test(array $queries, $expectedLogCalls): void {
 		$this->plugin->initialize($this->server);
 		$this->server->expects($this->once())->method('getPluginQueries')
diff --git a/apps/encryption/lib/Controller/RecoveryController.php b/apps/encryption/lib/Controller/RecoveryController.php
@@ -25,13 +25,13 @@ class RecoveryController extends Controller {
 	 * @param Recovery $recovery
 	 */
 	public function __construct(
-		$AppName,
+		$appName,
 		IRequest $request,
 		private IConfig $config,
 		private IL10N $l,
 		private Recovery $recovery,
 	) {
-		parent::__construct($AppName, $request);
+		parent::__construct($appName, $request);
 	}
 
 	/**
diff --git a/apps/encryption/lib/Controller/SettingsController.php b/apps/encryption/lib/Controller/SettingsController.php
@@ -37,7 +37,7 @@ class SettingsController extends Controller {
 	 * @param Util $util
 	 */
 	public function __construct(
-		$AppName,
+		$appName,
 		IRequest $request,
 		private IL10N $l,
 		private IUserManager $userManager,
@@ -48,7 +48,7 @@ public function __construct(
 		private ISession $ocSession,
 		private Util $util,
 	) {
-		parent::__construct($AppName, $request);
+		parent::__construct($appName, $request);
 	}
 
 
diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php
@@ -25,13 +25,13 @@ class StatusController extends Controller {
 	 * @param IManager $encryptionManager
 	 */
 	public function __construct(
-		$AppName,
+		$appName,
 		IRequest $request,
 		private IL10N $l,
 		private Session $session,
 		private IManager $encryptionManager,
 	) {
-		parent::__construct($AppName, $request);
+		parent::__construct($appName, $request);
 	}
 
 	/**
diff --git a/apps/federation/lib/Controller/SettingsController.php b/apps/federation/lib/Controller/SettingsController.php
@@ -22,13 +22,13 @@
 
 class SettingsController extends OCSController {
 	public function __construct(
-		string $AppName,
+		string $appName,
 		IRequest $request,
 		private IL10N $l,
 		private TrustedServers $trustedServers,
 		private LoggerInterface $logger,
 	) {
-		parent::__construct($AppName, $request);
+		parent::__construct($appName, $request);
 	}
 
 
diff --git a/apps/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php
@@ -36,7 +36,7 @@ class GlobalStoragesController extends StoragesController {
 	 * @param IConfig $config
 	 */
 	public function __construct(
-		$AppName,
+		$appName,
 		IRequest $request,
 		IL10N $l10n,
 		GlobalStoragesService $globalStoragesService,
@@ -46,7 +46,7 @@ public function __construct(
 		IConfig $config,
 	) {
 		parent::__construct(
-			$AppName,
+			$appName,
 			$request,
 			$l10n,
 			$globalStoragesService,
diff --git a/apps/files_external/lib/Controller/StoragesController.php b/apps/files_external/lib/Controller/StoragesController.php
@@ -40,7 +40,7 @@ abstract class StoragesController extends Controller {
 	 * @param LoggerInterface $logger
 	 */
 	public function __construct(
-		$AppName,
+		$appName,
 		IRequest $request,
 		protected IL10N $l10n,
 		protected StoragesService $service,
@@ -49,7 +49,7 @@ public function __construct(
 		protected IGroupManager $groupManager,
 		protected IConfig $config,
 	) {
-		parent::__construct($AppName, $request);
+		parent::__construct($appName, $request);
 	}
 
 	/**
diff --git a/apps/files_external/lib/Controller/UserGlobalStoragesController.php b/apps/files_external/lib/Controller/UserGlobalStoragesController.php
@@ -42,7 +42,7 @@ class UserGlobalStoragesController extends StoragesController {
 	 * @param IGroupManager $groupManager
 	 */
 	public function __construct(
-		$AppName,
+		$appName,
 		IRequest $request,
 		IL10N $l10n,
 		UserGlobalStoragesService $userGlobalStoragesService,
@@ -52,7 +52,7 @@ public function __construct(
 		IConfig $config,
 	) {
 		parent::__construct(
-			$AppName,
+			$appName,
 			$request,
 			$l10n,
 			$userGlobalStoragesService,
diff --git a/apps/files_external/lib/Controller/UserStoragesController.php b/apps/files_external/lib/Controller/UserStoragesController.php
@@ -39,7 +39,7 @@ class UserStoragesController extends StoragesController {
 	 * @param IGroupManager $groupManager
 	 */
 	public function __construct(
-		$AppName,
+		$appName,
 		IRequest $request,
 		IL10N $l10n,
 		UserStoragesService $userStoragesService,
@@ -49,7 +49,7 @@ public function __construct(
 		IConfig $config,
 	) {
 		parent::__construct(
-			$AppName,
+			$appName,
 			$request,
 			$l10n,
 			$userStoragesService,
diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php
@@ -240,8 +240,8 @@ public function testCreateShareLink(): void {
 
 	/**
 	 * @group RoutingWeirdness
-	 * @dataProvider dataAllowFederationOnPublicShares
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataAllowFederationOnPublicShares')]
 	public function testCreateShareLinkPublicUpload(array $appConfig, int $permissions): void {
 		$this->appConfig->method('getValueBool')
 			->willReturnMap([$appConfig]);
@@ -1016,8 +1016,8 @@ public function testUpdateShare(): void {
 
 	/**
 	 * @medium
-	 * @dataProvider dataAllowFederationOnPublicShares
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataAllowFederationOnPublicShares')]
 	public function testUpdateShareUpload(array $appConfig, int $permissions): void {
 		$this->appConfig->method('getValueBool')->willReturnMap([
 			$appConfig,
diff --git a/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php b/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php
@@ -19,6 +19,7 @@
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Lock\ILockingProvider;
+use OCP\Lock\LockedException;
 use Psr\Log\LoggerInterface;
 
 class ExpireTrash extends TimedJob {
@@ -111,7 +112,7 @@ private function getNextOffset(): int {
 	}
 
 	private function resetOffset() {
-		$this->runMutexOperation(function () {
+		$this->runMutexOperation(function (): void {
 			$this->appConfig->setValueInt(Application::APP_ID, self::OFFSET_CONFIG_KEY_NAME, 0);
 		});
 	}
@@ -123,7 +124,7 @@ private function runMutexOperation($operation): mixed {
 			try {
 				$this->lockingProvider->acquireLock(self::OFFSET_CONFIG_KEY_NAME, ILockingProvider::LOCK_EXCLUSIVE, 'Expire trashbin background job offset');
 				$acquired = true;
-			} catch (\OCP\Lock\LockedException $e) {
+			} catch (LockedException $e) {
 				// wait a bit and try again
 				usleep(100000);
 			}
diff --git a/apps/files_trashbin/tests/Command/ExpireTrashTest.php b/apps/files_trashbin/tests/Command/ExpireTrashTest.php
@@ -64,9 +64,7 @@ protected function tearDown(): void {
 		parent::tearDown();
 	}
 
-	/**
-	 * @dataProvider retentionObligationProvider
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('retentionObligationProvider')]
 	public function testRetentionObligation(string $obligation, string $quota, int $elapsed, int $fileSize, bool $shouldExpire): void {
 		$this->config->setSystemValues(['trashbin_retention_obligation' => $obligation]);
 		$this->expiration->setRetentionObligation($obligation);
diff --git a/apps/settings/lib/Controller/AuthorizedGroupController.php b/apps/settings/lib/Controller/AuthorizedGroupController.php
@@ -16,11 +16,11 @@
 
 class AuthorizedGroupController extends Controller {
 	public function __construct(
-		string $AppName,
+		string $appName,
 		IRequest $request,
 		private AuthorizedGroupService $authorizedGroupService,
 	) {
-		parent::__construct($AppName, $request);
+		parent::__construct($appName, $request);
 	}
 
 	/**
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
@@ -31,7 +31,7 @@ class CheckSetupController extends Controller {
 	private $checker;
 
 	public function __construct(
-		$AppName,
+		$appName,
 		IRequest $request,
 		private IConfig $config,
 		private IURLGenerator $urlGenerator,
@@ -40,7 +40,7 @@ public function __construct(
 		private LoggerInterface $logger,
 		private ISetupCheckManager $setupCheckManager,
 	) {
-		parent::__construct($AppName, $request);
+		parent::__construct($appName, $request);
 		$this->checker = $checker;
 	}
 
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
@@ -71,8 +71,6 @@
       <code><![CDATA[$result->authorId]]></code>
       <code><![CDATA[$result->authorId]]></code>
       <code><![CDATA[$result->authorId]]></code>
-      <code><![CDATA[$result->fileId]]></code>
-      <code><![CDATA[$result->fileId]]></code>
       <code><![CDATA[$result->name]]></code>
       <code><![CDATA[$result->path]]></code>
     </DeprecatedProperty>
@@ -111,7 +109,6 @@
     <DeprecatedProperty>
       <code><![CDATA[$this->authorId]]></code>
       <code><![CDATA[$this->comment]]></code>
-      <code><![CDATA[$this->fileId]]></code>
       <code><![CDATA[$this->fileName]]></code>
       <code><![CDATA[$this->path]]></code>
     </DeprecatedProperty>
diff --git a/build/rector.php b/build/rector.php
@@ -77,6 +77,9 @@ public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedO
 		$nextcloudDir . '/apps/*/build/stubs/*',
 		$nextcloudDir . '/apps/*/composer/*',
 		$nextcloudDir . '/apps/*/config/*',
+		// The mock classes are excluded, as the tests explicitly test the annotations which should not be migrated to attributes
+		$nextcloudDir . '/tests/lib/AppFramework/Middleware/Mock/*',
+		$nextcloudDir . '/tests/lib/AppFramework/Middleware/Security/Mock/*',
 	])
 	// uncomment to reach your current PHP version
 	// ->withPhpSets()
@@ -92,7 +95,7 @@ public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedO
 		'rename_property' => true,
 	])
 	->withSets([
-		NextcloudSets::NEXTCLOUD_25,
+		NextcloudSets::NEXTCLOUD_27,
 	]);
 
 $config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class);
diff --git a/console.php b/console.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use OCP\IConfig;
+use OCP\IURLGenerator;
 use OCP\Server;
 
 /**
@@ -100,7 +101,7 @@ function exceptionHandler($exception) {
 		$profile->setUrl(implode(' ', $argv));
 		$profiler->saveProfile($profile);
 
-		$urlGenerator = Server::get(\OCP\IURLGenerator::class);
+		$urlGenerator = Server::get(IURLGenerator::class);
 		$url = $urlGenerator->linkToRouteAbsolute('profiler.main.profiler', [
 			'profiler' => 'db',
 			'token' => $profile->getToken(),
diff --git a/core/Command/Base.php b/core/Command/Base.php
@@ -8,6 +8,8 @@
 namespace OC\Core\Command;
 
 use OC\Core\Command\User\ListCommand;
+use OCP\Defaults;
+use OCP\Server;
 use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 use Symfony\Component\Console\Command\Command;
@@ -27,7 +29,7 @@ class Base extends Command implements CompletionAwareInterface {
 
 	protected function configure() {
 		// Some of our commands do not extend this class; and some of those that do do not call parent::configure()
-		$defaultHelp = 'More extensive and thorough documentation may be found at ' . \OCP\Server::get(\OCP\Defaults::class)->getDocBaseUrl() . PHP_EOL;
+		$defaultHelp = 'More extensive and thorough documentation may be found at ' . Server::get(Defaults::class)->getDocBaseUrl() . PHP_EOL;
 		$this
 			->setHelp($defaultHelp)
 			->addOption(
diff --git a/core/Controller/TwoFactorChallengeController.php b/core/Controller/TwoFactorChallengeController.php
diff --git a/tests/lib/AppFramework/Middleware/Mock/UseSessionController.php b/tests/lib/AppFramework/Middleware/Mock/UseSessionController.php
diff --git a/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php
diff --git a/tests/lib/AppFramework/Middleware/Security/Mock/BruteForceMiddlewareController.php b/tests/lib/AppFramework/Middleware/Security/Mock/BruteForceMiddlewareController.php
diff --git a/tests/lib/AppFramework/Middleware/Security/Mock/RateLimitingMiddlewareController.php b/tests/lib/AppFramework/Middleware/Security/Mock/RateLimitingMiddlewareController.php
diff --git a/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php
diff --git a/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php b/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php
diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
diff --git a/tests/lib/SystemTag/SystemTagObjectMapperTest.php b/tests/lib/SystemTag/SystemTagObjectMapperTest.php
