Fix migrators according to exceptions

Fixed syntax errors.
Removed if condition for copyToFolder since it's void now.
Change signature of setMigratorVersions to also be void.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/apps/files_trashbin/lib/UserMigration/TrashbinMigrator.php b/apps/files_trashbin/lib/UserMigration/TrashbinMigrator.php
index db5231ae019..dbc6267eb3a 100644
--- a/apps/files_trashbin/lib/UserMigration/TrashbinMigrator.php
+++ b/apps/files_trashbin/lib/UserMigration/TrashbinMigrator.php
@@ -79,10 +79,10 @@ class TrashbinMigrator implements IMigrator {
 			$output->writeln("Exporting trashbin files…");
 			$exportDestination->copyFolder($trashbinFolder, static::PATH_FILES_FOLDER);
 			$originalLocations = \OCA\Files_Trashbin\Trashbin::getLocations($uid);
-			$exportDestination->addFileContents(static::PATH_LOCATIONS_FILE, json_encode($originalLocations);
+			$exportDestination->addFileContents(static::PATH_LOCATIONS_FILE, json_encode($originalLocations));
 		} catch (NotFoundException $e) {
 			$output->writeln("No trashbin to export…");
-		} catch (UserMigrationException $e) {
+		} catch (\Throwable $e) {
 			throw new UserMigrationException("Could not export trashbin: ".$e->getMessage(), 0, $e);
 		}
 	}
@@ -110,8 +110,10 @@ class TrashbinMigrator implements IMigrator {
 				$trashbinFolder = $this->root->newFolder('/'.$uid.'/files_trashbin');
 			}
 			$output->writeln("Importing trashbin files…");
-			if ($importSource->copyToFolder($trashbinFolder, static::PATH_FILES_FOLDER) === false) {
-				throw new UserMigrationException("Could not import trashbin.");
+			try {
+				$importSource->copyToFolder($trashbinFolder, static::PATH_FILES_FOLDER);
+			} catch (\Throwable $e) {
+				throw new UserMigrationException("Could not import trashbin.", 0, $e);
 			}
 			$locations = json_decode($importSource->getFileContents(static::PATH_LOCATIONS_FILE), true, 512, JSON_THROW_ON_ERROR);
 			$qb = $this->dbc->getQueryBuilder();