3 files changed, 41 insertions, 15 deletions

diff --git a/lib/private/Repair/ConfigKeyMigration.php b/lib/private/Repair/ConfigKeyMigration.php
new file mode 100644
index 00000000000..da4aa153dc5
--- /dev/null
+++ b/lib/private/Repair/ConfigKeyMigration.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OC\Repair;
+
+use OC\Config\ConfigManager;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+class ConfigKeyMigration implements IRepairStep {
+	public function __construct(
+		private ConfigManager $configManager,
+	) {
+	}
+
+	public function getName(): string {
+		return 'Migrate config keys';
+	}
+
+	public function run(IOutput $output) {
+		$this->configManager->migrateConfigLexiconKeys();
+	}
+}
diff --git a/lib/private/Repair/MoveUpdaterStepFile.php b/lib/private/Repair/MoveUpdaterStepFile.php
index c9b51b308c4..eb9f78b0a39 100644
--- a/lib/private/Repair/MoveUpdaterStepFile.php
+++ b/lib/private/Repair/MoveUpdaterStepFile.php
@@ -5,6 +5,7 @@
  */
 namespace OC\Repair;
 
+use OCP\Files;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
 
@@ -40,7 +41,7 @@ class MoveUpdaterStepFile implements IRepairStep {
 
 			// cleanup
 			if (file_exists($previousStepFile)) {
-				if (\OC_Helper::rmdirr($previousStepFile)) {
+				if (Files::rmdirr($previousStepFile)) {
 					$output->info('.step-previous-update removed');
 				} else {
 					$output->info('.step-previous-update can\'t be removed - abort move of .step file');
diff --git a/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php b/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
index a9cbbb4cbbf..646dd2c5e83 100644
--- a/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
+++ b/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
@@ -6,9 +6,10 @@ declare(strict_types=1);
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OC\Repair\NC16;
 
-use OCP\Files\IAppData;
+use OCP\Files\AppData\IAppDataFactory;
 use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFolder;
 use OCP\IConfig;
@@ -27,18 +28,11 @@ use RuntimeException;
  * photo could be returned for this vcard. These invalid files are removed by this migration step.
  */
 class CleanupCardDAVPhotoCache implements IRepairStep {
-	/** @var IConfig */
-	private $config;
-
-	/** @var IAppData */
-	private $appData;
-
-	private LoggerInterface $logger;
-
-	public function __construct(IConfig $config, IAppData $appData, LoggerInterface $logger) {
-		$this->config = $config;
-		$this->appData = $appData;
-		$this->logger = $logger;
+	public function __construct(
+		private IConfig $config,
+		private IAppDataFactory $appDataFactory,
+		private LoggerInterface $logger,
+	) {
 	}
 
 	public function getName(): string {
@@ -46,8 +40,10 @@ class CleanupCardDAVPhotoCache implements IRepairStep {
 	}
 
 	private function repair(IOutput $output): void {
+		$photoCacheAppData = $this->appDataFactory->get('dav-photocache');
+
 		try {
-			$folders = $this->appData->getDirectoryListing();
+			$folders = $photoCacheAppData->getDirectoryListing();
 		} catch (NotFoundException $e) {
 			return;
 		} catch (RuntimeException $e) {