Parameter of RepairAdvanceEvent is actually an increment, not a step id

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

Author: come-nc

core/Command/Maintenance/Repair.php

@@ -127,7 +127,7 @@ public function handleRepairFeedBack(Event $event): void {
 		if ($event instanceof RepairStartEvent) {
 			$this->progress->start($event->getMaxStep());
 		} elseif ($event instanceof RepairAdvanceEvent) {
-			$this->progress->advance($event->getCurrentStep());
+			$this->progress->advance($event->getIncrement());
 		} elseif ($event instanceof RepairFinishEvent) {
 			$this->progress->finish();
 			$this->output->writeln('');

core/Command/Upgrade.php

@@ -137,7 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 					if (!empty($desc)) {
 						$progress->setMessage($desc);
 					}
-					$progress->advance($event->getCurrentStep());
+					$progress->advance($event->getIncrement());
 				} elseif ($event instanceof RepairFinishEvent) {
 					$progress->setMessage('Done');
 					$progress->finish();

core/ajax/update.php

@@ -76,7 +76,7 @@ public function handleRepairFeedback(Event $event): void {
 			$this->progressStateStep = 0;
 			$this->currentStep = $event->getCurrentStepName();
 		} elseif ($event instanceof RepairAdvanceEvent) {
-			$this->progressStateStep += $event->getCurrentStep();
+			$this->progressStateStep += $event->getIncrement();
 			$desc = $event->getDescription();
 			if (empty($desc)) {
 				$desc = $this->currentStep;

lib/private/Repair.php

@@ -279,7 +279,7 @@ public function startProgress($max = 0) {
 	}
 
 	/**
-	 * @param int $step
+	 * @param int $step number of step to advance
 	 * @param string $description
 	 */
 	public function advance($step = 1, $description = '') {

lib/private/Repair/Events/RepairAdvanceEvent.php

@@ -27,20 +27,19 @@
 use OCP\EventDispatcher\Event;
 
 class RepairAdvanceEvent extends Event {
-	// TODO Is that current step or step increment?
-	private int $current;
+	private int $increment;
 	private string $description;
 
 	public function __construct(
-		int $current,
+		int $increment,
 		string $description
 	) {
-		$this->current = $current;
+		$this->increment = $increment;
 		$this->description = $description;
 	}
 
-	public function getCurrentStep(): int {
-		return $this->current;
+	public function getIncrement(): int {
+		return $this->increment;
 	}
 
 	public function getDescription(): string {

lib/private/Updater.php

@@ -460,7 +460,7 @@ function (MigratorExecuteSqlEvent $event) use ($log): void {
 				if (empty($desc)) {
 					$desc = '';
 				}
-				$log->info(get_class($event).': ' . $desc . ' (' . $event->getCurrentStep() . ')', ['app' => 'updater']);
+				$log->info(get_class($event).': ' . $desc . ' (' . $event->getIncrement() . ')', ['app' => 'updater']);
 			} elseif ($event instanceof RepairFinishEvent) {
 				$log->info(get_class($event), ['app' => 'updater']);
 			} elseif ($event instanceof RepairStepEvent) {