nextcloud / server

lib/private/Updater.php

Indentation +528 added lines, -528 removed lines

@@ -56,532 +56,532 @@
  */
 class Updater extends BasicEmitter {
 
-	/** @var ILogger $log */
-	private $log;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var Checker */
-	private $checker;
-
-	/** @var Installer */
-	private $installer;
-
-	private $logLevelNames = [
-		0 => 'Debug',
-		1 => 'Info',
-		2 => 'Warning',
-		3 => 'Error',
-		4 => 'Fatal',
-	];
-
-	/**
-	 * @param IConfig $config
-	 * @param Checker $checker
-	 * @param ILogger $log
-	 * @param Installer $installer
-	 */
-	public function __construct(IConfig $config,
-								Checker $checker,
-								ILogger $log = null,
-								Installer $installer) {
-		$this->log = $log;
-		$this->config = $config;
-		$this->checker = $checker;
-		$this->installer = $installer;
-	}
-
-	/**
-	 * runs the update actions in maintenance mode, does not upgrade the source files
-	 * except the main .htaccess file
-	 *
-	 * @return bool true if the operation succeeded, false otherwise
-	 */
-	public function upgrade() {
-		$this->emitRepairEvents();
-		$this->logAllEvents();
-
-		$logLevel = $this->config->getSystemValue('loglevel', ILogger::WARN);
-		$this->emit('\OC\Updater', 'setDebugLogLevel', [ $logLevel, $this->logLevelNames[$logLevel] ]);
-		$this->config->setSystemValue('loglevel', ILogger::DEBUG);
-
-		$wasMaintenanceModeEnabled = $this->config->getSystemValueBool('maintenance');
-
-		if (!$wasMaintenanceModeEnabled) {
-			$this->config->setSystemValue('maintenance', true);
-			$this->emit('\OC\Updater', 'maintenanceEnabled');
-		}
-
-		// Clear CAN_INSTALL file if not on git
-		if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) {
-			if (!unlink(\OC::$configDir . '/CAN_INSTALL')) {
-				$this->log->error('Could not cleanup CAN_INSTALL from your config folder. Please remove this file manually.');
-			}
-		}
-
-		$installedVersion = $this->config->getSystemValue('version', '0.0.0');
-		$currentVersion = implode('.', \OCP\Util::getVersion());
-
-		$this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, ['app' => 'core']);
-
-		$success = true;
-		try {
-			$this->doUpgrade($currentVersion, $installedVersion);
-		} catch (HintException $exception) {
-			$this->log->logException($exception, ['app' => 'core']);
-			$this->emit('\OC\Updater', 'failure', [$exception->getMessage() . ': ' .$exception->getHint()]);
-			$success = false;
-		} catch (\Exception $exception) {
-			$this->log->logException($exception, ['app' => 'core']);
-			$this->emit('\OC\Updater', 'failure', [get_class($exception) . ': ' .$exception->getMessage()]);
-			$success = false;
-		}
-
-		$this->emit('\OC\Updater', 'updateEnd', [$success]);
-
-		if (!$wasMaintenanceModeEnabled && $success) {
-			$this->config->setSystemValue('maintenance', false);
-			$this->emit('\OC\Updater', 'maintenanceDisabled');
-		} else {
-			$this->emit('\OC\Updater', 'maintenanceActive');
-		}
-
-		$this->emit('\OC\Updater', 'resetLogLevel', [ $logLevel, $this->logLevelNames[$logLevel] ]);
-		$this->config->setSystemValue('loglevel', $logLevel);
-		$this->config->setSystemValue('installed', true);
-
-		return $success;
-	}
-
-	/**
-	 * Return version from which this version is allowed to upgrade from
-	 *
-	 * @return array allowed previous versions per vendor
-	 */
-	private function getAllowedPreviousVersions() {
-		// this should really be a JSON file
-		require \OC::$SERVERROOT . '/version.php';
-		/** @var array $OC_VersionCanBeUpgradedFrom */
-		return $OC_VersionCanBeUpgradedFrom;
-	}
-
-	/**
-	 * Return vendor from which this version was published
-	 *
-	 * @return string Get the vendor
-	 */
-	private function getVendor() {
-		// this should really be a JSON file
-		require \OC::$SERVERROOT . '/version.php';
-		/** @var string $vendor */
-		return (string) $vendor;
-	}
-
-	/**
-	 * Whether an upgrade to a specified version is possible
-	 * @param string $oldVersion
-	 * @param string $newVersion
-	 * @param array $allowedPreviousVersions
-	 * @return bool
-	 */
-	public function isUpgradePossible($oldVersion, $newVersion, array $allowedPreviousVersions) {
-		$version = explode('.', $oldVersion);
-		$majorMinor = $version[0] . '.' . $version[1];
-
-		$currentVendor = $this->config->getAppValue('core', 'vendor', '');
-
-		// Vendor was not set correctly on install, so we have to white-list known versions
-		if ($currentVendor === '' && (
-			isset($allowedPreviousVersions['owncloud'][$oldVersion]) ||
-			isset($allowedPreviousVersions['owncloud'][$majorMinor])
-		)) {
-			$currentVendor = 'owncloud';
-			$this->config->setAppValue('core', 'vendor', $currentVendor);
-		}
-
-		if ($currentVendor === 'nextcloud') {
-			return isset($allowedPreviousVersions[$currentVendor][$majorMinor])
-				&& (version_compare($oldVersion, $newVersion, '<=') ||
-					$this->config->getSystemValue('debug', false));
-		}
-
-		// Check if the instance can be migrated
-		return isset($allowedPreviousVersions[$currentVendor][$majorMinor]) ||
-			isset($allowedPreviousVersions[$currentVendor][$oldVersion]);
-	}
-
-	/**
-	 * runs the update actions in maintenance mode, does not upgrade the source files
-	 * except the main .htaccess file
-	 *
-	 * @param string $currentVersion current version to upgrade to
-	 * @param string $installedVersion previous version from which to upgrade from
-	 *
-	 * @throws \Exception
-	 */
-	private function doUpgrade($currentVersion, $installedVersion) {
-		// Stop update if the update is over several major versions
-		$allowedPreviousVersions = $this->getAllowedPreviousVersions();
-		if (!$this->isUpgradePossible($installedVersion, $currentVersion, $allowedPreviousVersions)) {
-			throw new \Exception('Updates between multiple major versions and downgrades are unsupported.');
-		}
-
-		// Update .htaccess files
-		try {
-			Setup::updateHtaccess();
-			Setup::protectDataDirectory();
-		} catch (\Exception $e) {
-			throw new \Exception($e->getMessage());
-		}
-
-		// create empty file in data dir, so we can later find
-		// out that this is indeed an ownCloud data directory
-		// (in case it didn't exist before)
-		file_put_contents($this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', '');
-
-		// pre-upgrade repairs
-		$repair = new Repair(Repair::getBeforeUpgradeRepairSteps(), \OC::$server->getEventDispatcher());
-		$repair->run();
-
-		$this->doCoreUpgrade();
-
-		try {
-			// TODO: replace with the new repair step mechanism https://github.com/owncloud/core/pull/24378
-			Setup::installBackgroundJobs();
-		} catch (\Exception $e) {
-			throw new \Exception($e->getMessage());
-		}
-
-		// update all shipped apps
-		$this->checkAppsRequirements();
-		$this->doAppUpgrade();
-
-		// Update the appfetchers version so it downloads the correct list from the appstore
-		\OC::$server->getAppFetcher()->setVersion($currentVersion);
-
-		// upgrade appstore apps
-		$this->upgradeAppStoreApps(\OC::$server->getAppManager()->getInstalledApps());
-		$autoDisabledApps = \OC::$server->getAppManager()->getAutoDisabledApps();
-		$this->upgradeAppStoreApps($autoDisabledApps, true);
-
-		// install new shipped apps on upgrade
-		OC_App::loadApps(['authentication']);
-		$errors = Installer::installShippedApps(true);
-		foreach ($errors as $appId => $exception) {
-			/** @var \Exception $exception */
-			$this->log->logException($exception, ['app' => $appId]);
-			$this->emit('\OC\Updater', 'failure', [$appId . ': ' . $exception->getMessage()]);
-		}
-
-		// post-upgrade repairs
-		$repair = new Repair(Repair::getRepairSteps(), \OC::$server->getEventDispatcher());
-		$repair->run();
-
-		//Invalidate update feed
-		$this->config->setAppValue('core', 'lastupdatedat', 0);
-
-		// Check for code integrity if not disabled
-		if (\OC::$server->getIntegrityCodeChecker()->isCodeCheckEnforced()) {
-			$this->emit('\OC\Updater', 'startCheckCodeIntegrity');
-			$this->checker->runInstanceVerification();
-			$this->emit('\OC\Updater', 'finishedCheckCodeIntegrity');
-		}
-
-		// only set the final version if everything went well
-		$this->config->setSystemValue('version', implode('.', Util::getVersion()));
-		$this->config->setAppValue('core', 'vendor', $this->getVendor());
-	}
-
-	protected function doCoreUpgrade() {
-		$this->emit('\OC\Updater', 'dbUpgradeBefore');
-
-		// execute core migrations
-		$ms = new MigrationService('core', \OC::$server->getDatabaseConnection());
-		$ms->migrate();
-
-		$this->emit('\OC\Updater', 'dbUpgrade');
-	}
-
-	/**
-	 * upgrades all apps within a major ownCloud upgrade. Also loads "priority"
-	 * (types authentication, filesystem, logging, in that order) afterwards.
-	 *
-	 * @throws NeedsUpdateException
-	 */
-	protected function doAppUpgrade() {
-		$apps = \OC_App::getEnabledApps();
-		$priorityTypes = ['authentication', 'filesystem', 'logging'];
-		$pseudoOtherType = 'other';
-		$stacks = [$pseudoOtherType => []];
-
-		foreach ($apps as $appId) {
-			$priorityType = false;
-			foreach ($priorityTypes as $type) {
-				if (!isset($stacks[$type])) {
-					$stacks[$type] = [];
-				}
-				if (\OC_App::isType($appId, [$type])) {
-					$stacks[$type][] = $appId;
-					$priorityType = true;
-					break;
-				}
-			}
-			if (!$priorityType) {
-				$stacks[$pseudoOtherType][] = $appId;
-			}
-		}
-		foreach ($stacks as $type => $stack) {
-			foreach ($stack as $appId) {
-				if (\OC_App::shouldUpgrade($appId)) {
-					$this->emit('\OC\Updater', 'appUpgradeStarted', [$appId, \OC_App::getAppVersion($appId)]);
-					\OC_App::updateApp($appId);
-					$this->emit('\OC\Updater', 'appUpgrade', [$appId, \OC_App::getAppVersion($appId)]);
-				}
-				if ($type !== $pseudoOtherType) {
-					// load authentication, filesystem and logging apps after
-					// upgrading them. Other apps my need to rely on modifying
-					// user and/or filesystem aspects.
-					\OC_App::loadApp($appId);
-				}
-			}
-		}
-	}
-
-	/**
-	 * check if the current enabled apps are compatible with the current
-	 * ownCloud version. disable them if not.
-	 * This is important if you upgrade ownCloud and have non ported 3rd
-	 * party apps installed.
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
-	private function checkAppsRequirements() {
-		$isCoreUpgrade = $this->isCodeUpgrade();
-		$apps = OC_App::getEnabledApps();
-		$version = implode('.', Util::getVersion());
-		$disabledApps = [];
-		$appManager = \OC::$server->getAppManager();
-		foreach ($apps as $app) {
-			// check if the app is compatible with this version of Nextcloud
-			$info = OC_App::getAppInfo($app);
-			if ($info === null || !OC_App::isAppCompatible($version, $info)) {
-				if ($appManager->isShipped($app)) {
-					throw new \UnexpectedValueException('The files of the app "' . $app . '" were not correctly replaced before running the update');
-				}
-				\OC::$server->getAppManager()->disableApp($app, true);
-				$this->emit('\OC\Updater', 'incompatibleAppDisabled', [$app]);
-			}
-			// no need to disable any app in case this is a non-core upgrade
-			if (!$isCoreUpgrade) {
-				continue;
-			}
-			// shipped apps will remain enabled
-			if ($appManager->isShipped($app)) {
-				continue;
-			}
-			// authentication and session apps will remain enabled as well
-			if (OC_App::isType($app, ['session', 'authentication'])) {
-				continue;
-			}
-		}
-		return $disabledApps;
-	}
-
-	/**
-	 * @return bool
-	 */
-	private function isCodeUpgrade() {
-		$installedVersion = $this->config->getSystemValue('version', '0.0.0');
-		$currentVersion = implode('.', Util::getVersion());
-		if (version_compare($currentVersion, $installedVersion, '>')) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param array $disabledApps
-	 * @param bool $reenable
-	 * @throws \Exception
-	 */
-	private function upgradeAppStoreApps(array $disabledApps, $reenable = false) {
-		foreach ($disabledApps as $app) {
-			try {
-				$this->emit('\OC\Updater', 'checkAppStoreAppBefore', [$app]);
-				if ($this->installer->isUpdateAvailable($app)) {
-					$this->emit('\OC\Updater', 'upgradeAppStoreApp', [$app]);
-					$this->installer->updateAppstoreApp($app);
-				}
-				$this->emit('\OC\Updater', 'checkAppStoreApp', [$app]);
-
-				if ($reenable) {
-					$ocApp = new \OC_App();
-					$ocApp->enable($app);
-				}
-			} catch (\Exception $ex) {
-				$this->log->logException($ex, ['app' => 'core']);
-			}
-		}
-	}
-
-	/**
-	 * Forward messages emitted by the repair routine
-	 */
-	private function emitRepairEvents() {
-		$dispatcher = \OC::$server->getEventDispatcher();
-		$dispatcher->addListener('\OC\Repair::warning', function ($event) {
-			if ($event instanceof GenericEvent) {
-				$this->emit('\OC\Updater', 'repairWarning', $event->getArguments());
-			}
-		});
-		$dispatcher->addListener('\OC\Repair::error', function ($event) {
-			if ($event instanceof GenericEvent) {
-				$this->emit('\OC\Updater', 'repairError', $event->getArguments());
-			}
-		});
-		$dispatcher->addListener('\OC\Repair::info', function ($event) {
-			if ($event instanceof GenericEvent) {
-				$this->emit('\OC\Updater', 'repairInfo', $event->getArguments());
-			}
-		});
-		$dispatcher->addListener('\OC\Repair::step', function ($event) {
-			if ($event instanceof GenericEvent) {
-				$this->emit('\OC\Updater', 'repairStep', $event->getArguments());
-			}
-		});
-	}
-
-	private function logAllEvents() {
-		$log = $this->log;
-
-		$dispatcher = \OC::$server->getEventDispatcher();
-		$dispatcher->addListener('\OC\DB\Migrator::executeSql', function ($event) use ($log) {
-			if (!$event instanceof GenericEvent) {
-				return;
-			}
-			$log->info('\OC\DB\Migrator::executeSql: ' . $event->getSubject() . ' (' . $event->getArgument(0) . ' of ' . $event->getArgument(1) . ')', ['app' => 'updater']);
-		});
-		$dispatcher->addListener('\OC\DB\Migrator::checkTable', function ($event) use ($log) {
-			if (!$event instanceof GenericEvent) {
-				return;
-			}
-			$log->info('\OC\DB\Migrator::checkTable: ' . $event->getSubject() . ' (' . $event->getArgument(0) . ' of ' . $event->getArgument(1) . ')', ['app' => 'updater']);
-		});
-
-		$repairListener = function ($event) use ($log) {
-			if (!$event instanceof GenericEvent) {
-				return;
-			}
-			switch ($event->getSubject()) {
-				case '\OC\Repair::startProgress':
-					$log->info('\OC\Repair::startProgress: Starting ... ' . $event->getArgument(1) .  ' (' . $event->getArgument(0) . ')', ['app' => 'updater']);
-					break;
-				case '\OC\Repair::advance':
-					$desc = $event->getArgument(1);
-					if (empty($desc)) {
-						$desc = '';
-					}
-					$log->info('\OC\Repair::advance: ' . $desc . ' (' . $event->getArgument(0) . ')', ['app' => 'updater']);
-
-					break;
-				case '\OC\Repair::finishProgress':
-					$log->info('\OC\Repair::finishProgress', ['app' => 'updater']);
-					break;
-				case '\OC\Repair::step':
-					$log->info('\OC\Repair::step: Repair step: ' . $event->getArgument(0), ['app' => 'updater']);
-					break;
-				case '\OC\Repair::info':
-					$log->info('\OC\Repair::info: Repair info: ' . $event->getArgument(0), ['app' => 'updater']);
-					break;
-				case '\OC\Repair::warning':
-					$log->warning('\OC\Repair::warning: Repair warning: ' . $event->getArgument(0), ['app' => 'updater']);
-					break;
-				case '\OC\Repair::error':
-					$log->error('\OC\Repair::error: Repair error: ' . $event->getArgument(0), ['app' => 'updater']);
-					break;
-			}
-		};
-
-		$dispatcher->addListener('\OC\Repair::startProgress', $repairListener);
-		$dispatcher->addListener('\OC\Repair::advance', $repairListener);
-		$dispatcher->addListener('\OC\Repair::finishProgress', $repairListener);
-		$dispatcher->addListener('\OC\Repair::step', $repairListener);
-		$dispatcher->addListener('\OC\Repair::info', $repairListener);
-		$dispatcher->addListener('\OC\Repair::warning', $repairListener);
-		$dispatcher->addListener('\OC\Repair::error', $repairListener);
-
-
-		$this->listen('\OC\Updater', 'maintenanceEnabled', function () use ($log) {
-			$log->info('\OC\Updater::maintenanceEnabled: Turned on maintenance mode', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'maintenanceDisabled', function () use ($log) {
-			$log->info('\OC\Updater::maintenanceDisabled: Turned off maintenance mode', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'maintenanceActive', function () use ($log) {
-			$log->info('\OC\Updater::maintenanceActive: Maintenance mode is kept active', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'updateEnd', function ($success) use ($log) {
-			if ($success) {
-				$log->info('\OC\Updater::updateEnd: Update successful', ['app' => 'updater']);
-			} else {
-				$log->error('\OC\Updater::updateEnd: Update failed', ['app' => 'updater']);
-			}
-		});
-		$this->listen('\OC\Updater', 'dbUpgradeBefore', function () use ($log) {
-			$log->info('\OC\Updater::dbUpgradeBefore: Updating database schema', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'dbUpgrade', function () use ($log) {
-			$log->info('\OC\Updater::dbUpgrade: Updated database', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use ($log) {
-			$log->info('\OC\Updater::dbSimulateUpgradeBefore: Checking whether the database schema can be updated (this can take a long time depending on the database size)', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($log) {
-			$log->info('\OC\Updater::dbSimulateUpgrade: Checked database schema update', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use ($log) {
-			$log->info('\OC\Updater::incompatibleAppDisabled: Disabled incompatible app: ' . $app, ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($log) {
-			$log->info('\OC\Updater::checkAppStoreAppBefore: Checking for update of app "' . $app . '" in appstore', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($log) {
-			$log->info('\OC\Updater::upgradeAppStoreApp: Update app "' . $app . '" from appstore', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($log) {
-			$log->info('\OC\Updater::checkAppStoreApp: Checked for update of app "' . $app . '" in appstore', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($log) {
-			$log->info('\OC\Updater::appUpgradeCheckBefore: Checking updates of apps', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($log) {
-			$log->info('\OC\Updater::appSimulateUpdate: Checking whether the database schema for <' . $app . '> can be updated (this can take a long time depending on the database size)', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'appUpgradeCheck', function () use ($log) {
-			$log->info('\OC\Updater::appUpgradeCheck: Checked database schema update for apps', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'appUpgradeStarted', function ($app) use ($log) {
-			$log->info('\OC\Updater::appUpgradeStarted: Updating <' . $app . '> ...', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($log) {
-			$log->info('\OC\Updater::appUpgrade: Updated <' . $app . '> to ' . $version, ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'failure', function ($message) use ($log) {
-			$log->error('\OC\Updater::failure: ' . $message, ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'setDebugLogLevel', function () use ($log) {
-			$log->info('\OC\Updater::setDebugLogLevel: Set log level to debug', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use ($log) {
-			$log->info('\OC\Updater::resetLogLevel: Reset log level to ' . $logLevelName . '(' . $logLevel . ')', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use ($log) {
-			$log->info('\OC\Updater::startCheckCodeIntegrity: Starting code integrity check...', ['app' => 'updater']);
-		});
-		$this->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use ($log) {
-			$log->info('\OC\Updater::finishedCheckCodeIntegrity: Finished code integrity check', ['app' => 'updater']);
-		});
-	}
+    /** @var ILogger $log */
+    private $log;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var Checker */
+    private $checker;
+
+    /** @var Installer */
+    private $installer;
+
+    private $logLevelNames = [
+        0 => 'Debug',
+        1 => 'Info',
+        2 => 'Warning',
+        3 => 'Error',
+        4 => 'Fatal',
+    ];
+
+    /**
+     * @param IConfig $config
+     * @param Checker $checker
+     * @param ILogger $log
+     * @param Installer $installer
+     */
+    public function __construct(IConfig $config,
+                                Checker $checker,
+                                ILogger $log = null,
+                                Installer $installer) {
+        $this->log = $log;
+        $this->config = $config;
+        $this->checker = $checker;
+        $this->installer = $installer;
+    }
+
+    /**
+     * runs the update actions in maintenance mode, does not upgrade the source files
+     * except the main .htaccess file
+     *
+     * @return bool true if the operation succeeded, false otherwise
+     */
+    public function upgrade() {
+        $this->emitRepairEvents();
+        $this->logAllEvents();
+
+        $logLevel = $this->config->getSystemValue('loglevel', ILogger::WARN);
+        $this->emit('\OC\Updater', 'setDebugLogLevel', [ $logLevel, $this->logLevelNames[$logLevel] ]);
+        $this->config->setSystemValue('loglevel', ILogger::DEBUG);
+
+        $wasMaintenanceModeEnabled = $this->config->getSystemValueBool('maintenance');
+
+        if (!$wasMaintenanceModeEnabled) {
+            $this->config->setSystemValue('maintenance', true);
+            $this->emit('\OC\Updater', 'maintenanceEnabled');
+        }
+
+        // Clear CAN_INSTALL file if not on git
+        if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) {
+            if (!unlink(\OC::$configDir . '/CAN_INSTALL')) {
+                $this->log->error('Could not cleanup CAN_INSTALL from your config folder. Please remove this file manually.');
+            }
+        }
+
+        $installedVersion = $this->config->getSystemValue('version', '0.0.0');
+        $currentVersion = implode('.', \OCP\Util::getVersion());
+
+        $this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, ['app' => 'core']);
+
+        $success = true;
+        try {
+            $this->doUpgrade($currentVersion, $installedVersion);
+        } catch (HintException $exception) {
+            $this->log->logException($exception, ['app' => 'core']);
+            $this->emit('\OC\Updater', 'failure', [$exception->getMessage() . ': ' .$exception->getHint()]);
+            $success = false;
+        } catch (\Exception $exception) {
+            $this->log->logException($exception, ['app' => 'core']);
+            $this->emit('\OC\Updater', 'failure', [get_class($exception) . ': ' .$exception->getMessage()]);
+            $success = false;
+        }
+
+        $this->emit('\OC\Updater', 'updateEnd', [$success]);
+
+        if (!$wasMaintenanceModeEnabled && $success) {
+            $this->config->setSystemValue('maintenance', false);
+            $this->emit('\OC\Updater', 'maintenanceDisabled');
+        } else {
+            $this->emit('\OC\Updater', 'maintenanceActive');
+        }
+
+        $this->emit('\OC\Updater', 'resetLogLevel', [ $logLevel, $this->logLevelNames[$logLevel] ]);
+        $this->config->setSystemValue('loglevel', $logLevel);
+        $this->config->setSystemValue('installed', true);
+
+        return $success;
+    }
+
+    /**
+     * Return version from which this version is allowed to upgrade from
+     *
+     * @return array allowed previous versions per vendor
+     */
+    private function getAllowedPreviousVersions() {
+        // this should really be a JSON file
+        require \OC::$SERVERROOT . '/version.php';
+        /** @var array $OC_VersionCanBeUpgradedFrom */
+        return $OC_VersionCanBeUpgradedFrom;
+    }
+
+    /**
+     * Return vendor from which this version was published
+     *
+     * @return string Get the vendor
+     */
+    private function getVendor() {
+        // this should really be a JSON file
+        require \OC::$SERVERROOT . '/version.php';
+        /** @var string $vendor */
+        return (string) $vendor;
+    }
+
+    /**
+     * Whether an upgrade to a specified version is possible
+     * @param string $oldVersion
+     * @param string $newVersion
+     * @param array $allowedPreviousVersions
+     * @return bool
+     */
+    public function isUpgradePossible($oldVersion, $newVersion, array $allowedPreviousVersions) {
+        $version = explode('.', $oldVersion);
+        $majorMinor = $version[0] . '.' . $version[1];
+
+        $currentVendor = $this->config->getAppValue('core', 'vendor', '');
+
+        // Vendor was not set correctly on install, so we have to white-list known versions
+        if ($currentVendor === '' && (
+            isset($allowedPreviousVersions['owncloud'][$oldVersion]) ||
+            isset($allowedPreviousVersions['owncloud'][$majorMinor])
+        )) {
+            $currentVendor = 'owncloud';
+            $this->config->setAppValue('core', 'vendor', $currentVendor);
+        }
+
+        if ($currentVendor === 'nextcloud') {
+            return isset($allowedPreviousVersions[$currentVendor][$majorMinor])
+                && (version_compare($oldVersion, $newVersion, '<=') ||
+                    $this->config->getSystemValue('debug', false));
+        }
+
+        // Check if the instance can be migrated
+        return isset($allowedPreviousVersions[$currentVendor][$majorMinor]) ||
+            isset($allowedPreviousVersions[$currentVendor][$oldVersion]);
+    }
+
+    /**
+     * runs the update actions in maintenance mode, does not upgrade the source files
+     * except the main .htaccess file
+     *
+     * @param string $currentVersion current version to upgrade to
+     * @param string $installedVersion previous version from which to upgrade from
+     *
+     * @throws \Exception
+     */
+    private function doUpgrade($currentVersion, $installedVersion) {
+        // Stop update if the update is over several major versions
+        $allowedPreviousVersions = $this->getAllowedPreviousVersions();
+        if (!$this->isUpgradePossible($installedVersion, $currentVersion, $allowedPreviousVersions)) {
+            throw new \Exception('Updates between multiple major versions and downgrades are unsupported.');
+        }
+
+        // Update .htaccess files
+        try {
+            Setup::updateHtaccess();
+            Setup::protectDataDirectory();
+        } catch (\Exception $e) {
+            throw new \Exception($e->getMessage());
+        }
+
+        // create empty file in data dir, so we can later find
+        // out that this is indeed an ownCloud data directory
+        // (in case it didn't exist before)
+        file_put_contents($this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', '');
+
+        // pre-upgrade repairs
+        $repair = new Repair(Repair::getBeforeUpgradeRepairSteps(), \OC::$server->getEventDispatcher());
+        $repair->run();
+
+        $this->doCoreUpgrade();
+
+        try {
+            // TODO: replace with the new repair step mechanism https://github.com/owncloud/core/pull/24378
+            Setup::installBackgroundJobs();
+        } catch (\Exception $e) {
+            throw new \Exception($e->getMessage());
+        }
+
+        // update all shipped apps
+        $this->checkAppsRequirements();
+        $this->doAppUpgrade();
+
+        // Update the appfetchers version so it downloads the correct list from the appstore
+        \OC::$server->getAppFetcher()->setVersion($currentVersion);
+
+        // upgrade appstore apps
+        $this->upgradeAppStoreApps(\OC::$server->getAppManager()->getInstalledApps());
+        $autoDisabledApps = \OC::$server->getAppManager()->getAutoDisabledApps();
+        $this->upgradeAppStoreApps($autoDisabledApps, true);
+
+        // install new shipped apps on upgrade
+        OC_App::loadApps(['authentication']);
+        $errors = Installer::installShippedApps(true);
+        foreach ($errors as $appId => $exception) {
+            /** @var \Exception $exception */
+            $this->log->logException($exception, ['app' => $appId]);
+            $this->emit('\OC\Updater', 'failure', [$appId . ': ' . $exception->getMessage()]);
+        }
+
+        // post-upgrade repairs
+        $repair = new Repair(Repair::getRepairSteps(), \OC::$server->getEventDispatcher());
+        $repair->run();
+
+        //Invalidate update feed
+        $this->config->setAppValue('core', 'lastupdatedat', 0);
+
+        // Check for code integrity if not disabled
+        if (\OC::$server->getIntegrityCodeChecker()->isCodeCheckEnforced()) {
+            $this->emit('\OC\Updater', 'startCheckCodeIntegrity');
+            $this->checker->runInstanceVerification();
+            $this->emit('\OC\Updater', 'finishedCheckCodeIntegrity');
+        }
+
+        // only set the final version if everything went well
+        $this->config->setSystemValue('version', implode('.', Util::getVersion()));
+        $this->config->setAppValue('core', 'vendor', $this->getVendor());
+    }
+
+    protected function doCoreUpgrade() {
+        $this->emit('\OC\Updater', 'dbUpgradeBefore');
+
+        // execute core migrations
+        $ms = new MigrationService('core', \OC::$server->getDatabaseConnection());
+        $ms->migrate();
+
+        $this->emit('\OC\Updater', 'dbUpgrade');
+    }
+
+    /**
+     * upgrades all apps within a major ownCloud upgrade. Also loads "priority"
+     * (types authentication, filesystem, logging, in that order) afterwards.
+     *
+     * @throws NeedsUpdateException
+     */
+    protected function doAppUpgrade() {
+        $apps = \OC_App::getEnabledApps();
+        $priorityTypes = ['authentication', 'filesystem', 'logging'];
+        $pseudoOtherType = 'other';
+        $stacks = [$pseudoOtherType => []];
+
+        foreach ($apps as $appId) {
+            $priorityType = false;
+            foreach ($priorityTypes as $type) {
+                if (!isset($stacks[$type])) {
+                    $stacks[$type] = [];
+                }
+                if (\OC_App::isType($appId, [$type])) {
+                    $stacks[$type][] = $appId;
+                    $priorityType = true;
+                    break;
+                }
+            }
+            if (!$priorityType) {
+                $stacks[$pseudoOtherType][] = $appId;
+            }
+        }
+        foreach ($stacks as $type => $stack) {
+            foreach ($stack as $appId) {
+                if (\OC_App::shouldUpgrade($appId)) {
+                    $this->emit('\OC\Updater', 'appUpgradeStarted', [$appId, \OC_App::getAppVersion($appId)]);
+                    \OC_App::updateApp($appId);
+                    $this->emit('\OC\Updater', 'appUpgrade', [$appId, \OC_App::getAppVersion($appId)]);
+                }
+                if ($type !== $pseudoOtherType) {
+                    // load authentication, filesystem and logging apps after
+                    // upgrading them. Other apps my need to rely on modifying
+                    // user and/or filesystem aspects.
+                    \OC_App::loadApp($appId);
+                }
+            }
+        }
+    }
+
+    /**
+     * check if the current enabled apps are compatible with the current
+     * ownCloud version. disable them if not.
+     * This is important if you upgrade ownCloud and have non ported 3rd
+     * party apps installed.
+     *
+     * @return array
+     * @throws \Exception
+     */
+    private function checkAppsRequirements() {
+        $isCoreUpgrade = $this->isCodeUpgrade();
+        $apps = OC_App::getEnabledApps();
+        $version = implode('.', Util::getVersion());
+        $disabledApps = [];
+        $appManager = \OC::$server->getAppManager();
+        foreach ($apps as $app) {
+            // check if the app is compatible with this version of Nextcloud
+            $info = OC_App::getAppInfo($app);
+            if ($info === null || !OC_App::isAppCompatible($version, $info)) {
+                if ($appManager->isShipped($app)) {
+                    throw new \UnexpectedValueException('The files of the app "' . $app . '" were not correctly replaced before running the update');
+                }
+                \OC::$server->getAppManager()->disableApp($app, true);
+                $this->emit('\OC\Updater', 'incompatibleAppDisabled', [$app]);
+            }
+            // no need to disable any app in case this is a non-core upgrade
+            if (!$isCoreUpgrade) {
+                continue;
+            }
+            // shipped apps will remain enabled
+            if ($appManager->isShipped($app)) {
+                continue;
+            }
+            // authentication and session apps will remain enabled as well
+            if (OC_App::isType($app, ['session', 'authentication'])) {
+                continue;
+            }
+        }
+        return $disabledApps;
+    }
+
+    /**
+     * @return bool
+     */
+    private function isCodeUpgrade() {
+        $installedVersion = $this->config->getSystemValue('version', '0.0.0');
+        $currentVersion = implode('.', Util::getVersion());
+        if (version_compare($currentVersion, $installedVersion, '>')) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param array $disabledApps
+     * @param bool $reenable
+     * @throws \Exception
+     */
+    private function upgradeAppStoreApps(array $disabledApps, $reenable = false) {
+        foreach ($disabledApps as $app) {
+            try {
+                $this->emit('\OC\Updater', 'checkAppStoreAppBefore', [$app]);
+                if ($this->installer->isUpdateAvailable($app)) {
+                    $this->emit('\OC\Updater', 'upgradeAppStoreApp', [$app]);
+                    $this->installer->updateAppstoreApp($app);
+                }
+                $this->emit('\OC\Updater', 'checkAppStoreApp', [$app]);
+
+                if ($reenable) {
+                    $ocApp = new \OC_App();
+                    $ocApp->enable($app);
+                }
+            } catch (\Exception $ex) {
+                $this->log->logException($ex, ['app' => 'core']);
+            }
+        }
+    }
+
+    /**
+     * Forward messages emitted by the repair routine
+     */
+    private function emitRepairEvents() {
+        $dispatcher = \OC::$server->getEventDispatcher();
+        $dispatcher->addListener('\OC\Repair::warning', function ($event) {
+            if ($event instanceof GenericEvent) {
+                $this->emit('\OC\Updater', 'repairWarning', $event->getArguments());
+            }
+        });
+        $dispatcher->addListener('\OC\Repair::error', function ($event) {
+            if ($event instanceof GenericEvent) {
+                $this->emit('\OC\Updater', 'repairError', $event->getArguments());
+            }
+        });
+        $dispatcher->addListener('\OC\Repair::info', function ($event) {
+            if ($event instanceof GenericEvent) {
+                $this->emit('\OC\Updater', 'repairInfo', $event->getArguments());
+            }
+        });
+        $dispatcher->addListener('\OC\Repair::step', function ($event) {
+            if ($event instanceof GenericEvent) {
+                $this->emit('\OC\Updater', 'repairStep', $event->getArguments());
+            }
+        });
+    }
+
+    private function logAllEvents() {
+        $log = $this->log;
+
+        $dispatcher = \OC::$server->getEventDispatcher();
+        $dispatcher->addListener('\OC\DB\Migrator::executeSql', function ($event) use ($log) {
+            if (!$event instanceof GenericEvent) {
+                return;
+            }
+            $log->info('\OC\DB\Migrator::executeSql: ' . $event->getSubject() . ' (' . $event->getArgument(0) . ' of ' . $event->getArgument(1) . ')', ['app' => 'updater']);
+        });
+        $dispatcher->addListener('\OC\DB\Migrator::checkTable', function ($event) use ($log) {
+            if (!$event instanceof GenericEvent) {
+                return;
+            }
+            $log->info('\OC\DB\Migrator::checkTable: ' . $event->getSubject() . ' (' . $event->getArgument(0) . ' of ' . $event->getArgument(1) . ')', ['app' => 'updater']);
+        });
+
+        $repairListener = function ($event) use ($log) {
+            if (!$event instanceof GenericEvent) {
+                return;
+            }
+            switch ($event->getSubject()) {
+                case '\OC\Repair::startProgress':
+                    $log->info('\OC\Repair::startProgress: Starting ... ' . $event->getArgument(1) .  ' (' . $event->getArgument(0) . ')', ['app' => 'updater']);
+                    break;
+                case '\OC\Repair::advance':
+                    $desc = $event->getArgument(1);
+                    if (empty($desc)) {
+                        $desc = '';
+                    }
+                    $log->info('\OC\Repair::advance: ' . $desc . ' (' . $event->getArgument(0) . ')', ['app' => 'updater']);
+
+                    break;
+                case '\OC\Repair::finishProgress':
+                    $log->info('\OC\Repair::finishProgress', ['app' => 'updater']);
+                    break;
+                case '\OC\Repair::step':
+                    $log->info('\OC\Repair::step: Repair step: ' . $event->getArgument(0), ['app' => 'updater']);
+                    break;
+                case '\OC\Repair::info':
+                    $log->info('\OC\Repair::info: Repair info: ' . $event->getArgument(0), ['app' => 'updater']);
+                    break;
+                case '\OC\Repair::warning':
+                    $log->warning('\OC\Repair::warning: Repair warning: ' . $event->getArgument(0), ['app' => 'updater']);
+                    break;
+                case '\OC\Repair::error':
+                    $log->error('\OC\Repair::error: Repair error: ' . $event->getArgument(0), ['app' => 'updater']);
+                    break;
+            }
+        };
+
+        $dispatcher->addListener('\OC\Repair::startProgress', $repairListener);
+        $dispatcher->addListener('\OC\Repair::advance', $repairListener);
+        $dispatcher->addListener('\OC\Repair::finishProgress', $repairListener);
+        $dispatcher->addListener('\OC\Repair::step', $repairListener);
+        $dispatcher->addListener('\OC\Repair::info', $repairListener);
+        $dispatcher->addListener('\OC\Repair::warning', $repairListener);
+        $dispatcher->addListener('\OC\Repair::error', $repairListener);
+
+
+        $this->listen('\OC\Updater', 'maintenanceEnabled', function () use ($log) {
+            $log->info('\OC\Updater::maintenanceEnabled: Turned on maintenance mode', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'maintenanceDisabled', function () use ($log) {
+            $log->info('\OC\Updater::maintenanceDisabled: Turned off maintenance mode', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'maintenanceActive', function () use ($log) {
+            $log->info('\OC\Updater::maintenanceActive: Maintenance mode is kept active', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'updateEnd', function ($success) use ($log) {
+            if ($success) {
+                $log->info('\OC\Updater::updateEnd: Update successful', ['app' => 'updater']);
+            } else {
+                $log->error('\OC\Updater::updateEnd: Update failed', ['app' => 'updater']);
+            }
+        });
+        $this->listen('\OC\Updater', 'dbUpgradeBefore', function () use ($log) {
+            $log->info('\OC\Updater::dbUpgradeBefore: Updating database schema', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'dbUpgrade', function () use ($log) {
+            $log->info('\OC\Updater::dbUpgrade: Updated database', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use ($log) {
+            $log->info('\OC\Updater::dbSimulateUpgradeBefore: Checking whether the database schema can be updated (this can take a long time depending on the database size)', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($log) {
+            $log->info('\OC\Updater::dbSimulateUpgrade: Checked database schema update', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use ($log) {
+            $log->info('\OC\Updater::incompatibleAppDisabled: Disabled incompatible app: ' . $app, ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($log) {
+            $log->info('\OC\Updater::checkAppStoreAppBefore: Checking for update of app "' . $app . '" in appstore', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($log) {
+            $log->info('\OC\Updater::upgradeAppStoreApp: Update app "' . $app . '" from appstore', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($log) {
+            $log->info('\OC\Updater::checkAppStoreApp: Checked for update of app "' . $app . '" in appstore', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($log) {
+            $log->info('\OC\Updater::appUpgradeCheckBefore: Checking updates of apps', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($log) {
+            $log->info('\OC\Updater::appSimulateUpdate: Checking whether the database schema for <' . $app . '> can be updated (this can take a long time depending on the database size)', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'appUpgradeCheck', function () use ($log) {
+            $log->info('\OC\Updater::appUpgradeCheck: Checked database schema update for apps', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'appUpgradeStarted', function ($app) use ($log) {
+            $log->info('\OC\Updater::appUpgradeStarted: Updating <' . $app . '> ...', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($log) {
+            $log->info('\OC\Updater::appUpgrade: Updated <' . $app . '> to ' . $version, ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'failure', function ($message) use ($log) {
+            $log->error('\OC\Updater::failure: ' . $message, ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'setDebugLogLevel', function () use ($log) {
+            $log->info('\OC\Updater::setDebugLogLevel: Set log level to debug', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use ($log) {
+            $log->info('\OC\Updater::resetLogLevel: Reset log level to ' . $logLevelName . '(' . $logLevel . ')', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use ($log) {
+            $log->info('\OC\Updater::startCheckCodeIntegrity: Starting code integrity check...', ['app' => 'updater']);
+        });
+        $this->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use ($log) {
+            $log->info('\OC\Updater::finishedCheckCodeIntegrity: Finished code integrity check', ['app' => 'updater']);
+        });
+    }
 }

lib/private/Repair/Owncloud/SaveAccountsTableData.php

Indentation +160 added lines, -160 removed lines

@@ -36,164 +36,164 @@
  * before the data structure is changed and the information is gone
  */
 class SaveAccountsTableData implements IRepairStep {
-	public const BATCH_SIZE = 75;
-
-	/** @var IDBConnection */
-	protected $db;
-
-	/** @var IConfig */
-	protected $config;
-
-	protected $hasForeignKeyOnPersistentLocks = false;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param IConfig $config
-	 */
-	public function __construct(IDBConnection $db, IConfig $config) {
-		$this->db = $db;
-		$this->config = $config;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Copy data from accounts table when migrating from ownCloud';
-	}
-
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		if (!$this->shouldRun()) {
-			return;
-		}
-
-		$offset = 0;
-		$numUsers = $this->runStep($offset);
-
-		while ($numUsers === self::BATCH_SIZE) {
-			$offset += $numUsers;
-			$numUsers = $this->runStep($offset);
-		}
-
-		// oc_persistent_locks will be removed later on anyways so we can just drop and ignore any foreign key constraints here
-		$tableName = $this->config->getSystemValue('dbtableprefix', 'oc_') . 'persistent_locks';
-		$schema = $this->db->createSchema();
-		$table = $schema->getTable($tableName);
-		foreach ($table->getForeignKeys() as $foreignKey) {
-			$table->removeForeignKey($foreignKey->getName());
-		}
-		$this->db->migrateToSchema($schema);
-
-		// Remove the table
-		if ($this->hasForeignKeyOnPersistentLocks) {
-			$this->db->dropTable('persistent_locks');
-		}
-		$this->db->dropTable('accounts');
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function shouldRun() {
-		$schema = $this->db->createSchema();
-		$prefix = $this->config->getSystemValue('dbtableprefix', 'oc_');
-
-		$tableName = $prefix . 'accounts';
-		if (!$schema->hasTable($tableName)) {
-			return false;
-		}
-
-		$table = $schema->getTable($tableName);
-		if (!$table->hasColumn('user_id')) {
-			return false;
-		}
-
-		if ($schema->hasTable($prefix . 'persistent_locks')) {
-			$locksTable = $schema->getTable($prefix . 'persistent_locks');
-			$foreignKeys = $locksTable->getForeignKeys();
-			foreach ($foreignKeys as $foreignKey) {
-				if ($tableName === $foreignKey->getForeignTableName()) {
-					$this->hasForeignKeyOnPersistentLocks = true;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param int $offset
-	 * @return int Number of copied users
-	 */
-	protected function runStep($offset) {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('accounts')
-			->orderBy('id')
-			->setMaxResults(self::BATCH_SIZE);
-
-		if ($offset > 0) {
-			$query->setFirstResult($offset);
-		}
-
-		$result = $query->execute();
-
-		$update = $this->db->getQueryBuilder();
-		$update->update('users')
-			->set('displayname', $update->createParameter('displayname'))
-			->where($update->expr()->eq('uid', $update->createParameter('userid')));
-
-		$updatedUsers = 0;
-		while ($row = $result->fetch()) {
-			try {
-				$this->migrateUserInfo($update, $row);
-			} catch (PreConditionNotMetException $e) {
-				// Ignore and continue
-			} catch (\UnexpectedValueException $e) {
-				// Ignore and continue
-			}
-			$updatedUsers++;
-		}
-		$result->closeCursor();
-
-		return $updatedUsers;
-	}
-
-	/**
-	 * @param IQueryBuilder $update
-	 * @param array $userdata
-	 * @throws PreConditionNotMetException
-	 * @throws \UnexpectedValueException
-	 */
-	protected function migrateUserInfo(IQueryBuilder $update, $userdata) {
-		$state = (int) $userdata['state'];
-		if ($state === 3) {
-			// Deleted user, ignore
-			return;
-		}
-
-		if ($userdata['email'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'settings', 'email', $userdata['email']);
-		}
-		if ($userdata['quota'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'files', 'quota', $userdata['quota']);
-		}
-		if ($userdata['last_login'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'login', 'lastLogin', $userdata['last_login']);
-		}
-		if ($state === 1) {
-			$this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'true');
-		} elseif ($state === 2) {
-			$this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'false');
-		}
-
-		if ($userdata['display_name'] !== null) {
-			$update->setParameter('displayname', $userdata['display_name'])
-				->setParameter('userid', $userdata['user_id']);
-			$update->execute();
-		}
-	}
+    public const BATCH_SIZE = 75;
+
+    /** @var IDBConnection */
+    protected $db;
+
+    /** @var IConfig */
+    protected $config;
+
+    protected $hasForeignKeyOnPersistentLocks = false;
+
+    /**
+     * @param IDBConnection $db
+     * @param IConfig $config
+     */
+    public function __construct(IDBConnection $db, IConfig $config) {
+        $this->db = $db;
+        $this->config = $config;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Copy data from accounts table when migrating from ownCloud';
+    }
+
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        if (!$this->shouldRun()) {
+            return;
+        }
+
+        $offset = 0;
+        $numUsers = $this->runStep($offset);
+
+        while ($numUsers === self::BATCH_SIZE) {
+            $offset += $numUsers;
+            $numUsers = $this->runStep($offset);
+        }
+
+        // oc_persistent_locks will be removed later on anyways so we can just drop and ignore any foreign key constraints here
+        $tableName = $this->config->getSystemValue('dbtableprefix', 'oc_') . 'persistent_locks';
+        $schema = $this->db->createSchema();
+        $table = $schema->getTable($tableName);
+        foreach ($table->getForeignKeys() as $foreignKey) {
+            $table->removeForeignKey($foreignKey->getName());
+        }
+        $this->db->migrateToSchema($schema);
+
+        // Remove the table
+        if ($this->hasForeignKeyOnPersistentLocks) {
+            $this->db->dropTable('persistent_locks');
+        }
+        $this->db->dropTable('accounts');
+    }
+
+    /**
+     * @return bool
+     */
+    protected function shouldRun() {
+        $schema = $this->db->createSchema();
+        $prefix = $this->config->getSystemValue('dbtableprefix', 'oc_');
+
+        $tableName = $prefix . 'accounts';
+        if (!$schema->hasTable($tableName)) {
+            return false;
+        }
+
+        $table = $schema->getTable($tableName);
+        if (!$table->hasColumn('user_id')) {
+            return false;
+        }
+
+        if ($schema->hasTable($prefix . 'persistent_locks')) {
+            $locksTable = $schema->getTable($prefix . 'persistent_locks');
+            $foreignKeys = $locksTable->getForeignKeys();
+            foreach ($foreignKeys as $foreignKey) {
+                if ($tableName === $foreignKey->getForeignTableName()) {
+                    $this->hasForeignKeyOnPersistentLocks = true;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @param int $offset
+     * @return int Number of copied users
+     */
+    protected function runStep($offset) {
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')
+            ->from('accounts')
+            ->orderBy('id')
+            ->setMaxResults(self::BATCH_SIZE);
+
+        if ($offset > 0) {
+            $query->setFirstResult($offset);
+        }
+
+        $result = $query->execute();
+
+        $update = $this->db->getQueryBuilder();
+        $update->update('users')
+            ->set('displayname', $update->createParameter('displayname'))
+            ->where($update->expr()->eq('uid', $update->createParameter('userid')));
+
+        $updatedUsers = 0;
+        while ($row = $result->fetch()) {
+            try {
+                $this->migrateUserInfo($update, $row);
+            } catch (PreConditionNotMetException $e) {
+                // Ignore and continue
+            } catch (\UnexpectedValueException $e) {
+                // Ignore and continue
+            }
+            $updatedUsers++;
+        }
+        $result->closeCursor();
+
+        return $updatedUsers;
+    }
+
+    /**
+     * @param IQueryBuilder $update
+     * @param array $userdata
+     * @throws PreConditionNotMetException
+     * @throws \UnexpectedValueException
+     */
+    protected function migrateUserInfo(IQueryBuilder $update, $userdata) {
+        $state = (int) $userdata['state'];
+        if ($state === 3) {
+            // Deleted user, ignore
+            return;
+        }
+
+        if ($userdata['email'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'settings', 'email', $userdata['email']);
+        }
+        if ($userdata['quota'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'files', 'quota', $userdata['quota']);
+        }
+        if ($userdata['last_login'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'login', 'lastLogin', $userdata['last_login']);
+        }
+        if ($state === 1) {
+            $this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'true');
+        } elseif ($state === 2) {
+            $this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'false');
+        }
+
+        if ($userdata['display_name'] !== null) {
+            $update->setParameter('displayname', $userdata['display_name'])
+                ->setParameter('userid', $userdata['user_id']);
+            $update->execute();
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -79,7 +79,7 @@ 
 		}
 
 		// oc_persistent_locks will be removed later on anyways so we can just drop and ignore any foreign key constraints here
-		$tableName = $this->config->getSystemValue('dbtableprefix', 'oc_') . 'persistent_locks';
+		$tableName = $this->config->getSystemValue('dbtableprefix', 'oc_').'persistent_locks';
 		$schema = $this->db->createSchema();
 		$table = $schema->getTable($tableName);
 		foreach ($table->getForeignKeys() as $foreignKey) {
@@ -101,7 +101,7 @@ 
 		$schema = $this->db->createSchema();
 		$prefix = $this->config->getSystemValue('dbtableprefix', 'oc_');
 
-		$tableName = $prefix . 'accounts';
+		$tableName = $prefix.'accounts';
 		if (!$schema->hasTable($tableName)) {
 			return false;
 		}
@@ -111,8 +111,8 @@ 
 			return false;
 		}
 
-		if ($schema->hasTable($prefix . 'persistent_locks')) {
-			$locksTable = $schema->getTable($prefix . 'persistent_locks');
+		if ($schema->hasTable($prefix.'persistent_locks')) {
+			$locksTable = $schema->getTable($prefix.'persistent_locks');
 			$foreignKeys = $locksTable->getForeignKeys();
 			foreach ($foreignKeys as $foreignKey) {
 				if ($tableName === $foreignKey->getForeignTableName()) {

lib/private/Repair/Owncloud/CleanPreviews.php

Indentation +34 added lines, -34 removed lines

@@ -31,43 +31,43 @@
 
 class CleanPreviews implements IRepairStep {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * MoveAvatars constructor.
-	 *
-	 * @param IJobList $jobList
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 */
-	public function __construct(IJobList $jobList,
-								IUserManager $userManager,
-								IConfig $config) {
-		$this->jobList = $jobList;
-		$this->userManager = $userManager;
-		$this->config = $config;
-	}
+    /**
+     * MoveAvatars constructor.
+     *
+     * @param IJobList $jobList
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     */
+    public function __construct(IJobList $jobList,
+                                IUserManager $userManager,
+                                IConfig $config) {
+        $this->jobList = $jobList;
+        $this->userManager = $userManager;
+        $this->config = $config;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Add preview cleanup background jobs';
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Add preview cleanup background jobs';
+    }
 
-	public function run(IOutput $output) {
-		if (!$this->config->getAppValue('core', 'previewsCleanedUp', false)) {
-			$this->userManager->callForSeenUsers(function (IUser $user) {
-				$this->jobList->add(CleanPreviewsBackgroundJob::class, ['uid' => $user->getUID()]);
-			});
-			$this->config->setAppValue('core', 'previewsCleanedUp', '1');
-		}
-	}
+    public function run(IOutput $output) {
+        if (!$this->config->getAppValue('core', 'previewsCleanedUp', false)) {
+            $this->userManager->callForSeenUsers(function (IUser $user) {
+                $this->jobList->add(CleanPreviewsBackgroundJob::class, ['uid' => $user->getUID()]);
+            });
+            $this->config->setAppValue('core', 'previewsCleanedUp', '1');
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
 	public function run(IOutput $output) {
 		if (!$this->config->getAppValue('core', 'previewsCleanedUp', false)) {
-			$this->userManager->callForSeenUsers(function (IUser $user) {
+			$this->userManager->callForSeenUsers(function(IUser $user) {
 				$this->jobList->add(CleanPreviewsBackgroundJob::class, ['uid' => $user->getUID()]);
 			});
 			$this->config->setAppValue('core', 'previewsCleanedUp', '1');

lib/private/Repair/Owncloud/InstallCoreBundle.php

Indentation +42 added lines, -42 removed lines

@@ -30,51 +30,51 @@
 use OCP\Migration\IRepairStep;
 
 class InstallCoreBundle implements IRepairStep {
-	/** @var BundleFetcher */
-	private $bundleFetcher;
-	/** @var IConfig */
-	private $config;
-	/** @var Installer */
-	private $installer;
+    /** @var BundleFetcher */
+    private $bundleFetcher;
+    /** @var IConfig */
+    private $config;
+    /** @var Installer */
+    private $installer;
 
-	/**
-	 * @param BundleFetcher $bundleFetcher
-	 * @param IConfig $config
-	 * @param Installer $installer
-	 */
-	public function __construct(BundleFetcher $bundleFetcher,
-								IConfig $config,
-								Installer $installer) {
-		$this->bundleFetcher = $bundleFetcher;
-		$this->config = $config;
-		$this->installer = $installer;
-	}
+    /**
+     * @param BundleFetcher $bundleFetcher
+     * @param IConfig $config
+     * @param Installer $installer
+     */
+    public function __construct(BundleFetcher $bundleFetcher,
+                                IConfig $config,
+                                Installer $installer) {
+        $this->bundleFetcher = $bundleFetcher;
+        $this->config = $config;
+        $this->installer = $installer;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getName() {
-		return 'Install new core bundle components';
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getName() {
+        return 'Install new core bundle components';
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function run(IOutput $output) {
-		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+    /**
+     * {@inheritdoc}
+     */
+    public function run(IOutput $output) {
+        $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
 
-		if (version_compare($versionFromBeforeUpdate, '12.0.0.14', '>')) {
-			return;
-		}
+        if (version_compare($versionFromBeforeUpdate, '12.0.0.14', '>')) {
+            return;
+        }
 
-		$defaultBundle = $this->bundleFetcher->getDefaultInstallationBundle();
-		foreach ($defaultBundle as $bundle) {
-			try {
-				$this->installer->installAppBundle($bundle);
-				$output->info('Successfully installed core app bundle.');
-			} catch (\Exception $e) {
-				$output->warning('Could not install core app bundle: ' . $e->getMessage());
-			}
-		}
-	}
+        $defaultBundle = $this->bundleFetcher->getDefaultInstallationBundle();
+        foreach ($defaultBundle as $bundle) {
+            try {
+                $this->installer->installAppBundle($bundle);
+                $output->info('Successfully installed core app bundle.');
+            } catch (\Exception $e) {
+                $output->warning('Could not install core app bundle: ' . $e->getMessage());
+            }
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 				$this->installer->installAppBundle($bundle);
 				$output->info('Successfully installed core app bundle.');
 			} catch (\Exception $e) {
-				$output->warning('Could not install core app bundle: ' . $e->getMessage());
+				$output->warning('Could not install core app bundle: '.$e->getMessage());
 			}
 		}
 	}

lib/private/Repair/Owncloud/CleanPreviewsBackgroundJob.php

Indentation +96 added lines, -96 removed lines

@@ -33,100 +33,100 @@
 use OCP\IUserManager;
 
 class CleanPreviewsBackgroundJob extends QueuedJob {
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/**
-	 * CleanPreviewsBackgroundJob constructor.
-	 *
-	 * @param IRootFolder $rootFolder
-	 * @param ILogger $logger
-	 * @param IJobList $jobList
-	 * @param ITimeFactory $timeFactory
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IRootFolder $rootFolder,
-								ILogger $logger,
-								IJobList $jobList,
-								ITimeFactory $timeFactory,
-								IUserManager $userManager) {
-		$this->rootFolder = $rootFolder;
-		$this->logger = $logger;
-		$this->jobList = $jobList;
-		$this->timeFactory = $timeFactory;
-		$this->userManager = $userManager;
-	}
-
-	public function run($arguments) {
-		$uid = $arguments['uid'];
-		if (!$this->userManager->userExists($uid)) {
-			$this->logger->info('User no longer exists, skip user ' . $uid);
-			return;
-		}
-		$this->logger->info('Started preview cleanup for ' . $uid);
-		$empty = $this->cleanupPreviews($uid);
-
-		if (!$empty) {
-			$this->jobList->add(self::class, ['uid' => $uid]);
-			$this->logger->info('New preview cleanup scheduled for ' . $uid);
-		} else {
-			$this->logger->info('Preview cleanup done for ' . $uid);
-		}
-	}
-
-	/**
-	 * @param $uid
-	 * @return bool
-	 */
-	private function cleanupPreviews($uid) {
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($uid);
-		} catch (NotFoundException $e) {
-			return true;
-		}
-
-		$userRoot = $userFolder->getParent();
-
-		try {
-			/** @var Folder $thumbnailFolder */
-			$thumbnailFolder = $userRoot->get('thumbnails');
-		} catch (NotFoundException $e) {
-			return true;
-		}
-
-		$thumbnails = $thumbnailFolder->getDirectoryListing();
-
-		$start = $this->timeFactory->getTime();
-		foreach ($thumbnails as $thumbnail) {
-			try {
-				$thumbnail->delete();
-			} catch (NotPermittedException $e) {
-				// Ignore
-			}
-
-			if (($this->timeFactory->getTime() - $start) > 15) {
-				return false;
-			}
-		}
-
-		try {
-			$thumbnailFolder->delete();
-		} catch (NotPermittedException $e) {
-			// Ignore
-		}
-
-		return true;
-	}
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /**
+     * CleanPreviewsBackgroundJob constructor.
+     *
+     * @param IRootFolder $rootFolder
+     * @param ILogger $logger
+     * @param IJobList $jobList
+     * @param ITimeFactory $timeFactory
+     * @param IUserManager $userManager
+     */
+    public function __construct(IRootFolder $rootFolder,
+                                ILogger $logger,
+                                IJobList $jobList,
+                                ITimeFactory $timeFactory,
+                                IUserManager $userManager) {
+        $this->rootFolder = $rootFolder;
+        $this->logger = $logger;
+        $this->jobList = $jobList;
+        $this->timeFactory = $timeFactory;
+        $this->userManager = $userManager;
+    }
+
+    public function run($arguments) {
+        $uid = $arguments['uid'];
+        if (!$this->userManager->userExists($uid)) {
+            $this->logger->info('User no longer exists, skip user ' . $uid);
+            return;
+        }
+        $this->logger->info('Started preview cleanup for ' . $uid);
+        $empty = $this->cleanupPreviews($uid);
+
+        if (!$empty) {
+            $this->jobList->add(self::class, ['uid' => $uid]);
+            $this->logger->info('New preview cleanup scheduled for ' . $uid);
+        } else {
+            $this->logger->info('Preview cleanup done for ' . $uid);
+        }
+    }
+
+    /**
+     * @param $uid
+     * @return bool
+     */
+    private function cleanupPreviews($uid) {
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($uid);
+        } catch (NotFoundException $e) {
+            return true;
+        }
+
+        $userRoot = $userFolder->getParent();
+
+        try {
+            /** @var Folder $thumbnailFolder */
+            $thumbnailFolder = $userRoot->get('thumbnails');
+        } catch (NotFoundException $e) {
+            return true;
+        }
+
+        $thumbnails = $thumbnailFolder->getDirectoryListing();
+
+        $start = $this->timeFactory->getTime();
+        foreach ($thumbnails as $thumbnail) {
+            try {
+                $thumbnail->delete();
+            } catch (NotPermittedException $e) {
+                // Ignore
+            }
+
+            if (($this->timeFactory->getTime() - $start) > 15) {
+                return false;
+            }
+        }
+
+        try {
+            $thumbnailFolder->delete();
+        } catch (NotPermittedException $e) {
+            // Ignore
+        }
+
+        return true;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -72,17 +72,17 @@
 	public function run($arguments) {
 		$uid = $arguments['uid'];
 		if (!$this->userManager->userExists($uid)) {
-			$this->logger->info('User no longer exists, skip user ' . $uid);
+			$this->logger->info('User no longer exists, skip user '.$uid);
 			return;
 		}
-		$this->logger->info('Started preview cleanup for ' . $uid);
+		$this->logger->info('Started preview cleanup for '.$uid);
 		$empty = $this->cleanupPreviews($uid);
 
 		if (!$empty) {
 			$this->jobList->add(self::class, ['uid' => $uid]);
-			$this->logger->info('New preview cleanup scheduled for ' . $uid);
+			$this->logger->info('New preview cleanup scheduled for '.$uid);
 		} else {
-			$this->logger->info('Preview cleanup done for ' . $uid);
+			$this->logger->info('Preview cleanup done for '.$uid);
 		}
 	}
 

lib/private/Repair/Owncloud/MoveAvatars.php

Indentation +36 added lines, -36 removed lines

@@ -29,44 +29,44 @@
 
 class MoveAvatars implements IRepairStep {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * MoveAvatars constructor.
-	 *
-	 * @param IJobList $jobList
-	 * @param IConfig $config
-	 */
-	public function __construct(IJobList $jobList,
-								IConfig $config) {
-		$this->jobList = $jobList;
-		$this->config = $config;
-	}
+    /**
+     * MoveAvatars constructor.
+     *
+     * @param IJobList $jobList
+     * @param IConfig $config
+     */
+    public function __construct(IJobList $jobList,
+                                IConfig $config) {
+        $this->jobList = $jobList;
+        $this->config = $config;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Add move avatar background job';
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Add move avatar background job';
+    }
 
-	public function run(IOutput $output) {
-		// only run once
-		if ($this->config->getAppValue('core', 'moveavatarsdone') === 'yes') {
-			$output->info('Repair step already executed');
-			return;
-		}
-		if ($this->config->getSystemValue('enable_avatars', true) === false) {
-			$output->info('Avatars are disabled');
-		} else {
-			$output->info('Add background job');
-			$this->jobList->add(MoveAvatarsBackgroundJob::class);
-			// if all were done, no need to redo the repair during next upgrade
-			$this->config->setAppValue('core', 'moveavatarsdone', 'yes');
-		}
-	}
+    public function run(IOutput $output) {
+        // only run once
+        if ($this->config->getAppValue('core', 'moveavatarsdone') === 'yes') {
+            $output->info('Repair step already executed');
+            return;
+        }
+        if ($this->config->getSystemValue('enable_avatars', true) === false) {
+            $output->info('Avatars are disabled');
+        } else {
+            $output->info('Add background job');
+            $this->jobList->add(MoveAvatarsBackgroundJob::class);
+            // if all were done, no need to redo the repair during next upgrade
+            $this->config->setAppValue('core', 'moveavatarsdone', 'yes');
+        }
+    }
 }

lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php

Indentation +67 added lines, -67 removed lines

@@ -35,82 +35,82 @@
 
 class MoveAvatarsBackgroundJob extends QueuedJob {
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var LoggerInterface */
-	private $logger;
+    /** @var LoggerInterface */
+    private $logger;
 
-	/** @var IAvatarManager */
-	private $avatarManager;
+    /** @var IAvatarManager */
+    private $avatarManager;
 
-	/** @var Storage */
-	private $owncloudAvatarStorage;
+    /** @var Storage */
+    private $owncloudAvatarStorage;
 
-	public function __construct(IUserManager $userManager, LoggerInterface $logger, IAvatarManager $avatarManager, IRootFolder $rootFolder) {
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->avatarManager = $avatarManager;
-		try {
-			$this->owncloudAvatarStorage = $rootFolder->get('avatars')->getStorage();
-		} catch (\Exception $e) {
-		}
-	}
+    public function __construct(IUserManager $userManager, LoggerInterface $logger, IAvatarManager $avatarManager, IRootFolder $rootFolder) {
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->avatarManager = $avatarManager;
+        try {
+            $this->owncloudAvatarStorage = $rootFolder->get('avatars')->getStorage();
+        } catch (\Exception $e) {
+        }
+    }
 
-	public function run($arguments) {
-		$this->logger->info('Started migrating avatars to AppData folder');
-		$this->moveAvatars();
-		$this->logger->info('All avatars migrated to AppData folder');
-	}
+    public function run($arguments) {
+        $this->logger->info('Started migrating avatars to AppData folder');
+        $this->moveAvatars();
+        $this->logger->info('All avatars migrated to AppData folder');
+    }
 
-	private function moveAvatars(): void {
-		if (!$this->owncloudAvatarStorage) {
-			$this->logger->info('No legacy avatars available, skipping migration');
-			return;
-		}
+    private function moveAvatars(): void {
+        if (!$this->owncloudAvatarStorage) {
+            $this->logger->info('No legacy avatars available, skipping migration');
+            return;
+        }
 
-		$counter = 0;
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($counter) {
-			$uid = $user->getUID();
+        $counter = 0;
+        $this->userManager->callForSeenUsers(function (IUser $user) use ($counter) {
+            $uid = $user->getUID();
 
-			$path = 'avatars/' . $this->buildOwnCloudAvatarPath($uid);
-			$avatar = $this->avatarManager->getAvatar($uid);
-			try {
-				$avatarPath = $path . '/avatar.' . $this->getExtension($path);
-				$resource = $this->owncloudAvatarStorage->fopen($avatarPath, 'r');
-				if ($resource) {
-					$avatar->set($resource);
-					fclose($resource);
-				} else {
-					throw new \Exception('Failed to open old avatar file for reading');
-				}
-			} catch (NotFoundException $e) {
-				// In case there is no avatar we can just skip
-			} catch (\Throwable $e) {
-				$this->logger->error('Failed to migrate avatar for user ' . $uid, ['exception' => $e]);
-			}
+            $path = 'avatars/' . $this->buildOwnCloudAvatarPath($uid);
+            $avatar = $this->avatarManager->getAvatar($uid);
+            try {
+                $avatarPath = $path . '/avatar.' . $this->getExtension($path);
+                $resource = $this->owncloudAvatarStorage->fopen($avatarPath, 'r');
+                if ($resource) {
+                    $avatar->set($resource);
+                    fclose($resource);
+                } else {
+                    throw new \Exception('Failed to open old avatar file for reading');
+                }
+            } catch (NotFoundException $e) {
+                // In case there is no avatar we can just skip
+            } catch (\Throwable $e) {
+                $this->logger->error('Failed to migrate avatar for user ' . $uid, ['exception' => $e]);
+            }
 
-			$counter++;
-			if ($counter % 100 === 0) {
-				$this->logger->info('{amount} avatars migrated', ['amount' => $counter]);
-			}
-		});
-	}
+            $counter++;
+            if ($counter % 100 === 0) {
+                $this->logger->info('{amount} avatars migrated', ['amount' => $counter]);
+            }
+        });
+    }
 
-	/**
-	 * @throws NotFoundException
-	 */
-	private function getExtension(string $path): string {
-		if ($this->owncloudAvatarStorage->file_exists("{$path}/avatar.jpg")) {
-			return 'jpg';
-		}
-		if ($this->owncloudAvatarStorage->file_exists("{$path}/avatar.png")) {
-			return 'png';
-		}
-		throw new NotFoundException("{$path}/avatar.jpg|png");
-	}
+    /**
+     * @throws NotFoundException
+     */
+    private function getExtension(string $path): string {
+        if ($this->owncloudAvatarStorage->file_exists("{$path}/avatar.jpg")) {
+            return 'jpg';
+        }
+        if ($this->owncloudAvatarStorage->file_exists("{$path}/avatar.png")) {
+            return 'png';
+        }
+        throw new NotFoundException("{$path}/avatar.jpg|png");
+    }
 
-	protected function buildOwnCloudAvatarPath(string $userId): string {
-		return substr_replace(substr_replace(md5($userId), '/', 4, 0), '/', 2, 0);
-	}
+    protected function buildOwnCloudAvatarPath(string $userId): string {
+        return substr_replace(substr_replace(md5($userId), '/', 4, 0), '/', 2, 0);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -70,13 +70,13 @@ 
 		}
 
 		$counter = 0;
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($counter) {
+		$this->userManager->callForSeenUsers(function(IUser $user) use ($counter) {
 			$uid = $user->getUID();
 
-			$path = 'avatars/' . $this->buildOwnCloudAvatarPath($uid);
+			$path = 'avatars/'.$this->buildOwnCloudAvatarPath($uid);
 			$avatar = $this->avatarManager->getAvatar($uid);
 			try {
-				$avatarPath = $path . '/avatar.' . $this->getExtension($path);
+				$avatarPath = $path.'/avatar.'.$this->getExtension($path);
 				$resource = $this->owncloudAvatarStorage->fopen($avatarPath, 'r');
 				if ($resource) {
 					$avatar->set($resource);
@@ -87,7 +87,7 @@ 
 			} catch (NotFoundException $e) {
 				// In case there is no avatar we can just skip
 			} catch (\Throwable $e) {
-				$this->logger->error('Failed to migrate avatar for user ' . $uid, ['exception' => $e]);
+				$this->logger->error('Failed to migrate avatar for user '.$uid, ['exception' => $e]);
 			}
 
 			$counter++;

lib/private/Repair/Owncloud/UpdateLanguageCodes.php

Indentation +47 added lines, -47 removed lines

@@ -31,60 +31,60 @@
 use OCP\Migration\IRepairStep;
 
 class UpdateLanguageCodes implements IRepairStep {
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IDBConnection $connection
-	 * @param IConfig $config
-	 */
-	public function __construct(IDBConnection $connection,
-								IConfig $config) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
+    /**
+     * @param IDBConnection $connection
+     * @param IConfig $config
+     */
+    public function __construct(IDBConnection $connection,
+                                IConfig $config) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getName() {
-		return 'Repair language codes';
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getName() {
+        return 'Repair language codes';
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function run(IOutput $output) {
-		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+    /**
+     * {@inheritdoc}
+     */
+    public function run(IOutput $output) {
+        $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
 
-		if (version_compare($versionFromBeforeUpdate, '12.0.0.13', '>')) {
-			return;
-		}
+        if (version_compare($versionFromBeforeUpdate, '12.0.0.13', '>')) {
+            return;
+        }
 
-		$languages = [
-			'bg_BG' => 'bg',
-			'cs_CZ' => 'cs',
-			'fi_FI' => 'fi',
-			'hu_HU' => 'hu',
-			'nb_NO' => 'nb',
-			'sk_SK' => 'sk',
-			'th_TH' => 'th',
-		];
+        $languages = [
+            'bg_BG' => 'bg',
+            'cs_CZ' => 'cs',
+            'fi_FI' => 'fi',
+            'hu_HU' => 'hu',
+            'nb_NO' => 'nb',
+            'sk_SK' => 'sk',
+            'th_TH' => 'th',
+        ];
 
-		foreach ($languages as $oldCode => $newCode) {
-			$qb = $this->connection->getQueryBuilder();
+        foreach ($languages as $oldCode => $newCode) {
+            $qb = $this->connection->getQueryBuilder();
 
-			$affectedRows = $qb->update('preferences')
-				->set('configvalue', $qb->createNamedParameter($newCode))
-				->where($qb->expr()->eq('appid', $qb->createNamedParameter('core')))
-				->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter('lang')))
-				->andWhere($qb->expr()->eq('configvalue', $qb->createNamedParameter($oldCode), IQueryBuilder::PARAM_STR))
-				->execute();
+            $affectedRows = $qb->update('preferences')
+                ->set('configvalue', $qb->createNamedParameter($newCode))
+                ->where($qb->expr()->eq('appid', $qb->createNamedParameter('core')))
+                ->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter('lang')))
+                ->andWhere($qb->expr()->eq('configvalue', $qb->createNamedParameter($oldCode), IQueryBuilder::PARAM_STR))
+                ->execute();
 
-			$output->info('Changed ' . $affectedRows . ' setting(s) from "' . $oldCode . '" to "' . $newCode . '" in preferences table.');
-		}
-	}
+            $output->info('Changed ' . $affectedRows . ' setting(s) from "' . $oldCode . '" to "' . $newCode . '" in preferences table.');
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 				->andWhere($qb->expr()->eq('configvalue', $qb->createNamedParameter($oldCode), IQueryBuilder::PARAM_STR))
 				->execute();
 
-			$output->info('Changed ' . $affectedRows . ' setting(s) from "' . $oldCode . '" to "' . $newCode . '" in preferences table.');
+			$output->info('Changed '.$affectedRows.' setting(s) from "'.$oldCode.'" to "'.$newCode.'" in preferences table.');
 		}
 	}
 }

lib/private/Security/Bruteforce/Capabilities.php

Indentation +25 added lines, -25 removed lines

@@ -27,33 +27,33 @@
 use OCP\IRequest;
 
 class Capabilities implements IPublicCapability {
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	/** @var Throttler */
-	private $throttler;
+    /** @var Throttler */
+    private $throttler;
 
-	/**
-	 * Capabilities constructor.
-	 *
-	 * @param IRequest $request
-	 * @param Throttler $throttler
-	 */
-	public function __construct(IRequest $request,
-								Throttler $throttler) {
-		$this->request = $request;
-		$this->throttler = $throttler;
-	}
+    /**
+     * Capabilities constructor.
+     *
+     * @param IRequest $request
+     * @param Throttler $throttler
+     */
+    public function __construct(IRequest $request,
+                                Throttler $throttler) {
+        $this->request = $request;
+        $this->throttler = $throttler;
+    }
 
-	public function getCapabilities() {
-		if (version_compare(\OC::$server->getConfig()->getSystemValue('version', '0.0.0.0'), '12.0.0.0', '<')) {
-			return [];
-		}
+    public function getCapabilities() {
+        if (version_compare(\OC::$server->getConfig()->getSystemValue('version', '0.0.0.0'), '12.0.0.0', '<')) {
+            return [];
+        }
 
-		return [
-			'bruteforce' => [
-				'delay' => $this->throttler->getDelay($this->request->getRemoteAddress())
-			]
-		];
-	}
+        return [
+            'bruteforce' => [
+                'delay' => $this->throttler->getDelay($this->request->getRemoteAddress())
+            ]
+        ];
+    }
 }