refactor: Extend rector to core/

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', '') === '') {

core/Command/App/Update.php

@@ -9,6 +9,7 @@
 namespace OC\Core\Command\App;
 
 use OC\Installer;
+use OCP\App\AppPathNotFoundException;
 use OCP\App\IAppManager;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
@@ -64,7 +65,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$apps = [$singleAppId];
 			try {
 				$this->manager->getAppPath($singleAppId);
-			} catch (\OCP\App\AppPathNotFoundException $e) {
+			} catch (AppPathNotFoundException $e) {
 				$output->writeln($singleAppId . ' not installed');
 				return 1;
 			}

core/Command/Background/Job.php

@@ -10,6 +10,8 @@
 
 use OCP\BackgroundJob\IJob;
 use OCP\BackgroundJob\IJobList;
+use OCP\BackgroundJob\QueuedJob;
+use OCP\BackgroundJob\TimedJob;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -75,7 +77,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$output->writeln('<info>Job executed!</info>');
 			$output->writeln('');
 
-			if ($job instanceof \OCP\BackgroundJob\TimedJob) {
+			if ($job instanceof TimedJob) {
 				$this->printJobInfo($jobId, $job, $output);
 			}
 		} else {
@@ -99,10 +101,10 @@ protected function printJobInfo(int $jobId, IJob $job, OutputInterface $output):
 		$output->writeln('Job class:            ' . get_class($job));
 		$output->writeln('Arguments:            ' . json_encode($job->getArgument()));
 
-		$isTimedJob = $job instanceof \OCP\BackgroundJob\TimedJob;
+		$isTimedJob = $job instanceof TimedJob;
 		if ($isTimedJob) {
 			$output->writeln('Type:                 timed');
-		} elseif ($job instanceof \OCP\BackgroundJob\QueuedJob) {
+		} elseif ($job instanceof QueuedJob) {
 			$output->writeln('Type:                 queued');
 		} else {
 			$output->writeln('Type:                 job');

core/Command/Background/JobBase.php

@@ -10,12 +10,15 @@
 
 namespace OC\Core\Command\Background;
 
+use OC\Core\Command\Base;
 use OCP\BackgroundJob\IJob;
 use OCP\BackgroundJob\IJobList;
+use OCP\BackgroundJob\QueuedJob;
+use OCP\BackgroundJob\TimedJob;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-abstract class JobBase extends \OC\Core\Command\Base {
+abstract class JobBase extends Base {
 
 	public function __construct(
 		protected IJobList $jobList,
@@ -41,10 +44,10 @@ protected function printJobInfo(int $jobId, IJob $job, OutputInterface $output):
 		$output->writeln('Job class:            ' . get_class($job));
 		$output->writeln('Arguments:            ' . json_encode($job->getArgument()));
 
-		$isTimedJob = $job instanceof \OCP\BackgroundJob\TimedJob;
+		$isTimedJob = $job instanceof TimedJob;
 		if ($isTimedJob) {
 			$output->writeln('Type:                 timed');
-		} elseif ($job instanceof \OCP\BackgroundJob\QueuedJob) {
+		} elseif ($job instanceof QueuedJob) {
 			$output->writeln('Type:                 queued');
 		} else {
 			$output->writeln('Type:                 job');

core/Command/Broadcast/Test.php

@@ -44,16 +44,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$uid = $input->getArgument('uid');
 
 		$event = new class($name, $uid) extends ABroadcastedEvent {
-			/** @var string */
-			private $name;
-			/** @var string */
-			private $uid;
-
-			public function __construct(string $name,
-				string $uid) {
+			public function __construct(
+				private string $name,
+				private string $uid,
+			) {
 				parent::__construct();
-				$this->name = $name;
-				$this->uid = $uid;
 			}
 
 			public function broadcastAs(): string {

core/Command/Db/ConvertType.php

@@ -13,9 +13,11 @@
 use OC\DB\Connection;
 use OC\DB\ConnectionFactory;
 use OC\DB\MigrationService;
+use OC\DB\PgSqlTools;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\DB\Types;
 use OCP\IConfig;
+use OCP\Server;
 use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 use Symfony\Component\Console\Command\Command;
@@ -159,7 +161,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$this->readPassword($input, $output);
 
 		/** @var Connection $fromDB */
-		$fromDB = \OC::$server->get(Connection::class);
+		$fromDB = Server::get(Connection::class);
 		$toDB = $this->getToDBConnection($input, $output);
 
 		if ($input->getOption('clear-schema')) {
@@ -401,7 +403,7 @@ protected function convertDB(Connection $fromDB, Connection $toDB, array $tables
 				$this->copyTable($fromDB, $toDB, $schema->getTable($table), $input, $output);
 			}
 			if ($input->getArgument('type') === 'pgsql') {
-				$tools = new \OC\DB\PgSqlTools($this->config);
+				$tools = new PgSqlTools($this->config);
 				$tools->resynchronizeDatabaseSequences($toDB);
 			}
 			// save new database config

core/Command/Encryption/ListModules.php

@@ -57,7 +57,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 	 */
 	protected function writeModuleList(InputInterface $input, OutputInterface $output, $items) {
 		if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
-			array_walk($items, function (&$item) {
+			array_walk($items, function (&$item): void {
 				if (!$item['default']) {
 					$item = $item['displayName'];
 				} else {

core/Command/Info/File.php

@@ -9,6 +9,7 @@
 
 use OC\Files\ObjectStore\ObjectStoreStorage;
 use OC\Files\Storage\Wrapper\Encryption;
+use OC\Files\Storage\Wrapper\Wrapper;
 use OC\Files\View;
 use OCA\Files_External\Config\ExternalMountPoint;
 use OCA\GroupFolders\Mount\GroupMountPoint;
@@ -176,7 +177,7 @@ private function outputStorageDetails(IMountPoint $mountPoint, Node $node, Input
 		if ($input->getOption('storage-tree')) {
 			$storageTmp = $storage;
 			$storageClass = get_class($storageTmp) . ' (cache:' . get_class($storageTmp->getCache()) . ')';
-			while ($storageTmp instanceof \OC\Files\Storage\Wrapper\Wrapper) {
+			while ($storageTmp instanceof Wrapper) {
 				$storageTmp = $storageTmp->getWrapperStorage();
 				$storageClass .= "\n\t" . '> ' . get_class($storageTmp) . ' (cache:' . get_class($storageTmp->getCache()) . ')';
 			}

core/Command/Info/FileUtils.php

@@ -8,6 +8,7 @@
 
 namespace OC\Core\Command\Info;
 
+use OC\User\NoUserException;
 use OCA\Circles\MountManager\CircleMount;
 use OCA\Files_External\Config\ExternalMountPoint;
 use OCA\Files_Sharing\SharedMount;
@@ -21,6 +22,7 @@
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
 use OCP\Share\IShare;
 use OCP\Util;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -35,8 +37,8 @@ public function __construct(
 	/**
 	 * @param FileInfo $file
 	 * @return array<string, Node[]>
-	 * @throws \OCP\Files\NotPermittedException
-	 * @throws \OC\User\NoUserException
+	 * @throws NotPermittedException
+	 * @throws NoUserException
 	 */
 	public function getFilesByUser(FileInfo $file): array {
 		$id = $file->getId();

core/Command/Log/File.php

@@ -8,6 +8,7 @@
 namespace OC\Core\Command\Log;
 
 use OCP\IConfig;
+use OCP\Util;
 
 use Stecman\Component\Symfony\Console\BashCompletion\Completion;
 use Stecman\Component\Symfony\Console\BashCompletion\Completion\ShellPathCompletion;
@@ -61,7 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		}
 
 		if (($rotateSize = $input->getOption('rotate-size')) !== null) {
-			$rotateSize = \OCP\Util::computerFileSize($rotateSize);
+			$rotateSize = Util::computerFileSize($rotateSize);
 			$this->validateRotateSize($rotateSize);
 			$toBeSet['log_rotate_size'] = $rotateSize;
 		}
@@ -87,7 +88,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$rotateSize = $this->config->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
 		if ($rotateSize) {
-			$rotateString = \OCP\Util::humanFileSize($rotateSize);
+			$rotateString = Util::humanFileSize($rotateSize);
 		} else {
 			$rotateString = 'disabled';
 		}

core/Command/Maintenance/Install.php

@@ -15,6 +15,7 @@
 use OC\Migration\ConsoleOutput;
 use OC\Setup;
 use OC\SystemConfig;
+use OCP\Server;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
@@ -51,7 +52,7 @@ protected function configure(): void {
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		// validate the environment
-		$setupHelper = \OCP\Server::get(\OC\Setup::class);
+		$setupHelper = Server::get(Setup::class);
 		$sysInfo = $setupHelper->getSystemInfo(true);
 		$errors = $sysInfo['errors'];
 		if (count($errors) > 0) {

core/Command/Maintenance/UpdateHtaccess.php

@@ -7,6 +7,7 @@
  */
 namespace OC\Core\Command\Maintenance;
 
+use OC\Setup;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -19,7 +20,7 @@ protected function configure() {
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
-		if (\OC\Setup::updateHtaccess()) {
+		if (Setup::updateHtaccess()) {
 			$output->writeln('.htaccess has been updated');
 			return 0;
 		} else {

core/Command/Preview/Repair.php

@@ -86,7 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$output->writeln('');
 
 		$output->writeln('Fetching previews that need to be migrated …');
-		/** @var \OCP\Files\Folder $currentPreviewFolder */
+		/** @var Folder $currentPreviewFolder */
 		$currentPreviewFolder = $this->rootFolder->get("appdata_$instanceId/preview");
 
 		$directoryListing = $currentPreviewFolder->getDirectoryListing();