Merge branch 'master' into refactor_lib_private_root_classes_part_3

Signed-off-by: John Molakvoæ <[email protected]>

lib/private/Repair.php

@@ -91,20 +91,22 @@
 use Throwable;
 
 class Repair implements IOutput {
+	/** @var IRepairStep[] */
+	private array $repairSteps = [];
+
 	private string $currentStep;
 
-	/**
-	 * Creates a new repair step runner
-	 *
-	 * @param IRepairStep[] $repairSteps array of RepairStep instances
-	 */
 	public function __construct(
-		private array $repairSteps,
 		private IEventDispatcher $dispatcher,
-		private LoggerInterface $logger,
+		private LoggerInterface $logger
 	) {
 	}
 
+	/** @param IRepairStep[] $repairSteps */
+	public function setRepairSteps(array $repairSteps): void {
+		$this->repairSteps = $repairSteps;
+	}
+
 	/**
 	 * Run a series of repair steps for common problems
 	 */
@@ -232,8 +234,6 @@ public static function getExpensiveRepairSteps(): array {
 	 * @return IRepairStep[]
 	 */
 	public static function getBeforeUpgradeRepairSteps(): array {
-		/** @var Connection $connection */
-		$connection = \OC::$server->get(Connection::class);
 		/** @var ConnectionAdapter $connectionAdapter */
 		$connectionAdapter = \OC::$server->get(ConnectionAdapter::class);
 		$config = \OC::$server->getConfig();