Merge pull request #519 from nextcloud/fix/fix-deprecated-var-syntax

Remove deprecated ${var} syntax
nextcloud · Oct 16, 2023 · 1858860 · 1858860
2 parents fe20b5b + ae6517f
commit 1858860
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/lib/Command/Import.php b/lib/Command/Import.php
@@ -82,10 +82,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$user = null;
 			}
 			$path = $input->getArgument('archive');
-			$io->writeln("Importing from ${path}…");
+			$io->writeln("Importing from {$path}…");
 			$importSource = new ImportSource($path);
 			$this->migrationService->import($importSource, $user, $io);
-			$io->writeln("Successfully imported from ${path}");
+			$io->writeln("Successfully imported from {$path}");
 		} catch (\Exception $e) {
 			if ($io->isDebug()) {
 				$io->error("$e");

diff --git a/lib/Service/UserMigrationService.php b/lib/Service/UserMigrationService.php
@@ -231,10 +231,8 @@ public function import(IImportSource $importSource, ?IUser $user = null, ?Output
 		$output = $output ?? new NullOutput();
 
 		try {
-			$migratorVersions = $importSource->getMigratorVersions();
-
 			if (!$this->canImport($importSource)) {
-				throw new UserMigrationException("Version ${$migratorVersions[$this->getId()]} for main class ".static::class." is not compatible");
+				throw new UserMigrationException("Version ".($importSource->getMigratorVersion($this->getId()) ?? 'null')." for main class ".static::class." is not compatible");
 			}
 
 			// Check versions