Move commands to typed properties

Signed-off-by: Anna Larch <anna@nextcloud.com>

11 files changed, 30 insertions, 79 deletions

diff --git a/lib/Command/AddMissingTags.php b/lib/Command/AddMissingTags.php
index 41e4ec680..4d644fecb 100644
--- a/lib/Command/AddMissingTags.php
+++ b/lib/Command/AddMissingTags.php
@@ -36,14 +36,9 @@ use Symfony\Component\Console\Output\OutputInterface;
 class AddMissingTags extends Command {
 	public const ARGUMENT_ACCOUNT_ID = 'account-id';
 
-	/** @var LoggerInterface */
-	private $logger;
-
-	/** @var TagMapper */
-	private $tagMapper;
-
-	/** @var MailAccountMapper */
-	private $mapper;
+	private LoggerInterface $logger;
+	private TagMapper $tagMapper;
+	private MailAccountMapper $mapper;
 
 	public function __construct(MailAccountMapper $mapper,
 								TagMapper $tagMapper,
diff --git a/lib/Command/CleanUp.php b/lib/Command/CleanUp.php
index 5f3140ae8..2769f184d 100644
--- a/lib/Command/CleanUp.php
+++ b/lib/Command/CleanUp.php
@@ -29,8 +29,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class CleanUp extends Command {
-	/** @var CleanupService */
-	private $cleanupService;
+	private CleanupService $cleanupService;
 
 	public function __construct(CleanupService $cleanupService) {
 		parent::__construct();
diff --git a/lib/Command/CreateAccount.php b/lib/Command/CreateAccount.php
index 704800c16..f198feda4 100644
--- a/lib/Command/CreateAccount.php
+++ b/lib/Command/CreateAccount.php
@@ -48,14 +48,9 @@ class CreateAccount extends Command {
 	public const ARGUMENT_SMTP_USER = 'smtp-user';
 	public const ARGUMENT_SMTP_PASSWORD = 'smtp-password';
 
-	/** @var AccountService */
-	private $accountService;
-
-	/** @var \OCP\Security\ICrypto */
-	private $crypto;
-
-	/** @var IUserManager */
-	private $userManager;
+	private AccountService $accountService;
+	private ICrypto $crypto;
+	private IUserManager $userManager;
 
 	public function __construct(AccountService $service,
 								ICrypto $crypto,
diff --git a/lib/Command/CreateTagMigrationJobEntry.php b/lib/Command/CreateTagMigrationJobEntry.php
index a7dc980e0..ff233761e 100644
--- a/lib/Command/CreateTagMigrationJobEntry.php
+++ b/lib/Command/CreateTagMigrationJobEntry.php
@@ -33,11 +33,8 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class CreateTagMigrationJobEntry extends Command {
-	/** @var JobList */
-	private $jobList;
-
-	/** @var MailboxMapper */
-	private $mailboxMapper;
+	private JobList $jobList;
+	private MailboxMapper $mailboxMapper;
 
 	public function __construct(JobList $jobList,
 								MailboxMapper $mailboxMapper) {
diff --git a/lib/Command/DeleteAccount.php b/lib/Command/DeleteAccount.php
index 2a7018b3e..c7859507e 100644
--- a/lib/Command/DeleteAccount.php
+++ b/lib/Command/DeleteAccount.php
@@ -36,11 +36,8 @@ use Symfony\Component\Console\Output\OutputInterface;
 class DeleteAccount extends Command {
 	public const ARGUMENT_ACCOUNT_ID = 'account-id';
 
-	/** @var AccountService */
-	private $accountService;
-
-	/** @var LoggerInterface */
-	private $logger;
+	private AccountService $accountService;
+	private LoggerInterface $logger;
 
 	public function __construct(AccountService $service,
 								LoggerInterface $logger) {
diff --git a/lib/Command/DiagnoseAccount.php b/lib/Command/DiagnoseAccount.php
index 760956a53..0ea6cdfc6 100644
--- a/lib/Command/DiagnoseAccount.php
+++ b/lib/Command/DiagnoseAccount.php
@@ -42,14 +42,9 @@ use function sort;
 class DiagnoseAccount extends Command {
 	private const ARGUMENT_ACCOUNT_ID = 'account-id';
 
-	/** @var AccountService */
-	private $accountService;
-
-	/** @var IMAPClientFactory */
-	private $clientFactory;
-
-	/** @var LoggerInterface */
-	private $logger;
+	private AccountService $accountService;
+	private IMAPClientFactory $clientFactory;
+	private LoggerInterface $logger;
 
 	public function __construct(AccountService $service,
 								IMAPClientFactory $clientFactory,
diff --git a/lib/Command/ExportAccount.php b/lib/Command/ExportAccount.php
index 4dfe724e2..467c1294d 100644
--- a/lib/Command/ExportAccount.php
+++ b/lib/Command/ExportAccount.php
@@ -31,11 +31,8 @@ use Symfony\Component\Console\Output\OutputInterface;
 class ExportAccount extends Command {
 	public const ARGUMENT_USER_ID = 'user-id';
 
-	/** @var AccountService */
-	private $accountService;
-
-	/** @var ICrypto */
-	private $crypto;
+	private AccountService $accountService;
+	private ICrypto $crypto;
 
 	public function __construct(AccountService $service, ICrypto $crypto) {
 		parent::__construct();
diff --git a/lib/Command/ExportAccountThreads.php b/lib/Command/ExportAccountThreads.php
index 310dea6f1..7d2b6b028 100644
--- a/lib/Command/ExportAccountThreads.php
+++ b/lib/Command/ExportAccountThreads.php
@@ -42,17 +42,10 @@ class ExportAccountThreads extends Command {
 	private const ARGUMENT_ACCOUNT_ID = 'account-id';
 	private const OPTION_REDACT = 'redact';
 
-	/** @var AccountService */
-	private $accountService;
-
-	/** @var ISecureRandom */
-	private $random;
-
-	/** @var IHasher */
-	private $hasher;
-
-	/** @var MessageMapper */
-	private $messageMapper;
+	private AccountService $accountService;
+	private ISecureRandom $random;
+	private IHasher $hasher;
+	private MessageMapper $messageMapper;
 
 	public function __construct(AccountService $service,
 								ISecureRandom $random,
diff --git a/lib/Command/SyncAccount.php b/lib/Command/SyncAccount.php
index 967db9ac5..763b34c15 100644
--- a/lib/Command/SyncAccount.php
+++ b/lib/Command/SyncAccount.php
@@ -46,17 +46,10 @@ class SyncAccount extends Command {
 	public const ARGUMENT_ACCOUNT_ID = 'account-id';
 	public const OPTION_FORCE = 'force';
 
-	/** @var AccountService */
-	private $accountService;
-
-	/** @var MailboxSync */
-	private $mailboxSync;
-
-	/** @var ImapToDbSynchronizer */
-	private $syncService;
-
-	/** @var LoggerInterface */
-	private $logger;
+	private AccountService $accountService;
+	private MailboxSync $mailboxSync;
+	private ImapToDbSynchronizer $syncService;
+	private LoggerInterface $logger;
 
 	public function __construct(AccountService $service,
 								MailboxSync $mailboxSync,
diff --git a/lib/Command/Thread.php b/lib/Command/Thread.php
index 3999abcc9..2aa985a7e 100644
--- a/lib/Command/Thread.php
+++ b/lib/Command/Thread.php
@@ -40,11 +40,8 @@ use function memory_get_peak_usage;
 class Thread extends Command {
 	public const ARGUMENT_INPUT_FILE = 'thread-file';
 
-	/** @var ThreadBuilder */
-	private $builder;
-
-	/** @var LoggerInterface */
-	private $logger;
+	private ThreadBuilder $builder;
+	private LoggerInterface $logger;
 
 	public function __construct(ThreadBuilder $builder,
 								LoggerInterface $logger) {
diff --git a/lib/Command/TrainAccount.php b/lib/Command/TrainAccount.php
index b6d80031d..ae81b7000 100644
--- a/lib/Command/TrainAccount.php
+++ b/lib/Command/TrainAccount.php
@@ -40,17 +40,10 @@ use function memory_get_peak_usage;
 class TrainAccount extends Command {
 	public const ARGUMENT_ACCOUNT_ID = 'account-id';
 
-	/** @var AccountService */
-	private $accountService;
-
-	/** @var ImportanceClassifier */
-	private $classifier;
-
-	/** @var IUserPreferences */
-	private $preferences;
-
-	/** @var LoggerInterface */
-	private $logger;
+	private AccountService $accountService;
+	private ImportanceClassifier $classifier;
+	private IUserPreferences $preferences;
+	private LoggerInterface $logger;
 
 	public function __construct(AccountService $service,
 								ImportanceClassifier $classifier,