Avoid passing both $importSource and $version while version comes from source

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Author: come-nc

lib/public/UserMigration/IImportSource.php

@@ -70,6 +70,15 @@ public function copyToFolder(Folder $destination, string $sourcePath): bool;
 	 */
 	public function getMigratorVersions(): array;
 
+	/**
+	 * @return ?int Version for this migrator from the export archive. Null means migrator missing.
+	 *
+	 * @param class-string<IMigrator> $migrator
+	 *
+	 * @since 24.0.0
+	 */
+	public function getMigratorVersion(string $migrator): ?int;
+
 	/**
 	 * Called after import is complete
 	 *

lib/public/UserMigration/IMigrator.php

@@ -54,8 +54,7 @@ public function export(
 	public function import(
 		IUser $user,
 		IImportSource $importSource,
-		OutputInterface $output,
-		?int $version
+		OutputInterface $output
 	): void;
 
 	/**
@@ -67,13 +66,11 @@ public function getVersion(): int;
 
 	/**
 	 * Checks whether it is able to import a version of the export format for this migrator
-	 *
-	 * @param ?int $version Version stored in the import source for this migrator. Null means this migrator was not listed.
+	 * Use $importSource->getMigratorVersion(static::class) to get the version from the archive
 	 *
 	 * @since 24.0.0
 	 */
 	public function canImport(
-		IImportSource $importSource,
-		?int $version
+		IImportSource $importSource
 	): bool;
 }

lib/public/UserMigration/TMigratorBasicVersionHandling.php

@@ -45,9 +45,9 @@ public function getVersion(): int {
 	 * {@inheritDoc}
 	 */
 	public function canImport(
-		IImportSource $importSource,
-		?int $version
+		IImportSource $importSource
 	): bool {
+		$version = $importSource->getMigratorVersion(static::class);
 		if ($version === null) {
 			return !$this->mandatory;
 		}