Merge pull request #52820 from nextcloud/refactor/rector-core

Author: provokateurin

apps/files/lib/Command/Copy.php

@@ -19,10 +19,9 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class Copy extends Command {
-	private FileUtils $fileUtils;
-
-	public function __construct(FileUtils $fileUtils) {
-		$this->fileUtils = $fileUtils;
+	public function __construct(
+		private FileUtils $fileUtils,
+	) {
 		parent::__construct();
 	}
 

apps/files/lib/Command/Move.php

@@ -20,10 +20,9 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class Move extends Command {
-	private FileUtils $fileUtils;
-
-	public function __construct(FileUtils $fileUtils) {
-		$this->fileUtils = $fileUtils;
+	public function __construct(
+		private FileUtils $fileUtils,
+	) {
 		parent::__construct();
 	}
 

apps/files_trashbin/tests/TrashbinTest.php

@@ -118,7 +118,7 @@ protected function setUp(): void {
 		$config = Server::get(IConfig::class);
 		$mockConfig = $this->getMockBuilder(AllConfig::class)
 			->onlyMethods(['getSystemValue'])
-			->setConstructorArgs([Server::get(\OC\SystemConfig::class)])
+			->setConstructorArgs([Server::get(SystemConfig::class)])
 			->getMock();
 		$mockConfig->expects($this->any())
 			->method('getSystemValue')

apps/files_versions/tests/VersioningTest.php

@@ -85,7 +85,7 @@ protected function setUp(): void {
 		$config = Server::get(IConfig::class);
 		$mockConfig = $this->getMockBuilder(AllConfig::class)
 			->onlyMethods(['getSystemValue'])
-			->setConstructorArgs([Server::get(\OC\SystemConfig::class)])
+			->setConstructorArgs([Server::get(SystemConfig::class)])
 			->getMock();
 		$mockConfig->expects($this->any())
 			->method('getSystemValue')

apps/settings/lib/UserMigration/AccountMigrator.php

@@ -35,8 +35,6 @@ class AccountMigrator implements IMigrator, ISizeEstimationMigrator {
 
 	private ProfileManager $profileManager;
 
-	private ProfileConfigMapper $configMapper;
-
 	private const PATH_ROOT = Application::APP_ID . '/';
 
 	private const PATH_ACCOUNT_FILE = AccountMigrator::PATH_ROOT . 'account.json';
@@ -49,11 +47,10 @@ public function __construct(
 		private IAccountManager $accountManager,
 		private IAvatarManager $avatarManager,
 		ProfileManager $profileManager,
-		ProfileConfigMapper $configMapper,
+		private ProfileConfigMapper $configMapper,
 		private IL10N $l10n,
 	) {
 		$this->profileManager = $profileManager;
-		$this->configMapper = $configMapper;
 	}
 
 	/**

build/rector.php

@@ -52,9 +52,9 @@ public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedO
 $config = RectorConfig::configure()
 	->withPaths([
 		$nextcloudDir . '/apps',
+		$nextcloudDir . '/core',
 		$nextcloudDir . '/status.php',
 		// $nextcloudDir . '/config',
-		// $nextcloudDir . '/core',
 		// $nextcloudDir . '/lib',
 		// $nextcloudDir . '/ocs',
 		// $nextcloudDir . '/ocs-provider',

core/Application.php

@@ -54,7 +54,7 @@ public function __construct() {
 		$notificationManager->registerNotifierService(CoreNotifier::class);
 		$notificationManager->registerNotifierService(AuthenticationNotifier::class);
 
-		$eventDispatcher->addListener(AddMissingIndicesEvent::class, function (AddMissingIndicesEvent $event) {
+		$eventDispatcher->addListener(AddMissingIndicesEvent::class, function (AddMissingIndicesEvent $event): void {
 			$event->addMissingIndex(
 				'share',
 				'share_with_index',
@@ -244,7 +244,7 @@ public function __construct() {
 			);
 		});
 
-		$eventDispatcher->addListener(AddMissingPrimaryKeyEvent::class, function (AddMissingPrimaryKeyEvent $event) {
+		$eventDispatcher->addListener(AddMissingPrimaryKeyEvent::class, function (AddMissingPrimaryKeyEvent $event): void {
 			$event->addMissingPrimaryKey(
 				'federated_reshares',
 				'federated_res_pk',

core/BackgroundJobs/CheckForUserCertificates.php

@@ -32,7 +32,7 @@ public function __construct(
 	 */
 	public function run($arguments): void {
 		$uploadList = [];
-		$this->userManager->callForSeenUsers(function (IUser $user) use (&$uploadList) {
+		$this->userManager->callForSeenUsers(function (IUser $user) use (&$uploadList): void {
 			$userId = $user->getUID();
 			try {
 				\OC_Util::setupFS($userId);

core/BackgroundJobs/GenerateMetadataJob.php

@@ -8,6 +8,7 @@
 
 namespace OC\Core\BackgroundJobs;
 
+use OC\Files\Mount\MoveableMount;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
 use OCP\BackgroundJob\TimedJob;
@@ -83,7 +84,7 @@ private function scanFilesForUser(string $userId): void {
 
 	private function scanFolder(Folder $folder): void {
 		// Do not scan share and other moveable mounts.
-		if ($folder->getMountPoint() instanceof \OC\Files\Mount\MoveableMount) {
+		if ($folder->getMountPoint() instanceof MoveableMount) {
 			return;
 		}
 

core/BackgroundJobs/LookupServerSendCheckBackgroundJob.php

@@ -27,7 +27,7 @@ public function __construct(
 	 * @param array $argument
 	 */
 	public function run($argument): void {
-		$this->userManager->callForSeenUsers(function (IUser $user) {
+		$this->userManager->callForSeenUsers(function (IUser $user): void {
 			// If the user data was not updated yet (check if LUS is enabled and if then update on LUS or delete on LUS)
 			// then we need to flag the user data to be checked
 			if ($this->config->getUserValue($user->getUID(), 'lookup_server_connector', 'dataSend', '') === '') {