nextcloud / server

lib/private/Repair.php

Indentation +181 added lines, -181 removed lines

@@ -88,202 +88,202 @@
 
 class Repair implements IOutput {
 
-	/** @var IRepairStep[] */
-	private $repairSteps;
+    /** @var IRepairStep[] */
+    private $repairSteps;
 
-	private IEventDispatcher $dispatcher;
+    private IEventDispatcher $dispatcher;
 
-	/** @var string */
-	private $currentStep;
+    /** @var string */
+    private $currentStep;
 
-	private LoggerInterface $logger;
+    private LoggerInterface $logger;
 
-	/**
-	 * Creates a new repair step runner
-	 *
-	 * @param IRepairStep[] $repairSteps array of RepairStep instances
-	 */
-	public function __construct(array $repairSteps, IEventDispatcher $dispatcher, LoggerInterface $logger) {
-		$this->repairSteps = $repairSteps;
-		$this->dispatcher = $dispatcher;
-		$this->logger = $logger;
-	}
+    /**
+     * Creates a new repair step runner
+     *
+     * @param IRepairStep[] $repairSteps array of RepairStep instances
+     */
+    public function __construct(array $repairSteps, IEventDispatcher $dispatcher, LoggerInterface $logger) {
+        $this->repairSteps = $repairSteps;
+        $this->dispatcher = $dispatcher;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Run a series of repair steps for common problems
-	 */
-	public function run() {
-		if (count($this->repairSteps) === 0) {
-			$this->dispatcher->dispatchTyped(new RepairInfoEvent('No repair steps available'));
+    /**
+     * Run a series of repair steps for common problems
+     */
+    public function run() {
+        if (count($this->repairSteps) === 0) {
+            $this->dispatcher->dispatchTyped(new RepairInfoEvent('No repair steps available'));
 
-			return;
-		}
-		// run each repair step
-		foreach ($this->repairSteps as $step) {
-			$this->currentStep = $step->getName();
-			$this->dispatcher->dispatchTyped(new RepairStepEvent($this->currentStep));
-			try {
-				$step->run($this);
-			} catch (\Exception $e) {
-				$this->logger->error("Exception while executing repair step " . $step->getName(), ['exception' => $e]);
-				$this->dispatcher->dispatchTyped(new RepairErrorEvent($e->getMessage()));
-			}
-		}
-	}
+            return;
+        }
+        // run each repair step
+        foreach ($this->repairSteps as $step) {
+            $this->currentStep = $step->getName();
+            $this->dispatcher->dispatchTyped(new RepairStepEvent($this->currentStep));
+            try {
+                $step->run($this);
+            } catch (\Exception $e) {
+                $this->logger->error("Exception while executing repair step " . $step->getName(), ['exception' => $e]);
+                $this->dispatcher->dispatchTyped(new RepairErrorEvent($e->getMessage()));
+            }
+        }
+    }
 
-	/**
-	 * Add repair step
-	 *
-	 * @param IRepairStep|string $repairStep repair step
-	 * @throws \Exception
-	 */
-	public function addStep($repairStep) {
-		if (is_string($repairStep)) {
-			try {
-				$s = \OC::$server->get($repairStep);
-			} catch (QueryException $e) {
-				if (class_exists($repairStep)) {
-					try {
-						// Last resort: hope there are no constructor arguments
-						$s = new $repairStep();
-					} catch (Throwable $inner) {
-						// Well, it was worth a try
-						throw new \Exception("Repair step '$repairStep' can't be instantiated: " . $e->getMessage(), 0, $e);
-					}
-				} else {
-					throw new \Exception("Repair step '$repairStep' is unknown", 0, $e);
-				}
-			}
+    /**
+     * Add repair step
+     *
+     * @param IRepairStep|string $repairStep repair step
+     * @throws \Exception
+     */
+    public function addStep($repairStep) {
+        if (is_string($repairStep)) {
+            try {
+                $s = \OC::$server->get($repairStep);
+            } catch (QueryException $e) {
+                if (class_exists($repairStep)) {
+                    try {
+                        // Last resort: hope there are no constructor arguments
+                        $s = new $repairStep();
+                    } catch (Throwable $inner) {
+                        // Well, it was worth a try
+                        throw new \Exception("Repair step '$repairStep' can't be instantiated: " . $e->getMessage(), 0, $e);
+                    }
+                } else {
+                    throw new \Exception("Repair step '$repairStep' is unknown", 0, $e);
+                }
+            }
 
-			if ($s instanceof IRepairStep) {
-				$this->repairSteps[] = $s;
-			} else {
-				throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
-			}
-		} else {
-			$this->repairSteps[] = $repairStep;
-		}
-	}
+            if ($s instanceof IRepairStep) {
+                $this->repairSteps[] = $s;
+            } else {
+                throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
+            }
+        } else {
+            $this->repairSteps[] = $repairStep;
+        }
+    }
 
-	/**
-	 * Returns the default repair steps to be run on the
-	 * command line or after an upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getRepairSteps() {
-		return [
-			new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->getDatabaseConnection(), false),
-			new RepairMimeTypes(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
-			new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new MoveUpdaterStepFile(\OC::$server->getConfig()),
-			new MoveAvatars(
-				\OC::$server->getJobList(),
-				\OC::$server->getConfig()
-			),
-			new CleanPreviews(
-				\OC::$server->getJobList(),
-				\OC::$server->getUserManager(),
-				\OC::$server->getConfig()
-			),
-			new MigrateOauthTables(\OC::$server->get(Connection::class)),
-			new FixMountStorages(\OC::$server->getDatabaseConnection()),
-			new UpdateLanguageCodes(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
-			new AddLogRotateJob(\OC::$server->getJobList()),
-			new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(JSCombiner::class)),
-			\OCP\Server::get(ClearGeneratedAvatarCache::class),
-			new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
-			new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
-			new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->get(LoggerInterface::class)),
-			new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
-			new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)),
-			new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OC::$server->query(IManager::class)),
-			\OCP\Server::get(ResetGeneratedAvatarFlag::class),
-			\OCP\Server::get(EncryptionLegacyCipher::class),
-			\OCP\Server::get(EncryptionMigration::class),
-			\OCP\Server::get(ShippedDashboardEnable::class),
-			\OCP\Server::get(AddBruteForceCleanupJob::class),
-			\OCP\Server::get(AddCheckForUserCertificatesJob::class),
-			\OCP\Server::get(RepairDavShares::class),
-			\OCP\Server::get(LookupServerSendCheck::class),
-			\OCP\Server::get(AddTokenCleanupJob::class),
-		];
-	}
+    /**
+     * Returns the default repair steps to be run on the
+     * command line or after an upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getRepairSteps() {
+        return [
+            new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->getDatabaseConnection(), false),
+            new RepairMimeTypes(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
+            new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new MoveUpdaterStepFile(\OC::$server->getConfig()),
+            new MoveAvatars(
+                \OC::$server->getJobList(),
+                \OC::$server->getConfig()
+            ),
+            new CleanPreviews(
+                \OC::$server->getJobList(),
+                \OC::$server->getUserManager(),
+                \OC::$server->getConfig()
+            ),
+            new MigrateOauthTables(\OC::$server->get(Connection::class)),
+            new FixMountStorages(\OC::$server->getDatabaseConnection()),
+            new UpdateLanguageCodes(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
+            new AddLogRotateJob(\OC::$server->getJobList()),
+            new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(JSCombiner::class)),
+            \OCP\Server::get(ClearGeneratedAvatarCache::class),
+            new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
+            new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
+            new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->get(LoggerInterface::class)),
+            new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
+            new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)),
+            new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OC::$server->query(IManager::class)),
+            \OCP\Server::get(ResetGeneratedAvatarFlag::class),
+            \OCP\Server::get(EncryptionLegacyCipher::class),
+            \OCP\Server::get(EncryptionMigration::class),
+            \OCP\Server::get(ShippedDashboardEnable::class),
+            \OCP\Server::get(AddBruteForceCleanupJob::class),
+            \OCP\Server::get(AddCheckForUserCertificatesJob::class),
+            \OCP\Server::get(RepairDavShares::class),
+            \OCP\Server::get(LookupServerSendCheck::class),
+            \OCP\Server::get(AddTokenCleanupJob::class),
+        ];
+    }
 
-	/**
-	 * Returns expensive repair steps to be run on the
-	 * command line with a special option.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getExpensiveRepairSteps() {
-		return [
-			new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
-			\OC::$server->get(ValidatePhoneNumber::class),
-		];
-	}
+    /**
+     * Returns expensive repair steps to be run on the
+     * command line with a special option.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getExpensiveRepairSteps() {
+        return [
+            new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
+            \OC::$server->get(ValidatePhoneNumber::class),
+        ];
+    }
 
-	/**
-	 * Returns the repair steps to be run before an
-	 * upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getBeforeUpgradeRepairSteps() {
-		/** @var Connection $connection */
-		$connection = \OC::$server->get(Connection::class);
-		/** @var ConnectionAdapter $connectionAdapter */
-		$connectionAdapter = \OC::$server->get(ConnectionAdapter::class);
-		$config = \OC::$server->getConfig();
-		$steps = [
-			new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), $connectionAdapter, true),
-			new SqliteAutoincrement($connection),
-			new SaveAccountsTableData($connectionAdapter, $config),
-			new DropAccountTermsTable($connectionAdapter),
-		];
+    /**
+     * Returns the repair steps to be run before an
+     * upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getBeforeUpgradeRepairSteps() {
+        /** @var Connection $connection */
+        $connection = \OC::$server->get(Connection::class);
+        /** @var ConnectionAdapter $connectionAdapter */
+        $connectionAdapter = \OC::$server->get(ConnectionAdapter::class);
+        $config = \OC::$server->getConfig();
+        $steps = [
+            new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), $connectionAdapter, true),
+            new SqliteAutoincrement($connection),
+            new SaveAccountsTableData($connectionAdapter, $config),
+            new DropAccountTermsTable($connectionAdapter),
+        ];
 
