nextcloud / server

lib/private/Updater.php

Spacing +71 added lines, -71 removed lines

@@ -85,7 +85,7 @@ 
 
 		// If at least PHP 7.0.0 is used we don't need to disable apps as we catch
 		// fatal errors and exceptions and disable the app just instead.
-		if(version_compare(phpversion(), '7.0.0', '>=')) {
+		if (version_compare(phpversion(), '7.0.0', '>=')) {
 			$this->skip3rdPartyAppsDisable = true;
 		}
 	}
@@ -111,43 +111,43 @@ 
 		$this->logAllEvents();
 
 		$logLevel = $this->config->getSystemValue('loglevel', Util::WARN);
-		$this->emit('\OC\Updater', 'setDebugLogLevel', [ $logLevel, $this->logLevelNames[$logLevel] ]);
+		$this->emit('\OC\Updater', 'setDebugLogLevel', [$logLevel, $this->logLevelNames[$logLevel]]);
 		$this->config->setSystemValue('loglevel', Util::DEBUG);
 
 		$wasMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
 
-		if(!$wasMaintenanceModeEnabled) {
+		if (!$wasMaintenanceModeEnabled) {
 			$this->config->setSystemValue('maintenance', true);
 			$this->emit('\OC\Updater', 'maintenanceEnabled');
 		}
 
 		$installedVersion = $this->config->getSystemValue('version', '0.0.0');
 		$currentVersion = implode('.', \OCP\Util::getVersion());
-		$this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core'));
+		$this->log->debug('starting upgrade from '.$installedVersion.' to '.$currentVersion, array('app' => 'core'));
 
 		$success = true;
 		try {
 			$this->doUpgrade($currentVersion, $installedVersion);
 		} catch (HintException $exception) {
 			$this->log->logException($exception, ['app' => 'core']);
-			$this->emit('\OC\Updater', 'failure', array($exception->getMessage() . ': ' .$exception->getHint()));
+			$this->emit('\OC\Updater', 'failure', array($exception->getMessage().': '.$exception->getHint()));
 			$success = false;
 		} catch (\Exception $exception) {
 			$this->log->logException($exception, ['app' => 'core']);
-			$this->emit('\OC\Updater', 'failure', array(get_class($exception) . ': ' .$exception->getMessage()));
+			$this->emit('\OC\Updater', 'failure', array(get_class($exception).': '.$exception->getMessage()));
 			$success = false;
 		}
 
 		$this->emit('\OC\Updater', 'updateEnd', array($success));
 
-		if(!$wasMaintenanceModeEnabled && $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->emit('\OC\Updater', 'resetLogLevel', [$logLevel, $this->logLevelNames[$logLevel]]);
 		$this->config->setSystemValue('loglevel', $logLevel);
 		$this->config->setSystemValue('installed', true);
 
@@ -161,7 +161,7 @@ 
 	 */
 	private function getAllowedPreviousVersions() {
 		// this should really be a JSON file
-		require \OC::$SERVERROOT . '/version.php';
+		require \OC::$SERVERROOT.'/version.php';
 		/** @var array $OC_VersionCanBeUpgradedFrom */
 		return $OC_VersionCanBeUpgradedFrom;
 	}
@@ -173,7 +173,7 @@ 
 	 */
 	private function getVendor() {
 		// this should really be a JSON file
-		require \OC::$SERVERROOT . '/version.php';
+		require \OC::$SERVERROOT.'/version.php';
 		/** @var string $vendor */
 		return (string) $vendor;
 	}
@@ -187,7 +187,7 @@ 
 	 */
 	public function isUpgradePossible($oldVersion, $newVersion, array $allowedPreviousVersions) {
 		$version = explode('.', $oldVersion);
-		$majorMinor = $version[0] . '.' . $version[1];
+		$majorMinor = $version[0].'.'.$version[1];
 
 		$currentVendor = $this->config->getAppValue('core', 'vendor', '');
 		if ($currentVendor === 'nextcloud') {
@@ -227,7 +227,7 @@ 
 		// 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', '');
+		file_put_contents($this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', '');
 
 		// pre-upgrade repairs
 		$repair = new Repair(Repair::getBeforeUpgradeRepairSteps(), \OC::$server->getEventDispatcher());
@@ -258,7 +258,7 @@ 
 		foreach ($errors as $appId => $exception) {
 			/** @var \Exception $exception */
 			$this->log->logException($exception, ['app' => $appId]);
-			$this->emit('\OC\Updater', 'failure', [$appId . ': ' . $exception->getMessage()]);
+			$this->emit('\OC\Updater', 'failure', [$appId.': '.$exception->getMessage()]);
 		}
 
 		// post-upgrade repairs
@@ -269,7 +269,7 @@ 
 		$this->config->setAppValue('core', 'lastupdatedat', 0);
 
 		// Check for code integrity if not disabled
-		if(\OC::$server->getIntegrityCodeChecker()->isCodeCheckEnforced()) {
+		if (\OC::$server->getIntegrityCodeChecker()->isCodeCheckEnforced()) {
 			$this->emit('\OC\Updater', 'startCheckCodeIntegrity');
 			$this->checker->runInstanceVerification();
 			$this->emit('\OC\Updater', 'finishedCheckCodeIntegrity');
@@ -284,7 +284,7 @@ 
 		$this->emit('\OC\Updater', 'dbUpgradeBefore');
 
 		// do the real upgrade
-		\OC_DB::updateDbFromStructure(\OC::$SERVERROOT . '/db_structure.xml');
+		\OC_DB::updateDbFromStructure(\OC::$SERVERROOT.'/db_structure.xml');
 
 		$this->emit('\OC\Updater', 'dbUpgrade');
 	}
@@ -308,12 +308,12 @@ 
 				 * @link https://github.com/owncloud/core/issues/10980
 				 * @see \OC_App::updateApp
 				 */
-				if (file_exists(\OC_App::getAppPath($appId) . '/appinfo/preupdate.php')) {
+				if (file_exists(\OC_App::getAppPath($appId).'/appinfo/preupdate.php')) {
 					$this->includePreUpdate($appId);
 				}
-				if (file_exists(\OC_App::getAppPath($appId) . '/appinfo/database.xml')) {
+				if (file_exists(\OC_App::getAppPath($appId).'/appinfo/database.xml')) {
 					$this->emit('\OC\Updater', 'appSimulateUpdate', array($appId));
-					\OC_DB::simulateUpdateDbFromStructure(\OC_App::getAppPath($appId) . '/appinfo/database.xml');
+					\OC_DB::simulateUpdateDbFromStructure(\OC_App::getAppPath($appId).'/appinfo/database.xml');
 				}
 			}
 		}
@@ -326,7 +326,7 @@ 
 	 * @param string $appId
 	 */
 	private function includePreUpdate($appId) {
-		include \OC_App::getAppPath($appId) . '/appinfo/preupdate.php';
+		include \OC_App::getAppPath($appId).'/appinfo/preupdate.php';
 	}
 
 	/**
@@ -344,7 +344,7 @@ 
 		foreach ($apps as $appId) {
 			$priorityType = false;
 			foreach ($priorityTypes as $type) {
-				if(!isset($stacks[$type])) {
+				if (!isset($stacks[$type])) {
 					$stacks[$type] = array();
 				}
 				if (\OC_App::isType($appId, $type)) {
@@ -364,7 +364,7 @@ 
 					\OC_App::updateApp($appId);
 					$this->emit('\OC\Updater', 'appUpgrade', [$appId, \OC_App::getAppVersion($appId)]);
 				}
-				if($type !== $pseudoOtherType) {
+				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.
@@ -391,9 +391,9 @@ 
 		foreach ($apps as $app) {
 			// check if the app is compatible with this version of ownCloud
 			$info = OC_App::getAppInfo($app);
-			if(!OC_App::isAppCompatible($version, $info)) {
+			if (!OC_App::isAppCompatible($version, $info)) {
 				if (OC_App::isShipped($app)) {
-					throw new \UnexpectedValueException('The files of the app "' . $app . '" were not correctly replaced before running the update');
+					throw new \UnexpectedValueException('The files of the app "'.$app.'" were not correctly replaced before running the update');
 				}
 				OC_App::disable($app);
 				$this->emit('\OC\Updater', 'incompatibleAppDisabled', array($app));
@@ -412,9 +412,9 @@ 
 			}
 
 			// disable any other 3rd party apps if not overriden
-			if(!$this->skip3rdPartyAppsDisable) {
+			if (!$this->skip3rdPartyAppsDisable) {
 				\OC_App::disable($app);
-				$disabledApps[]= $app;
+				$disabledApps[] = $app;
 				$this->emit('\OC\Updater', 'thirdPartyAppDisabled', array($app));
 			};
 		}
@@ -438,7 +438,7 @@ 
 	 * @throws \Exception
 	 */
 	private function upgradeAppStoreApps(array $disabledApps) {
-		foreach($disabledApps as $app) {
+		foreach ($disabledApps as $app) {
 			try {
 				$installer = new Installer(
 					\OC::$server->getAppFetcher(),
@@ -464,22 +464,22 @@ 
 	 */
 	private function emitRepairEvents() {
 		$dispatcher = \OC::$server->getEventDispatcher();
-		$dispatcher->addListener('\OC\Repair::warning', function ($event) {
+		$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) {
+		$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) {
+		$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) {
+		$dispatcher->addListener('\OC\Repair::step', function($event) {
 			if ($event instanceof GenericEvent) {
 				$this->emit('\OC\Updater', 'repairStep', $event->getArguments());
 			}
@@ -494,13 +494,13 @@ 
 			if (!$event instanceof GenericEvent) {
 				return;
 			}
-			$log->info('\OC\DB\Migrator::executeSql: ' . $event->getSubject() . ' (' . $event->getArgument(0) . ' of ' . $event->getArgument(1) . ')', ['app' => 'updater']);
+			$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']);
+			$log->info('\OC\DB\Migrator::checkTable: '.$event->getSubject().' ('.$event->getArgument(0).' of '.$event->getArgument(1).')', ['app' => 'updater']);
 		});
 
 		$repairListener = function($event) use ($log) {
@@ -509,30 +509,30 @@ 
 			}
 			switch ($event->getSubject()) {
 				case '\OC\Repair::startProgress':
-					$log->info('\OC\Repair::startProgress: Starting ... ' . $event->getArgument(1) .  ' (' . $event->getArgument(0) . ')', ['app' => 'updater']);
+					$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']);
+					$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']);
+					$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']);
+					$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']);
+					$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']);
+					$log->error('\OC\Repair::error: Repair error: '.$event->getArgument(0), ['app' => 'updater']);
 					break;
 			}
 		};
@@ -546,77 +546,77 @@ 
 		$dispatcher->addListener('\OC\Repair::error', $repairListener);
 
 
-		$this->listen('\OC\Updater', 'maintenanceEnabled', function () use($log) {
+		$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) {
+		$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) {
+		$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) {
+		$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) {
+		$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) {
+		$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) {
+		$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) {
+		$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', 'incompatibleAppDisabled', function($app) use($log) {
+			$log->info('\OC\Updater::incompatibleAppDisabled: Disabled incompatible app: '.$app, ['app' => 'updater']);
 		});
-		$this->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($log) {
-			$log->info('\OC\Updater::thirdPartyAppDisabled: Disabled 3rd-party app: ' . $app, ['app' => 'updater']);
+		$this->listen('\OC\Updater', 'thirdPartyAppDisabled', function($app) use ($log) {
+			$log->info('\OC\Updater::thirdPartyAppDisabled: Disabled 3rd-party 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', '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', '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', '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) {
+		$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', '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) {
+		$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', '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', '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', 'failure', function($message) use($log) {
+			$log->error('\OC\Updater::failure: '.$message, ['app' => 'updater']);
 		});
-		$this->listen('\OC\Updater', 'setDebugLogLevel', function () use($log) {
+		$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', '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) {
+		$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) {
+		$this->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function() use($log) {
 			$log->info('\OC\Updater::finishedCheckCodeIntegrity: Finished code integrity check', ['app' => 'updater']);
 		});
 

core/ajax/update.php

Spacing +52 added lines, -52 removed lines

@@ -41,7 +41,7 @@ 
 // need to send an initial message to force-init the event source,
 // which will then trigger its own CSRF check and produces its own CSRF error
 // message
-$eventSource->send('success', (string)$l->t('Preparing update'));
+$eventSource->send('success', (string) $l->t('Preparing update'));
 
 class FeedBackHandler {
 	/** @var integer */
@@ -73,21 +73,21 @@ 
 				if (empty($desc)) {
 					$desc = $this->currentStep;
 				}
-				$this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $desc]));
+				$this->eventSource->send('success', (string) $this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $desc]));
 				break;
 			case '\OC\Repair::finishProgress':
 				$this->progressStateMax = $this->progressStateStep;
-				$this->eventSource->send('success', (string)$this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $this->currentStep]));
+				$this->eventSource->send('success', (string) $this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $this->currentStep]));
 				break;
 			case '\OC\Repair::step':
 				break;
 			case '\OC\Repair::info':
 				break;
 			case '\OC\Repair::warning':
-				$this->eventSource->send('notice', (string)$this->l10n->t('Repair warning: ') . $event->getArgument(0));
+				$this->eventSource->send('notice', (string) $this->l10n->t('Repair warning: ').$event->getArgument(0));
 				break;
 			case '\OC\Repair::error':
-				$this->eventSource->send('notice', (string)$this->l10n->t('Repair error: ') . $event->getArgument(0));
+				$this->eventSource->send('notice', (string) $this->l10n->t('Repair error: ').$event->getArgument(0));
 				break;
 		}
 	}
@@ -97,7 +97,7 @@ 
 
 	$config = \OC::$server->getSystemConfig();
 	if ($config->getValue('upgrade.disable-web', false)) {
-		$eventSource->send('failure', (string)$l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
+		$eventSource->send('failure', (string) $l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
 		$eventSource->close();
 		exit();
 	}
@@ -119,12 +119,12 @@ 
 	$dispatcher = \OC::$server->getEventDispatcher();
 	$dispatcher->addListener('\OC\DB\Migrator::executeSql', function($event) use ($eventSource, $l) {
 		if ($event instanceof GenericEvent) {
-			$eventSource->send('success', (string)$l->t('[%d / %d]: %s', [$event[0], $event[1], $event->getSubject()]));
+			$eventSource->send('success', (string) $l->t('[%d / %d]: %s', [$event[0], $event[1], $event->getSubject()]));
 		}
 	});
 	$dispatcher->addListener('\OC\DB\Migrator::checkTable', function($event) use ($eventSource, $l) {
 		if ($event instanceof GenericEvent) {
-			$eventSource->send('success', (string)$l->t('[%d / %d]: Checking table %s', [$event[0], $event[1], $event->getSubject()]));
+			$eventSource->send('success', (string) $l->t('[%d / %d]: Checking table %s', [$event[0], $event[1], $event->getSubject()]));
 		}
 	});
 	$feedBack = new FeedBackHandler($eventSource, $l);
@@ -136,76 +136,76 @@ 
 	$dispatcher->addListener('\OC\Repair::warning', [$feedBack, 'handleRepairFeedback']);
 	$dispatcher->addListener('\OC\Repair::error', [$feedBack, 'handleRepairFeedback']);
 
-	$updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Turned on maintenance mode'));
+	$updater->listen('\OC\Updater', 'maintenanceEnabled', function() use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Turned on maintenance mode'));
 	});
-	$updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Turned off maintenance mode'));
+	$updater->listen('\OC\Updater', 'maintenanceDisabled', function() use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Turned off maintenance mode'));
 	});
-	$updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Maintenance mode is kept active'));
+	$updater->listen('\OC\Updater', 'maintenanceActive', function() use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Maintenance mode is kept active'));
 	});
-	$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updating database schema'));
+	$updater->listen('\OC\Updater', 'dbUpgradeBefore', function() use($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Updating database schema'));
 	});
-	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updated database'));
+	$updater->listen('\OC\Updater', 'dbUpgrade', function() use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Updated database'));
 	});
-	$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)'));
+	$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function() use($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)'));
 	});
-	$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked database schema update'));
+	$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function() use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Checked database schema update'));
 	});
