nextcloud / server

lib/private/legacy/app.php

Spacing +50 added lines, -50 removed lines

@@ -113,9 +113,9 @@ 
 		$apps = self::getEnabledApps();
 
 		// Add each apps' folder as allowed class path
-		foreach($apps as $app) {
+		foreach ($apps as $app) {
 			$path = self::getAppPath($app);
-			if($path !== false) {
+			if ($path !== false) {
 				self::registerAutoloading($app, $path);
 			}
 		}
@@ -141,15 +141,15 @@ 
 	public static function loadApp(string $app) {
 		self::$loadedApps[] = $app;
 		$appPath = self::getAppPath($app);
-		if($appPath === false) {
+		if ($appPath === false) {
 			return;
 		}
 
 		// in case someone calls loadApp() directly
 		self::registerAutoloading($app, $appPath);
 
-		if (is_file($appPath . '/appinfo/app.php')) {
-			\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
+		if (is_file($appPath.'/appinfo/app.php')) {
+			\OC::$server->getEventLogger()->start('load_app_'.$app, 'Load app: '.$app);
 			try {
 				self::requireAppFile($app);
 			} catch (Error $ex) {
@@ -160,7 +160,7 @@ 
 					self::$autoDisabledApps[] = $app;
 				}
 			}
-			\OC::$server->getEventLogger()->end('load_app_' . $app);
+			\OC::$server->getEventLogger()->end('load_app_'.$app);
 		}
 
 		$info = self::getAppInfo($app);
@@ -206,7 +206,7 @@ 
 			$plugins = isset($info['collaboration']['plugins']['plugin']['@value']) ?
 				[$info['collaboration']['plugins']['plugin']] : $info['collaboration']['plugins']['plugin'];
 			foreach ($plugins as $plugin) {
-				if($plugin['@attributes']['type'] === 'collaborator-search') {
+				if ($plugin['@attributes']['type'] === 'collaborator-search') {
 					$pluginInfo = [
 						'shareType' => $plugin['@attributes']['share-type'],
 						'class' => $plugin['@value'],
@@ -225,8 +225,8 @@ 
 	 * @param string $path
 	 */
 	public static function registerAutoloading(string $app, string $path) {
-		$key = $app . '-' . $path;
-		if(isset(self::$alreadyRegistered[$key])) {
+		$key = $app.'-'.$path;
+		if (isset(self::$alreadyRegistered[$key])) {
 			return;
 		}
 
@@ -236,17 +236,17 @@ 
 		$appNamespace = \OC\AppFramework\App::buildAppNamespace($app);
 		\OC::$server->registerNamespace($app, $appNamespace);
 
-		if (file_exists($path . '/composer/autoload.php')) {
-			require_once $path . '/composer/autoload.php';
+		if (file_exists($path.'/composer/autoload.php')) {
+			require_once $path.'/composer/autoload.php';
 		} else {
-			\OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true);
+			\OC::$composerAutoloader->addPsr4($appNamespace.'\\', $path.'/lib/', true);
 			// Register on legacy autoloader
 			\OC::$loader->addValidRoot($path);
 		}
 
 		// Register Test namespace only when testing
 		if (defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) {
-			\OC::$composerAutoloader->addPsr4($appNamespace . '\\Tests\\', $path . '/tests/', true);
+			\OC::$composerAutoloader->addPsr4($appNamespace.'\\Tests\\', $path.'/tests/', true);
 		}
 	}
 
@@ -258,7 +258,7 @@ 
 	 */
 	private static function requireAppFile(string $app) {
 		// encapsulated here to avoid variable scope conflicts
-		require_once $app . '/appinfo/app.php';
+		require_once $app.'/appinfo/app.php';
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	public static function setAppTypes(string $app) {
 		$appManager = \OC::$server->getAppManager();
 		$appData = $appManager->getAppInfo($app);
-		if(!is_array($appData)) {
+		if (!is_array($appData)) {
 			return;
 		}
 
@@ -351,8 +351,8 @@ 
 		} else {
 			$apps = $appManager->getEnabledAppsForUser($user);
 		}
-		$apps = array_filter($apps, function ($app) {
-			return $app !== 'files';//we add this manually
+		$apps = array_filter($apps, function($app) {
+			return $app !== 'files'; //we add this manually
 		});
 		sort($apps);
 		array_unshift($apps, 'files');
@@ -390,7 +390,7 @@ 
 		$installer = \OC::$server->query(Installer::class);
 		$isDownloaded = $installer->isDownloaded($appId);
 
-		if(!$isDownloaded) {
+		if (!$isDownloaded) {
 			$installer->downloadApp($appId);
 		}
 
@@ -441,7 +441,7 @@ 
 	 */
 	public static function findAppInDirectories(string $appId) {
 		$sanitizedAppId = self::cleanAppId($appId);
-		if($sanitizedAppId !== $appId) {
+		if ($sanitizedAppId !== $appId) {
 			return false;
 		}
 		static $app_dir = [];
@@ -452,7 +452,7 @@ 
 
 		$possibleApps = [];
 		foreach (OC::$APPSROOTS as $dir) {
-			if (file_exists($dir['path'] . '/' . $appId)) {
+			if (file_exists($dir['path'].'/'.$appId)) {
 				$possibleApps[] = $dir;
 			}
 		}
@@ -466,7 +466,7 @@ 
 		} else {
 			$versionToLoad = [];
 			foreach ($possibleApps as $possibleApp) {
-				$version = self::getAppVersionByPath($possibleApp['path'] . '/' . $appId);
+				$version = self::getAppVersionByPath($possibleApp['path'].'/'.$appId);
 				if (empty($versionToLoad) || version_compare($version, $versionToLoad['version'], '>')) {
 					$versionToLoad = array(
 						'dir' => $possibleApp,
@@ -493,7 +493,7 @@ 
 		}
 
 		if (($dir = self::findAppInDirectories($appId)) != false) {
-			return $dir['path'] . '/' . $appId;
+			return $dir['path'].'/'.$appId;
 		}
 		return false;
 	}
@@ -507,7 +507,7 @@ 
 	 */
 	public static function getAppWebPath(string $appId) {
 		if (($dir = self::findAppInDirectories($appId)) != false) {
-			return OC::$WEBROOT . $dir['url'] . '/' . $appId;
+			return OC::$WEBROOT.$dir['url'].'/'.$appId;
 		}
 		return false;
 	}
@@ -531,7 +531,7 @@ 
 	 * @return string
 	 */
 	public static function getAppVersionByPath(string $path): string {
-		$infoFile = $path . '/appinfo/info.xml';
+		$infoFile = $path.'/appinfo/info.xml';
 		$appData = \OC::$server->getAppManager()->getAppInfo($infoFile, true);
 		return isset($appData['version']) ? $appData['version'] : '';
 	}
@@ -631,7 +631,7 @@ 
 	 * @param string $page
 	 */
 	public static function registerAdmin(string $app, string $page) {
-		self::$adminForms[] = $app . '/' . $page . '.php';
+		self::$adminForms[] = $app.'/'.$page.'.php';
 	}
 
 	/**
@@ -640,7 +640,7 @@ 
 	 * @param string $page
 	 */
 	public static function registerPersonal(string $app, string $page) {
-		self::$personalForms[] = $app . '/' . $page . '.php';
+		self::$personalForms[] = $app.'/'.$page.'.php';
 	}
 
 	/**
@@ -669,7 +669,7 @@ 
 
 		foreach (OC::$APPSROOTS as $apps_dir) {
 			if (!is_readable($apps_dir['path'])) {
-				\OCP\Util::writeLog('core', 'unable to read app folder : ' . $apps_dir['path'], ILogger::WARN);
+				\OCP\Util::writeLog('core', 'unable to read app folder : '.$apps_dir['path'], ILogger::WARN);
 				continue;
 			}
 			$dh = opendir($apps_dir['path']);
@@ -677,7 +677,7 @@ 
 			if (is_resource($dh)) {
 				while (($file = readdir($dh)) !== false) {
 
-					if ($file[0] != '.' and is_dir($apps_dir['path'] . '/' . $file) and is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')) {
+					if ($file[0] != '.' and is_dir($apps_dir['path'].'/'.$file) and is_file($apps_dir['path'].'/'.$file.'/appinfo/info.xml')) {
 
 						$apps[] = $file;
 					}
@@ -710,12 +710,12 @@ 
 
 				$info = OC_App::getAppInfo($app, false, $langCode);
 				if (!is_array($info)) {
-					\OCP\Util::writeLog('core', 'Could not read app info file for app "' . $app . '"', ILogger::ERROR);
+					\OCP\Util::writeLog('core', 'Could not read app info file for app "'.$app.'"', ILogger::ERROR);
 					continue;
 				}
 
 				if (!isset($info['name'])) {
-					\OCP\Util::writeLog('core', 'App id "' . $app . '" has no name in appinfo', ILogger::ERROR);
+					\OCP\Util::writeLog('core', 'App id "'.$app.'" has no name in appinfo', ILogger::ERROR);
 					continue;
 				}
 
@@ -742,13 +742,13 @@ 
 				}
 
 				$appPath = self::getAppPath($app);
-				if($appPath !== false) {
-					$appIcon = $appPath . '/img/' . $app . '.svg';
+				if ($appPath !== false) {
+					$appIcon = $appPath.'/img/'.$app.'.svg';
 					if (file_exists($appIcon)) {
-						$info['preview'] = $urlGenerator->imagePath($app, $app . '.svg');
+						$info['preview'] = $urlGenerator->imagePath($app, $app.'.svg');
 						$info['previewAsIcon'] = true;
 					} else {
-						$appIcon = $appPath . '/img/app.svg';
+						$appIcon = $appPath.'/img/app.svg';
 						if (file_exists($appIcon)) {
 							$info['preview'] = $urlGenerator->imagePath($app, 'app.svg');
 							$info['previewAsIcon'] = true;
@@ -869,7 +869,7 @@ 
 	public static function getAppVersions() {
 		static $versions;
 
-		if(!$versions) {
+		if (!$versions) {
 			$appConfig = \OC::$server->getAppConfig();
 			$versions = $appConfig->getValues(false, 'installed_version');
 		}
@@ -884,7 +884,7 @@ 
 	 */
 	public static function updateApp(string $appId): bool {
 		$appPath = self::getAppPath($appId);
-		if($appPath === false) {
+		if ($appPath === false) {
 			return false;
 		}
 		self::registerAutoloading($appId, $appPath);
@@ -893,8 +893,8 @@ 
 		$appData = self::getAppInfo($appId);
 		self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']);
 
-		if (file_exists($appPath . '/appinfo/database.xml')) {
-			OC_DB::updateDbFromStructure($appPath . '/appinfo/database.xml');
+		if (file_exists($appPath.'/appinfo/database.xml')) {
+			OC_DB::updateDbFromStructure($appPath.'/appinfo/database.xml');
 		} else {
 			$ms = new MigrationService($appId, \OC::$server->getDatabaseConnection());
 			$ms->migrate();
@@ -907,23 +907,23 @@ 
 		\OC::$server->getAppManager()->getAppVersion($appId, false);
 
 		// run upgrade code
-		if (file_exists($appPath . '/appinfo/update.php')) {
+		if (file_exists($appPath.'/appinfo/update.php')) {
 			self::loadApp($appId);
-			include $appPath . '/appinfo/update.php';
+			include $appPath.'/appinfo/update.php';
 		}
 		self::setupBackgroundJobs($appData['background-jobs']);
 
 		//set remote/public handlers
 		if (array_key_exists('ocsid', $appData)) {
 			\OC::$server->getConfig()->setAppValue($appId, 'ocsid', $appData['ocsid']);
-		} elseif(\OC::$server->getConfig()->getAppValue($appId, 'ocsid', null) !== null) {
+		} elseif (\OC::$server->getConfig()->getAppValue($appId, 'ocsid', null) !== null) {
 			\OC::$server->getConfig()->deleteAppValue($appId, 'ocsid');
 		}
 		foreach ($appData['remote'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'remote_' . $name, $appId . '/' . $path);
+			\OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $appId.'/'.$path);
 		}
 		foreach ($appData['public'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'public_' . $name, $appId . '/' . $path);
+			\OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $appId.'/'.$path);
 		}
 
 		self::setAppTypes($appId);
@@ -993,17 +993,17 @@ 
 	public static function getStorage(string $appId) {
 		if (\OC::$server->getAppManager()->isEnabledForUser($appId)) { //sanity check
 			if (\OC::$server->getUserSession()->isLoggedIn()) {
-				$view = new \OC\Files\View('/' . OC_User::getUser());
+				$view = new \OC\Files\View('/'.OC_User::getUser());
 				if (!$view->file_exists($appId)) {
 					$view->mkdir($appId);
 				}
-				return new \OC\Files\View('/' . OC_User::getUser() . '/' . $appId);
+				return new \OC\Files\View('/'.OC_User::getUser().'/'.$appId);
 			} else {
-				\OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ', user not logged in', ILogger::ERROR);
+				\OCP\Util::writeLog('core', 'Can\'t get app storage, app '.$appId.', user not logged in', ILogger::ERROR);
 				return false;
 			}
 		} else {
-			\OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ' not enabled', ILogger::ERROR);
+			\OCP\Util::writeLog('core', 'Can\'t get app storage, app '.$appId.' not enabled', ILogger::ERROR);
 			return false;
 		}
 	}
@@ -1040,9 +1040,9 @@ 
 
 				if ($attributeLang === $similarLang) {
 					$similarLangFallback = $option['@value'];
-				} else if (strpos($attributeLang, $similarLang . '_') === 0) {
+				} else if (strpos($attributeLang, $similarLang.'_') === 0) {
 					if ($similarLangFallback === false) {
-						$similarLangFallback =  $option['@value'];
+						$similarLangFallback = $option['@value'];
 					}
 				}
 			} else {
@@ -1077,7 +1077,7 @@ 
 			$data['description'] = trim(self::findBestL10NOption($data['description'], $lang));
 		} else if (isset($data['description']) && is_string($data['description'])) {
 			$data['description'] = trim($data['description']);
-		} else  {
+		} else {
 			$data['description'] = '';
 		}
 

lib/private/Updater.php

Spacing +65 added lines, -65 removed lines

@@ -101,12 +101,12 @@ 
 		$this->logAllEvents();
 
 		$logLevel = $this->config->getSystemValue('loglevel', ILogger::WARN);
-		$this->emit('\OC\Updater', 'setDebugLogLevel', [ $logLevel, $this->logLevelNames[$logLevel] ]);
+		$this->emit('\OC\Updater', 'setDebugLogLevel', [$logLevel, $this->logLevelNames[$logLevel]]);
 		$this->config->setSystemValue('loglevel', ILogger::DEBUG);
 
 		$wasMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
 
-		if(!$wasMaintenanceModeEnabled) {
+		if (!$wasMaintenanceModeEnabled) {
 			$this->config->setSystemValue('maintenance', true);
 			$this->emit('\OC\Updater', 'maintenanceEnabled');
 		}
@@ -119,31 +119,31 @@ 
 			$this->waitForCronToFinish();
 		}
 
-		$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);
 
@@ -157,7 +157,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;
 	}
@@ -169,7 +169,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;
 	}
@@ -183,7 +183,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', '');
 
@@ -230,7 +230,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());
@@ -262,7 +262,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
@@ -273,7 +273,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');
@@ -314,12 +314,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');
 				}
 			}
 		}
@@ -332,7 +332,7 @@ 
 	 * @param string $appId
 	 */
 	private function includePreUpdate($appId) {
-		include \OC_App::getAppPath($appId) . '/appinfo/preupdate.php';
+		include \OC_App::getAppPath($appId).'/appinfo/preupdate.php';
 	}
 
 	/**
@@ -350,7 +350,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])) {
@@ -370,7 +370,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.
@@ -398,9 +398,9 @@ 
 		foreach ($apps as $app) {
 			// check if the app is compatible with this version of ownCloud
 			$info = OC_App::getAppInfo($app);
-			if($info === null || !OC_App::isAppCompatible($version, $info)) {
+			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');
+					throw new \UnexpectedValueException('The files of the app "'.$app.'" were not correctly replaced before running the update');
 				}
 				\OC::$server->getAppManager()->disableApp($app);
 				$this->emit('\OC\Updater', 'incompatibleAppDisabled', array($app));
@@ -439,7 +439,7 @@ 
 	 * @throws \Exception
 	 */
 	private function upgradeAppStoreApps(array $disabledApps, $reenable = false) {
-		foreach($disabledApps as $app) {
+		foreach ($disabledApps as $app) {
 			try {
 				$this->emit('\OC\Updater', 'checkAppStoreAppBefore', [$app]);
 				if ($this->installer->isUpdateAvailable($app)) {
@@ -463,22 +463,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());
 			}
@@ -493,13 +493,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) {
@@ -508,30 +508,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;
 			}
 		};
@@ -545,74 +545,74 @@ 
 		$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', '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']);
 		});