-		return $steps;
-	}
+        return $steps;
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function info($message) {
-		// for now just emit as we did in the past
-		$this->dispatcher->dispatchTyped(new RepairInfoEvent($message));
-	}
+    /**
+     * @param string $message
+     */
+    public function info($message) {
+        // for now just emit as we did in the past
+        $this->dispatcher->dispatchTyped(new RepairInfoEvent($message));
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		// for now just emit as we did in the past
-		$this->dispatcher->dispatchTyped(new RepairWarningEvent($message));
-	}
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        // for now just emit as we did in the past
+        $this->dispatcher->dispatchTyped(new RepairWarningEvent($message));
+    }
 
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		// for now just emit as we did in the past
-		$this->dispatcher->dispatchTyped(new RepairStartEvent($max, $this->currentStep));
-	}
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        // for now just emit as we did in the past
+        $this->dispatcher->dispatchTyped(new RepairStartEvent($max, $this->currentStep));
+    }
 
-	/**
-	 * @param int $step number of step to advance
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		// for now just emit as we did in the past
-		$this->dispatcher->dispatchTyped(new RepairAdvanceEvent($step, $description));
-	}
+    /**
+     * @param int $step number of step to advance
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        // for now just emit as we did in the past
+        $this->dispatcher->dispatchTyped(new RepairAdvanceEvent($step, $description));
+    }
 
-	/**
-	 * @param int $max
-	 */
-	public function finishProgress() {
-		// for now just emit as we did in the past
-		$this->dispatcher->dispatchTyped(new RepairFinishEvent());
-	}
+    /**
+     * @param int $max
+     */
+    public function finishProgress() {
+        // for now just emit as we did in the past
+        $this->dispatcher->dispatchTyped(new RepairFinishEvent());
+    }
 }