-	$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking updates of apps'));
+	$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function() use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Checking updates of apps'));
 	});
-	$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking for update of app "%s" in appstore', [$app]));
+	$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function($app) use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Checking for update of app "%s" in appstore', [$app]));
 	});
-	$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Update app "%s" from appstore', [$app]));
+	$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function($app) use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Update app "%s" from appstore', [$app]));
 	});
-	$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked for update of app "%s" in appstore', [$app]));
+	$updater->listen('\OC\Updater', 'checkAppStoreApp', function($app) use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Checked for update of app "%s" in appstore', [$app]));
 	});
-	$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
+	$updater->listen('\OC\Updater', 'appSimulateUpdate', function($app) use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
 	});
-	$updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Checked database schema update for apps'));
+	$updater->listen('\OC\Updater', 'appUpgradeCheck', function() use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Checked database schema update for apps'));
 	});
-	$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Updated "%s" to %s', array($app, $version)));
+	$updater->listen('\OC\Updater', 'appUpgrade', function($app, $version) use ($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Updated "%s" to %s', array($app, $version)));
 	});
-	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
-		$incompatibleApps[]= $app;
+	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function($app) use (&$incompatibleApps) {
+		$incompatibleApps[] = $app;
 	});
-	$updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use (&$disabledThirdPartyApps) {
-		$disabledThirdPartyApps[]= $app;
+	$updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function($app) use (&$disabledThirdPartyApps) {
+		$disabledThirdPartyApps[] = $app;
 	});
