Skip to content

Use migrators id string instead of class name #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
come-nc merged 1 commit into from
Apr 11, 2022
Merged

Use migrators id string instead of class name #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/Migrator/FilesMigrator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ public function import(
IImportSource $importSource,
OutputInterface $output
): void {
if ($importSource->getMigratorVersion(static::class) === null) {
$output->writeln("No version for ".static::class.", skipping import…");
if ($importSource->getMigratorVersion($this->getId()) === null) {
$output->writeln("No version for ".$this->getId().", skipping import…");
return;
}
$output->writeln("Importing files…");
Expand Down
16 changes: 12 additions & 4 deletions lib/Service/UserMigrationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@ public function export(IUser $user, ?OutputInterface $output = null): string {

// Run exports of registered migrators
$migratorVersions = [
static::class => $this->getVersion(),
$this->getId() => $this->getVersion(),
];
foreach ($context->getUserMigrators() as $migratorRegistration) {
/** @var IMigrator $migrator */
$migrator = $this->container->get($migratorRegistration->getService());
$migrator->export($user, $exportDestination, $output);
$migratorVersions[get_class($migrator)] = $migrator->getVersion();
$migratorVersions[$migrator->getId()] = $migrator->getVersion();
}
if ($exportDestination->setMigratorVersions($migratorVersions) === false) {
throw new UserMigrationException("Could not export user information.");
Expand All @@ -147,15 +147,15 @@ public function import(string $path, ?IUser $user = null, ?OutputInterface $outp
$migratorVersions = $importSource->getMigratorVersions();

if (!$this->canImport($importSource)) {
throw new UserMigrationException("Version ${$migratorVersions[static::class]} for main class ".static::class." is not compatible");
throw new UserMigrationException("Version ${$migratorVersions[$this->getId()]} for main class ".static::class." is not compatible");
}

// Check versions
foreach ($context->getUserMigrators() as $migratorRegistration) {
/** @var IMigrator $migrator */
$migrator = $this->container->get($migratorRegistration->getService());
if (!$migrator->canImport($importSource)) {
throw new UserMigrationException("Version ".($importSource->getMigratorVersion(get_class($migrator)) ?? 'null')." for migrator ".get_class($migrator)." is not supported");
throw new UserMigrationException("Version ".($importSource->getMigratorVersion($migrator->getId()) ?? 'null')." for migrator ".get_class($migrator)." is not supported");
}
}

Expand Down Expand Up @@ -272,4 +272,12 @@ protected function importAppsSettings(IUser $user,
}
}
}


/**
* Returns the unique ID
*/
public function getId(): string {
return 'usermigrationservice';
}
}