lib/private/Repair/ClearGeneratedAvatarCache.php

Indentation +29 added lines, -29 removed lines

@@ -31,38 +31,38 @@
 use OCP\Migration\IRepairStep;
 
 class ClearGeneratedAvatarCache implements IRepairStep {
-	protected AvatarManager $avatarManager;
-	private IConfig $config;
-	private IJobList $jobList;
+    protected AvatarManager $avatarManager;
+    private IConfig $config;
+    private IJobList $jobList;
 
-	public function __construct(IConfig $config, AvatarManager $avatarManager, IJobList $jobList) {
-		$this->config = $config;
-		$this->avatarManager = $avatarManager;
-		$this->jobList = $jobList;
-	}
+    public function __construct(IConfig $config, AvatarManager $avatarManager, IJobList $jobList) {
+        $this->config = $config;
+        $this->avatarManager = $avatarManager;
+        $this->jobList = $jobList;
+    }
 
-	public function getName(): string {
-		return 'Clear every generated avatar on major updates';
-	}
+    public function getName(): string {
+        return 'Clear every generated avatar on major updates';
+    }
 
-	/**
-	 * Check if this repair step should run
-	 */
-	private function shouldRun(): bool {
-		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+    /**
+     * Check if this repair step should run
+     */
+    private function shouldRun(): bool {
+        $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
 
-		// was added to 25.0.0.10
-		return version_compare($versionFromBeforeUpdate, '25.0.0.10', '<=');
-	}
+        // was added to 25.0.0.10
+        return version_compare($versionFromBeforeUpdate, '25.0.0.10', '<=');
+    }
 
-	public function run(IOutput $output): void {
-		if ($this->shouldRun()) {
-			try {
-				$this->jobList->add(ClearGeneratedAvatarCacheJob::class, []);
-				$output->info('Avatar cache clearing job added');
-			} catch (\Exception $e) {
-				$output->warning('Unable to clear the avatar cache');
-			}
-		}
-	}
+    public function run(IOutput $output): void {
+        if ($this->shouldRun()) {
+            try {
+                $this->jobList->add(ClearGeneratedAvatarCacheJob::class, []);
+                $output->info('Avatar cache clearing job added');
+            } catch (\Exception $e) {
+                $output->warning('Unable to clear the avatar cache');
+            }
+        }
+    }
 }

lib/private/Repair/ClearGeneratedAvatarCacheJob.php

Indentation +8 added lines, -8 removed lines

@@ -25,14 +25,14 @@
 use OC\Avatar\AvatarManager;
 
 class ClearGeneratedAvatarCacheJob extends QueuedJob {
-	protected AvatarManager $avatarManager;
+    protected AvatarManager $avatarManager;
 
-	public function __construct(ITimeFactory $timeFactory, AvatarManager $avatarManager) {
-		parent::__construct($timeFactory);
-		$this->avatarManager = $avatarManager;
-	}
+    public function __construct(ITimeFactory $timeFactory, AvatarManager $avatarManager) {
+        parent::__construct($timeFactory);
+        $this->avatarManager = $avatarManager;
+    }
 
-	public function run($argument) {
-		$this->avatarManager->clearCachedAvatars();
-	}
+    public function run($argument) {
+        $this->avatarManager->clearCachedAvatars();
+    }
 }