-	$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config) {
+	$updater->listen('\OC\Updater', 'failure', function($message) use ($eventSource, $config) {
 		$eventSource->send('failure', $message);
 		$eventSource->close();
 		$config->setSystemValue('maintenance', false);
 	});
-	$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Set log level to debug'));
+	$updater->listen('\OC\Updater', 'setDebugLogLevel', function($logLevel, $logLevelName) use($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Set log level to debug'));
 	});
-	$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Reset log level'));
+	$updater->listen('\OC\Updater', 'resetLogLevel', function($logLevel, $logLevelName) use($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Reset log level'));
 	});
-	$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Starting code integrity check'));
+	$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function() use($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Starting code integrity check'));
 	});
-	$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use($eventSource, $l) {
-		$eventSource->send('success', (string)$l->t('Finished code integrity check'));
+	$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function() use($eventSource, $l) {
+		$eventSource->send('success', (string) $l->t('Finished code integrity check'));
 	});
 
 	try {
 		$updater->upgrade();
 	} catch (\Exception $e) {
-		$eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
+		$eventSource->send('failure', get_class($e).': '.$e->getMessage());
 		$eventSource->close();
 		exit();
 	}
@@ -220,10 +220,10 @@ 
 
 	if (!empty($disabledApps)) {
 		$eventSource->send('notice',
-			(string)$l->t('Following apps have been disabled: %s', implode(', ', $disabledApps)));
+			(string) $l->t('Following apps have been disabled: %s', implode(', ', $disabledApps)));
 	}
 } else {
-	$eventSource->send('notice', (string)$l->t('Already up to date'));
+	$eventSource->send('notice', (string) $l->t('Already up to date'));
 }
 
 $eventSource->send('done', '');

