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', '');
 
@@ -244,7 +244,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());
@@ -275,7 +275,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
@@ -286,7 +286,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');
@@ -301,7 +301,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');
 	}
@@ -325,12 +325,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');
 				}
 			}
 		}
@@ -343,7 +343,7 @@ 
 	 * @param string $appId
 	 */
 	private function includePreUpdate($appId) {
-		include \OC_App::getAppPath($appId) . '/appinfo/preupdate.php';
+		include \OC_App::getAppPath($appId).'/appinfo/preupdate.php';
 	}
 
 	/**
@@ -361,7 +361,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)) {
@@ -381,7 +381,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.
@@ -408,9 +408,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));
@@ -429,9 +429,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));
 			};
 		}
@@ -455,7 +455,7 @@ 
 	 * @throws \Exception
 	 */
 	private function upgradeAppStoreApps(array $disabledApps) {
-		foreach($disabledApps as $app) {
+		foreach ($disabledApps as $app) {
 			try {
 				$installer = new Installer(
 					\OC::$server->getAppFetcher(),
@@ -481,22 +481,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());
 			}
@@ -511,13 +511,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) {
@@ -526,30 +526,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;
 			}
 		};
@@ -563,77 +563,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']);
 		});
 

lib/private/Repair/NC11/MoveAvatarsBackgroundJob.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 		}
 
 		$counter = 0;
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($counter, $ownCloudAvatars) {
+		$this->userManager->callForSeenUsers(function(IUser $user) use ($counter, $ownCloudAvatars) {
 			$uid = $user->getUID();
 
 			\OC\Files\Filesystem::initMountPoints($uid);