Merge pull request #31925 from nextcloud/fix/user_migration-use-id-for-migrators

Use Migrators id instead of class names

Author: come-nc

apps/dav/lib/UserMigration/CalendarMigrator.php

@@ -414,7 +414,7 @@ function (array $componentNames, VObjectComponent $component) {
 	 * @throws CalendarMigratorException
 	 */
 	public function import(IUser $user, IImportSource $importSource, OutputInterface $output): void {
-		if ($importSource->getMigratorVersion(static::class) === null) {
+		if ($importSource->getMigratorVersion($this->getId()) === null) {
 			$output->writeln('No version for ' . static::class . ', skipping import…');
 			return;
 		}

apps/dav/lib/UserMigration/ContactsMigrator.php

@@ -306,7 +306,7 @@ private function getAddressBookImports(array $importFiles): array {
 	 * @throws ContactsMigratorException
 	 */
 	public function import(IUser $user, IImportSource $importSource, OutputInterface $output): void {
-		if ($importSource->getMigratorVersion(static::class) === null) {
+		if ($importSource->getMigratorVersion($this->getId()) === null) {
 			$output->writeln('No version for ' . static::class . ', skipping import…');
 			return;
 		}

apps/files_trashbin/lib/UserMigration/TrashbinMigrator.php

@@ -93,7 +93,7 @@ public function export(IUser $user, IExportDestination $exportDestination, Outpu
 	 * {@inheritDoc}
 	 */
 	public function import(IUser $user, IImportSource $importSource, OutputInterface $output): void {
-		if ($importSource->getMigratorVersion(static::class) === null) {
+		if ($importSource->getMigratorVersion($this->getId()) === null) {
 			$output->writeln('No version for ' . static::class . ', skipping import…');
 			return;
 		}

apps/settings/lib/UserMigration/AccountMigrator.php

@@ -95,7 +95,7 @@ public function export(IUser $user, IExportDestination $exportDestination, Outpu
 	 * {@inheritDoc}
 	 */
 	public function import(IUser $user, IImportSource $importSource, OutputInterface $output): void {
-		if ($importSource->getMigratorVersion(static::class) === null) {
+		if ($importSource->getMigratorVersion($this->getId()) === null) {
 			$output->writeln('No version for ' . static::class . ', skipping import…');
 			return;
 		}

apps/settings/tests/UserMigration/AccountMigratorTest.php

@@ -98,7 +98,7 @@ public function testImportExportAccount(string $userId, array $importData): void
 		$this->importSource
 			->expects($this->once())
 			->method('getMigratorVersion')
-			->with(AccountMigrator::class)
+			->with($this->migrator->getId())
 			->willReturn(1);
 
 		$this->importSource

lib/public/UserMigration/IImportSource.php

@@ -91,7 +91,7 @@ public function getMigratorVersions(): array;
 	/**
 	 * @return ?int Version for this migrator from the export archive. Null means migrator missing.
 	 *
-	 * @param class-string<IMigrator> $migrator
+	 * @param string $migrator Migrator id (as returned by IMigrator::getId)
 	 *
 	 * @since 24.0.0
 	 */

lib/public/UserMigration/IMigrator.php

@@ -89,7 +89,7 @@ public function getVersion(): int;
 
 	/**
 	 * Checks whether it is able to import a version of the export format for this migrator
-	 * Use $importSource->getMigratorVersion(static::class) to get the version from the archive
+	 * Use $importSource->getMigratorVersion($this->getId()) to get the version from the archive
 	 *
 	 * @since 24.0.0
 	 */

lib/public/UserMigration/TMigratorBasicVersionHandling.php

@@ -50,7 +50,7 @@ public function getVersion(): int {
 	public function canImport(
 		IImportSource $importSource
 	): bool {
-		$version = $importSource->getMigratorVersion(static::class);
+		$version = $importSource->getMigratorVersion($this->getId());
 		if ($version === null) {
 			return !$this->mandatory;
 		}