2 files changed, 8 insertions, 32 deletions

diff --git a/apps/dav/lib/UserMigration/CalendarMigrator.php b/apps/dav/lib/UserMigration/CalendarMigrator.php
index 80b564e24ee..73e9c375490 100644
--- a/apps/dav/lib/UserMigration/CalendarMigrator.php
+++ b/apps/dav/lib/UserMigration/CalendarMigrator.php
@@ -41,17 +41,6 @@ class CalendarMigrator implements IMigrator, ISizeEstimationMigrator {
 
 	use TMigratorBasicVersionHandling;
 
-	private CalDavBackend $calDavBackend;
-
-	private ICalendarManager $calendarManager;
-
-	// ICSExportPlugin is injected as the mergeObjects() method is required and is not to be used as a SabreDAV server plugin
-	private ICSExportPlugin $icsExportPlugin;
-
-	private Defaults $defaults;
-
-	private IL10N $l10n;
-
 	private SabreDavServer $sabreDavServer;
 
 	private const USERS_URI_ROOT = 'principals/users/';
@@ -63,18 +52,12 @@ class CalendarMigrator implements IMigrator, ISizeEstimationMigrator {
 	private const EXPORT_ROOT = Application::APP_ID . '/calendars/';
 
 	public function __construct(
-		CalDavBackend $calDavBackend,
-		ICalendarManager $calendarManager,
-		ICSExportPlugin $icsExportPlugin,
-		Defaults $defaults,
-		IL10N $l10n
+		private CalDavBackend $calDavBackend,
+		private ICalendarManager $calendarManager,
+		private ICSExportPlugin $icsExportPlugin,
+		private Defaults $defaults,
+		private IL10N $l10n,
 	) {
-		$this->calDavBackend = $calDavBackend;
-		$this->calendarManager = $calendarManager;
-		$this->icsExportPlugin = $icsExportPlugin;
-		$this->defaults = $defaults;
-		$this->l10n = $l10n;
-
 		$root = new RootCollection();
 		$this->sabreDavServer = new SabreDavServer(new CachingTree($root));
 		$this->sabreDavServer->addPlugin(new CalDAVPlugin());
diff --git a/apps/dav/lib/UserMigration/ContactsMigrator.php b/apps/dav/lib/UserMigration/ContactsMigrator.php
index 70f92379fe2..96d623938a3 100644
--- a/apps/dav/lib/UserMigration/ContactsMigrator.php
+++ b/apps/dav/lib/UserMigration/ContactsMigrator.php
@@ -37,10 +37,6 @@ class ContactsMigrator implements IMigrator, ISizeEstimationMigrator {
 
 	use TMigratorBasicVersionHandling;
 
-	private CardDavBackend $cardDavBackend;
-
-	private IL10N $l10n;
-
 	private SabreDavServer $sabreDavServer;
 
 	private const USERS_URI_ROOT = 'principals/users/';
@@ -54,12 +50,9 @@ class ContactsMigrator implements IMigrator, ISizeEstimationMigrator {
 	private const PATH_ROOT = Application::APP_ID . '/address_books/';
 
 	public function __construct(
-		CardDavBackend $cardDavBackend,
-		IL10N $l10n
+		private CardDavBackend $cardDavBackend,
+		private IL10N $l10n,
 	) {
-		$this->cardDavBackend = $cardDavBackend;
-		$this->l10n = $l10n;
-
 		$root = new RootCollection();
 		$this->sabreDavServer = new SabreDavServer(new CachingTree($root));
 		$this->sabreDavServer->addPlugin(new CardDAVPlugin());
@@ -251,7 +244,7 @@ class ContactsMigrator implements IMigrator, ISizeEstimationMigrator {
 				$vCard->serialize(),
 			);
 		} catch (Throwable $e) {
-			$output->writeln("Error creating contact \"" . ($vCard->FN ?? 'null') . "\" from \"$filename\", skipping…");
+			$output->writeln('Error creating contact "' . ($vCard->FN ?? 'null') . "\" from \"$filename\", skipping…");
 		}
 	}