core/Command/Upgrade.php

Spacing +41 added lines, -41 removed lines

@@ -87,7 +87,7 @@ 
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
 
-		if(\OC::checkUpgrade(false)) {
+		if (\OC::checkUpgrade(false)) {
 			if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
 				// Prepend each line with a little timestamp
 				$timestampFormatter = new TimestampFormatter($this->config, $output->getFormatter());
@@ -111,10 +111,10 @@ 
 				if ($event instanceof GenericEvent) {
 					$message = $event->getSubject();
 					if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
-						$output->writeln(' Checking table ' . $message);
+						$output->writeln(' Checking table '.$message);
 					} else {
 						if (strlen($message) > 60) {
-							$message = substr($message, 0, 57) . '...';
+							$message = substr($message, 0, 57).'...';
 						}
 						$progress->setMessage($message);
 						if ($event[0] === 1) {
@@ -155,20 +155,20 @@ 
 						$output->writeln('');
 						break;
 					case '\OC\Repair::step':
-						if(OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
-							$output->writeln('<info>Repair step: ' . $event->getArgument(0) . '</info>');
+						if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
+							$output->writeln('<info>Repair step: '.$event->getArgument(0).'</info>');
 						}
 						break;
 					case '\OC\Repair::info':
-						if(OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
-							$output->writeln('<info>Repair info: ' . $event->getArgument(0) . '</info>');
+						if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
+							$output->writeln('<info>Repair info: '.$event->getArgument(0).'</info>');
 						}
 						break;
 					case '\OC\Repair::warning':
-						$output->writeln('<error>Repair warning: ' . $event->getArgument(0) . '</error>');
+						$output->writeln('<error>Repair warning: '.$event->getArgument(0).'</error>');
 						break;
 					case '\OC\Repair::error':
-						$output->writeln('<error>Repair error: ' . $event->getArgument(0) . '</error>');
+						$output->writeln('<error>Repair error: '.$event->getArgument(0).'</error>');
 						break;
 				}
 			};
@@ -184,17 +184,17 @@ 
 			$dispatcher->addListener('\OC\Repair::error', $repairListener);
 			
 
-			$updater->listen('\OC\Updater', 'maintenanceEnabled', function () use($output) {
+			$updater->listen('\OC\Updater', 'maintenanceEnabled', function() use($output) {
 				$output->writeln('<info>Turned on maintenance mode</info>');
 			});
-			$updater->listen('\OC\Updater', 'maintenanceDisabled', function () use($output) {
+			$updater->listen('\OC\Updater', 'maintenanceDisabled', function() use($output) {
 				$output->writeln('<info>Turned off maintenance mode</info>');
 			});
-			$updater->listen('\OC\Updater', 'maintenanceActive', function () use($output) {
+			$updater->listen('\OC\Updater', 'maintenanceActive', function() use($output) {
 				$output->writeln('<info>Maintenance mode is kept active</info>');
 			});
 			$updater->listen('\OC\Updater', 'updateEnd',
-				function ($success) use($output, $self) {
+				function($success) use($output, $self) {
 					if ($success) {
 						$message = "<info>Update successful</info>";
 					} else {
@@ -202,61 +202,61 @@ 
 					}
 					$output->writeln($message);
 				});
-			$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($output) {
+			$updater->listen('\OC\Updater', 'dbUpgradeBefore', function() use($output) {
 				$output->writeln('<info>Updating database schema</info>');
 			});
-			$updater->listen('\OC\Updater', 'dbUpgrade', function () use($output) {
+			$updater->listen('\OC\Updater', 'dbUpgrade', function() use($output) {
 				$output->writeln('<info>Updated database</info>');
 			});
-			$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use($output) {
+			$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function() use($output) {
 				$output->writeln('<info>Checking whether the database schema can be updated (this can take a long time depending on the database size)</info>');
 			});
-			$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use($output) {
+			$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function() use($output) {
 				$output->writeln('<info>Checked database schema update</info>');
 			});
-			$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use($output) {
-				$output->writeln('<comment>Disabled incompatible app: ' . $app . '</comment>');
+			$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function($app) use($output) {
+				$output->writeln('<comment>Disabled incompatible app: '.$app.'</comment>');
 			});
-			$updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($output) {
-				$output->writeln('<comment>Disabled 3rd-party app: ' . $app . '</comment>');
+			$updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function($app) use ($output) {
+				$output->writeln('<comment>Disabled 3rd-party app: '.$app.'</comment>');
 			});
-			$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use($output) {
-				$output->writeln('<info>Checking for update of app ' . $app . ' in appstore</info>');
+			$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function($app) use($output) {
+				$output->writeln('<info>Checking for update of app '.$app.' in appstore</info>');
 			});
-			$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use($output) {
-				$output->writeln('<info>Update app ' . $app . ' from appstore</info>');
+			$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function($app) use($output) {
+				$output->writeln('<info>Update app '.$app.' from appstore</info>');
 			});
-			$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use($output) {
-				$output->writeln('<info>Checked for update of app "' . $app . '" in appstore </info>');
+			$updater->listen('\OC\Updater', 'checkAppStoreApp', function($app) use($output) {
+				$output->writeln('<info>Checked for update of app "'.$app.'" in appstore </info>');
 			});
-			$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($output) {
+			$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function() use ($output) {
 				$output->writeln('<info>Checking updates of apps</info>');
 			});
-			$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($output) {
+			$updater->listen('\OC\Updater', 'appSimulateUpdate', function($app) use ($output) {
 				$output->writeln("<info>Checking whether the database schema for <$app> can be updated (this can take a long time depending on the database size)</info>");
 			});
-			$updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($output) {
+			$updater->listen('\OC\Updater', 'appUpgradeCheck', function() use ($output) {
 				$output->writeln('<info>Checked database schema update for apps</info>');
 			});
-			$updater->listen('\OC\Updater', 'appUpgradeStarted', function ($app, $version) use ($output) {
+			$updater->listen('\OC\Updater', 'appUpgradeStarted', function($app, $version) use ($output) {
 				$output->writeln("<info>Updating <$app> ...</info>");
 			});
-			$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($output) {
+			$updater->listen('\OC\Updater', 'appUpgrade', function($app, $version) use ($output) {
 				$output->writeln("<info>Updated <$app> to $version</info>");
 			});
-			$updater->listen('\OC\Updater', 'failure', function ($message) use($output, $self) {
+			$updater->listen('\OC\Updater', 'failure', function($message) use($output, $self) {
 				$output->writeln("<error>$message</error>");
 			});
-			$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($output) {
+			$updater->listen('\OC\Updater', 'setDebugLogLevel', function($logLevel, $logLevelName) use($output) {
 				$output->writeln("<info>Set log level to debug</info>");
 			});
-			$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($output) {
+			$updater->listen('\OC\Updater', 'resetLogLevel', function($logLevel, $logLevelName) use($output) {
 				$output->writeln("<info>Reset log level</info>");
 			});
-			$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use($output) {
+			$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function() use($output) {
 				$output->writeln("<info>Starting code integrity check...</info>");
 			});
-			$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use($output) {
+			$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function() use($output) {
 				$output->writeln("<info>Finished code integrity check</info>");
 			});
 
@@ -264,12 +264,12 @@ 
 
 			$this->postUpgradeCheck($input, $output);
 
-			if(!$success) {
+			if (!$success) {
 				return self::ERROR_FAILURE;
 			}
 
 			return self::ERROR_SUCCESS;
-		} else if($this->config->getSystemValue('maintenance', false)) {
+		} else if ($this->config->getSystemValue('maintenance', false)) {
 			//Possible scenario: Nextcloud core is updated but an app failed
 			$output->writeln('<warning>Nextcloud is in maintenance mode</warning>');
 			$output->write('<comment>Maybe an upgrade is already in process. Please check the '
@@ -294,8 +294,8 @@ 
 		$trustedDomains = $this->config->getSystemValue('trusted_domains', array());
 		if (empty($trustedDomains)) {
 			$output->write(
-				'<warning>The setting "trusted_domains" could not be ' .
-				'set automatically by the upgrade script, ' .
+				'<warning>The setting "trusted_domains" could not be '.
+				'set automatically by the upgrade script, '.
 				'please set it manually</warning>'
 			);
 		}