Moving to string key for arguments of GenericEvent in Repair

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

3 files changed, 32 insertions, 35 deletions

diff --git a/core/Command/Maintenance/Repair.php b/core/Command/Maintenance/Repair.php
index 2c1fda7c8e4..6dac3085ca8 100644
--- a/core/Command/Maintenance/Repair.php
+++ b/core/Command/Maintenance/Repair.php
@@ -122,26 +122,26 @@ class Repair extends Command {
 		}
 		switch ($event->getSubject()) {
 			case '\OC\Repair::startProgress':
-				$this->progress->start($event->getArgument(0));
+				$this->progress->start($event->getArgument('max'));
 				break;
 			case '\OC\Repair::advance':
-				$this->progress->advance($event->getArgument(0));
+				$this->progress->advance($event->getArgument('step'));
 				break;
 			case '\OC\Repair::finishProgress':
 				$this->progress->finish();
 				$this->output->writeln('');
 				break;
 			case '\OC\Repair::step':
-				$this->output->writeln(' - ' . $event->getArgument(0));
+				$this->output->writeln(' - ' . $event->getArgument('step'));
 				break;
 			case '\OC\Repair::info':
-				$this->output->writeln('     - ' . $event->getArgument(0));
+				$this->output->writeln('     - ' . $event->getArgument('message'));
 				break;
 			case '\OC\Repair::warning':
-				$this->output->writeln('     - WARNING: ' . $event->getArgument(0));
+				$this->output->writeln('     - WARNING: ' . $event->getArgument('message'));
 				break;
 			case '\OC\Repair::error':
-				$this->output->writeln('<error>     - ERROR: ' . $event->getArgument(0) . '</error>');
+				$this->output->writeln('<error>     - ERROR: ' . $event->getArgument('message') . '</error>');
 				break;
 		}
 	}
diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php
index 69a7f1f656f..f848ab21ea6 100644
--- a/core/Command/Upgrade.php
+++ b/core/Command/Upgrade.php
@@ -125,16 +125,16 @@ class Upgrade extends Command {
 				switch ($event->getSubject()) {
 					case '\OC\Repair::startProgress':
 						$progress->setMessage('Starting ...');
-						$output->writeln($event->getArgument(1));
+						$output->writeln($event->getArgument('step'));
 						$output->writeln('');
-						$progress->start($event->getArgument(0));
+						$progress->start($event->getArgument('max'));
 						break;
 					case '\OC\Repair::advance':
-						$desc = $event->getArgument(1);
+						$desc = $event->getArgument('desc');
 						if (!empty($desc)) {
 							$progress->setMessage($desc);
 						}
-						$progress->advance($event->getArgument(0));
+						$progress->advance($event->getArgument('step'));
 
 						break;
 					case '\OC\Repair::finishProgress':
@@ -144,19 +144,19 @@ class Upgrade extends Command {
 						break;
 					case '\OC\Repair::step':
 						if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
-							$output->writeln('<info>Repair step: ' . $event->getArgument(0) . '</info>');
+							$output->writeln('<info>Repair step: ' . $event->getArgument('step') . '</info>');
 						}
 						break;
 					case '\OC\Repair::info':
 						if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
-							$output->writeln('<info>Repair info: ' . $event->getArgument(0) . '</info>');
+							$output->writeln('<info>Repair info: ' . $event->getArgument('message') . '</info>');
 						}
 						break;
 					case '\OC\Repair::warning':
-						$output->writeln('<error>Repair warning: ' . $event->getArgument(0) . '</error>');
+						$output->writeln('<error>Repair warning: ' . $event->getArgument('message') . '</error>');
 						break;
 					case '\OC\Repair::error':
-						$output->writeln('<error>Repair error: ' . $event->getArgument(0) . '</error>');
+						$output->writeln('<error>Repair error: ' . $event->getArgument('message') . '</error>');
 						break;
 				}
 			};
diff --git a/core/ajax/update.php b/core/ajax/update.php
index a8352cb40be..8682f47353d 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -30,6 +30,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
+use OCP\IEventSource;
+use OCP\IL10N;
 use OCP\ILogger;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
@@ -48,36 +50,31 @@ $eventSource = \OC::$server->createEventSource();
 $eventSource->send('success', $l->t('Preparing update'));
 
 class FeedBackHandler {
-	/** @var integer */
-	private $progressStateMax = 100;
-	/** @var integer */
-	private $progressStateStep = 0;
-	/** @var string */
-	private $currentStep;
-	/** @var \OCP\IEventSource */
-	private $eventSource;
-	/** @var \OCP\IL10N */
-	private $l10n;
-
-	public function __construct(\OCP\IEventSource $eventSource, \OCP\IL10N $l10n) {
+	private int $progressStateMax = 100;
+	private int $progressStateStep = 0;
+	private string $currentStep = '';
+	private IEventSource $eventSource;
+	private IL10N $l10n;
+
+	public function __construct(IEventSource $eventSource, IL10N $l10n) {
 		$this->eventSource = $eventSource;
 		$this->l10n = $l10n;
 	}
 
-	public function handleRepairFeedback($event) {
+	public function handleRepairFeedback($event): void {
 		if (!$event instanceof GenericEvent) {
 			return;
 		}
 
 		switch ($event->getSubject()) {
 			case '\OC\Repair::startProgress':
-				$this->progressStateMax = $event->getArgument(0);
+				$this->progressStateMax = $event->getArgument('max');
 				$this->progressStateStep = 0;
-				$this->currentStep = $event->getArgument(1);
+				$this->currentStep = (string)$event->getArgument('step');
 				break;
 			case '\OC\Repair::advance':
-				$this->progressStateStep += $event->getArgument(0);
-				$desc = $event->getArgument(1);
+				$this->progressStateStep += $event->getArgument('step');
+				$desc = $event->getArgument('desc');
 				if (empty($desc)) {
 					$desc = $this->currentStep;
 				}
@@ -88,16 +85,16 @@ class FeedBackHandler {
 				$this->eventSource->send('success', $this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $this->currentStep]));
 				break;
 			case '\OC\Repair::step':
-				$this->eventSource->send('success', $this->l10n->t('Repair step:') . ' ' . $event->getArgument(0));
+				$this->eventSource->send('success', $this->l10n->t('Repair step:') . ' ' . $event->getArgument('step'));
 				break;
 			case '\OC\Repair::info':
-				$this->eventSource->send('success', $this->l10n->t('Repair info:') . ' ' . $event->getArgument(0));
+				$this->eventSource->send('success', $this->l10n->t('Repair info:') . ' ' . $event->getArgument('message'));
 				break;
 			case '\OC\Repair::warning':
-				$this->eventSource->send('notice', $this->l10n->t('Repair warning:') . ' ' . $event->getArgument(0));
+				$this->eventSource->send('notice', $this->l10n->t('Repair warning:') . ' ' . $event->getArgument('message'));
 				break;
 			case '\OC\Repair::error':
-				$this->eventSource->send('notice', $this->l10n->t('Repair error:') . ' ' . $event->getArgument(0));
+				$this->eventSource->send('notice', $this->l10n->t('Repair error:') . ' ' . $event->getArgument('message'));
 				break;
 		}
 	}