Use Migrators id instead of class names

This will help with UI and means migrators can move in namespaces
 without changing export format.

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

diff --git a/apps/dav/lib/UserMigration/CalendarMigrator.php b/apps/dav/lib/UserMigration/CalendarMigrator.php
index f560b4853b2b9a4ac90a6e053832ab6465162fe4..37a8de36d8db57c0eef0a758801d33ce3eb6315a 100644 (file)
--- a/apps/dav/lib/UserMigration/CalendarMigrator.php
+++ b/apps/dav/lib/UserMigration/CalendarMigrator.php
@@ -414,7 +414,7 @@ class CalendarMigrator implements IMigrator {
         * @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;
                }

diff --git a/apps/dav/lib/UserMigration/ContactsMigrator.php b/apps/dav/lib/UserMigration/ContactsMigrator.php
index cfdc20bfdf35533711d3484c1ff6fdb9a24211ee..99eea2700a5bc803b345fb52608a6927199bcaf5 100644 (file)
--- a/apps/dav/lib/UserMigration/ContactsMigrator.php
+++ b/apps/dav/lib/UserMigration/ContactsMigrator.php
@@ -306,7 +306,7 @@ class ContactsMigrator implements IMigrator {
         * @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;
                }

diff --git a/apps/files_trashbin/lib/UserMigration/TrashbinMigrator.php b/apps/files_trashbin/lib/UserMigration/TrashbinMigrator.php
index c7832ec5bc883fb4aa367091f9bc17bd4bf6f272..95ed25088b16376dd4ce0055e0aac507b2fb1816 100644 (file)
--- a/apps/files_trashbin/lib/UserMigration/TrashbinMigrator.php
+++ b/apps/files_trashbin/lib/UserMigration/TrashbinMigrator.php
@@ -93,7 +93,7 @@ class TrashbinMigrator implements IMigrator {
         * {@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;
                }

diff --git a/apps/settings/lib/UserMigration/AccountMigrator.php b/apps/settings/lib/UserMigration/AccountMigrator.php
index a39c510813f73326e9bd683820e6dd553e21b32e..e4218d72a76eed995870968e500916c2c5688588 100644 (file)
--- a/apps/settings/lib/UserMigration/AccountMigrator.php
+++ b/apps/settings/lib/UserMigration/AccountMigrator.php
@@ -95,7 +95,7 @@ class AccountMigrator implements IMigrator {
         * {@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;
                }

diff --git a/lib/public/UserMigration/IImportSource.php b/lib/public/UserMigration/IImportSource.php
index d34f2752549e13e4074c1e6ace159114124abe3a..3816afdd033f81cf5879025834169337010c06d4 100644 (file)
--- a/lib/public/UserMigration/IImportSource.php
+++ b/lib/public/UserMigration/IImportSource.php
@@ -91,7 +91,7 @@ interface IImportSource {
        /**
         * @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
         */

diff --git a/lib/public/UserMigration/IMigrator.php b/lib/public/UserMigration/IMigrator.php
index 7c89e041f3437093d759629706ead616256d232c..d02e5df06836ef946149932503c1cc600af243c3 100644 (file)
--- a/lib/public/UserMigration/IMigrator.php
+++ b/lib/public/UserMigration/IMigrator.php
@@ -89,7 +89,7 @@ interface IMigrator {
 
        /**
         * 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
         */

diff --git a/lib/public/UserMigration/TMigratorBasicVersionHandling.php b/lib/public/UserMigration/TMigratorBasicVersionHandling.php
index 20a30a243076acd07536c24e8255ac40020cef82..9010d14a173b41dc6d674bc59bdcba03900332cc 100644 (file)
--- a/lib/public/UserMigration/TMigratorBasicVersionHandling.php
+++ b/lib/public/UserMigration/TMigratorBasicVersionHandling.php
@@ -50,7 +50,7 @@ trait TMigratorBasicVersionHandling {
        public function canImport(
                IImportSource $importSource
        ): bool {
-               $version = $importSource->getMigratorVersion(static::class);
+               $version = $importSource->getMigratorVersion($this->getId());
                if ($version === null) {
                        return !$this->mandatory;
                }