Merge pull request #5842 from nextcloud/backport/5840/stable1.11

[stable1.11] Remove command to fix threads and make it a repair step instead.

2 files changed, 8 insertions, 17 deletions

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 08c702bab..3898edd8f 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -47,6 +47,7 @@
 			<step>OCA\Mail\Migration\FixBackgroundJobs</step>
 			<step>OCA\Mail\Migration\MakeItineraryExtractorExecutable</step>
 			<step>OCA\Mail\Migration\ProvisionAccounts</step>
+			<step>OCA\Mail\Command\RepairMailTheads</step>
 		</post-migration>
 	</repair-steps>
 	<commands>
@@ -61,7 +62,6 @@
 		<command>OCA\Mail\Command\SyncAccount</command>
 		<command>OCA\Mail\Command\TrainAccount</command>
 		<command>OCA\Mail\Command\Thread</command>
-		<command>OCA\Mail\Command\RepairMailTheads</command>
 	</commands>
 	<settings>
 		<admin>OCA\Mail\Settings\AdminSettings</admin>
diff --git a/lib/Command/RepairMailTheads.php b/lib/Migration/RepairMailTheads.php
index 118eb3324..75f2966b5 100644
--- a/lib/Command/RepairMailTheads.php
+++ b/lib/Migration/RepairMailTheads.php
@@ -24,12 +24,11 @@ declare(strict_types=1);
 namespace OCA\Mail\Command;
 
 use OCA\Mail\Db\MessageMapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 
-class RepairMailTheads extends Command {
+class RepairMailTheads implements IRepairStep {
 
 	/** @var MessageMapper */
 	private $mapper;
@@ -39,25 +38,17 @@ class RepairMailTheads extends Command {
 
 	public function __construct(MessageMapper $mapper,
 								LoggerInterface $logger) {
-		parent::__construct();
-
 		$this->mapper = $mapper;
 		$this->logger = $logger;
 	}
 
-	/**
-	 * @return void
-	 */
-	protected function configure(): void {
-		$this->setName('mail:repair:threads');
-		$this->setDescription('Repair Broken Threads for all mail accounts');
+	public function getName(): string {
+		return 'Repair Broken Threads for all mail accounts';
 	}
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
+	public function run(IOutput $output): void {
 		$count = $this->mapper->resetInReplyTo();
 		$this->logger->info('Repairing Mail Threading, ' . $count . ' messages updated');
-		$output->writeln('');
-		$output->writeln('Repaired threads, ' . $count . ' messages updated');
-		return 0;
+		$output->info(sprintf('Repaired threads, %s messages updated', $count));
 	}
 }