Inspection of "Merge pull request #10010 from nextcloud/bugfix/99..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 524450...ed6352 )

by Morris

created 2018-07-09 13:49 UTC

Status

Spacing +65 added lines, -65 removed lines patch added patch discarded remove patch

@@ -101,12 +101,12 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 		// 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());
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
 		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
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
 		$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');
@@ -313,12 +313,12 @@  discard block
 block discarded – undo
 				 * @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');
 				}
 			}
 		}
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
 	 * @param string $appId
 	 */
 	private function includePreUpdate($appId) {
-		include \OC_App::getAppPath($appId) . '/appinfo/preupdate.php';
+		include \OC_App::getAppPath($appId).'/appinfo/preupdate.php';
 	}
 
 	/**
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
 		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])) {
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
 					\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.
@@ -397,9 +397,9 @@  discard block
 block discarded – undo
 		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));
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
 	 * @throws \Exception
 	 */
 	private function upgradeAppStoreApps(array $disabledApps) {
-		foreach($disabledApps as $app) {
+		foreach ($disabledApps as $app) {
 			try {
 				$this->emit('\OC\Updater', 'checkAppStoreAppBefore', [$app]);
 				if ($this->installer->isUpdateAvailable($app)) {
@@ -456,22 +456,22 @@  discard block
 block discarded – undo
 	 */
 	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());
 			}
@@ -486,13 +486,13 @@  discard block
 block discarded – undo
 			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) {
@@ -501,30 +501,30 @@  discard block
 block discarded – undo
 			}
 			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;
 			}
 		};
@@ -538,74 +538,74 @@  discard block
 block discarded – undo
 		$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']);
 		});
 

Please login to merge, or discard this patch.

lib/private/Repair/NC14/RepairPendingCronJobs.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -69,7 +69,7 @@
 block discarded – undo
 		if ($this->shouldRun()) {
 			$count = $this->repair();
 
-			$output->info('Repaired ' . $count . ' pending cron job(s).');
+			$output->info('Repaired '.$count.' pending cron job(s).');
 		} else {
 			$output->info('No need to repair pending cron jobs.');
 		}

Please login to merge, or discard this patch.

		@@ -101,12 +101,12 @@ discard block
		block discarded – undo
101	101	$this->logAllEvents();
102	102
103	103	$logLevel = $this->config->getSystemValue('loglevel', ILogger::WARN);
104		- $this->emit('\OC\Updater', 'setDebugLogLevel', [ $logLevel, $this->logLevelNames[$logLevel] ]);
	104	+ $this->emit('\OC\Updater', 'setDebugLogLevel', [$logLevel, $this->logLevelNames[$logLevel]]);
105	105	$this->config->setSystemValue('loglevel', ILogger::DEBUG);
106	106
107	107	$wasMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
108	108
109		- if(!$wasMaintenanceModeEnabled) {
	109	+ if (!$wasMaintenanceModeEnabled) {
110	110	$this->config->setSystemValue('maintenance', true);
111	111	$this->emit('\OC\Updater', 'maintenanceEnabled');
112	112	}
		@@ -119,31 +119,31 @@ discard block
		block discarded – undo
119	119	$this->waitForCronToFinish();
120	120	}
121	121
122		- $this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core'));
	122	+ $this->log->debug('starting upgrade from '.$installedVersion.' to '.$currentVersion, array('app' => 'core'));
123	123
124	124	$success = true;
125	125	try {
126	126	$this->doUpgrade($currentVersion, $installedVersion);
127	127	} catch (HintException $exception) {
128	128	$this->log->logException($exception, ['app' => 'core']);
129		- $this->emit('\OC\Updater', 'failure', array($exception->getMessage() . ': ' .$exception->getHint()));
	129	+ $this->emit('\OC\Updater', 'failure', array($exception->getMessage().': '.$exception->getHint()));
130	130	$success = false;
131	131	} catch (\Exception $exception) {
132	132	$this->log->logException($exception, ['app' => 'core']);
133		- $this->emit('\OC\Updater', 'failure', array(get_class($exception) . ': ' .$exception->getMessage()));
	133	+ $this->emit('\OC\Updater', 'failure', array(get_class($exception).': '.$exception->getMessage()));
134	134	$success = false;
135	135	}
136	136
137	137	$this->emit('\OC\Updater', 'updateEnd', array($success));
138	138
139		- if(!$wasMaintenanceModeEnabled && $success) {
	139	+ if (!$wasMaintenanceModeEnabled && $success) {
140	140	$this->config->setSystemValue('maintenance', false);
141	141	$this->emit('\OC\Updater', 'maintenanceDisabled');
142	142	} else {
143	143	$this->emit('\OC\Updater', 'maintenanceActive');
144	144	}
145	145
146		- $this->emit('\OC\Updater', 'resetLogLevel', [ $logLevel, $this->logLevelNames[$logLevel] ]);
	146	+ $this->emit('\OC\Updater', 'resetLogLevel', [$logLevel, $this->logLevelNames[$logLevel]]);
147	147	$this->config->setSystemValue('loglevel', $logLevel);
148	148	$this->config->setSystemValue('installed', true);
149	149
		@@ -157,7 +157,7 @@ discard block
		block discarded – undo
157	157	*/
158	158	private function getAllowedPreviousVersions() {
159	159	// this should really be a JSON file
160		- require \OC::$SERVERROOT . '/version.php';
	160	+ require \OC::$SERVERROOT.'/version.php';
161	161	/** @var array $OC_VersionCanBeUpgradedFrom */
162	162	return $OC_VersionCanBeUpgradedFrom;
163	163	}
		@@ -169,7 +169,7 @@ discard block
		block discarded – undo
169	169	*/
170	170	private function getVendor() {
171	171	// this should really be a JSON file
172		- require \OC::$SERVERROOT . '/version.php';
	172	+ require \OC::$SERVERROOT.'/version.php';
173	173	/** @var string $vendor */
174	174	return (string) $vendor;
175	175	}
		@@ -183,7 +183,7 @@ discard block
		block discarded – undo
183	183	*/
184	184	public function isUpgradePossible($oldVersion, $newVersion, array $allowedPreviousVersions) {
185	185	$version = explode('.', $oldVersion);
186		- $majorMinor = $version[0] . '.' . $version[1];
	186	+ $majorMinor = $version[0].'.'.$version[1];
187	187
188	188	$currentVendor = $this->config->getAppValue('core', 'vendor', '');
189	189
		@@ -230,7 +230,7 @@ discard block
		block discarded – undo
230	230	// create empty file in data dir, so we can later find
231	231	// out that this is indeed an ownCloud data directory
232	232	// (in case it didn't exist before)
233		- file_put_contents($this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', '');
	233	+ file_put_contents($this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', '');
234	234
235	235	// pre-upgrade repairs
236	236	$repair = new Repair(Repair::getBeforeUpgradeRepairSteps(), \OC::$server->getEventDispatcher());
		@@ -261,7 +261,7 @@ discard block
		block discarded – undo
261	261	foreach ($errors as $appId => $exception) {
262	262	/** @var \Exception $exception */
263	263	$this->log->logException($exception, ['app' => $appId]);
264		- $this->emit('\OC\Updater', 'failure', [$appId . ': ' . $exception->getMessage()]);
	264	+ $this->emit('\OC\Updater', 'failure', [$appId.': '.$exception->getMessage()]);
265	265	}
266	266
267	267	// post-upgrade repairs
		@@ -272,7 +272,7 @@ discard block
		block discarded – undo
272	272	$this->config->setAppValue('core', 'lastupdatedat', 0);
273	273
274	274	// Check for code integrity if not disabled
275		- if(\OC::$server->getIntegrityCodeChecker()->isCodeCheckEnforced()) {
	275	+ if (\OC::$server->getIntegrityCodeChecker()->isCodeCheckEnforced()) {
276	276	$this->emit('\OC\Updater', 'startCheckCodeIntegrity');
277	277	$this->checker->runInstanceVerification();
278	278	$this->emit('\OC\Updater', 'finishedCheckCodeIntegrity');
		@@ -313,12 +313,12 @@ discard block
		block discarded – undo
313	313	* @link https://github.com/owncloud/core/issues/10980
314	314	* @see \OC_App::updateApp
315	315	*/
316		- if (file_exists(\OC_App::getAppPath($appId) . '/appinfo/preupdate.php')) {
	316	+ if (file_exists(\OC_App::getAppPath($appId).'/appinfo/preupdate.php')) {
317	317	$this->includePreUpdate($appId);
318	318	}
319		- if (file_exists(\OC_App::getAppPath($appId) . '/appinfo/database.xml')) {
	319	+ if (file_exists(\OC_App::getAppPath($appId).'/appinfo/database.xml')) {
320	320	$this->emit('\OC\Updater', 'appSimulateUpdate', array($appId));
321		- \OC_DB::simulateUpdateDbFromStructure(\OC_App::getAppPath($appId) . '/appinfo/database.xml');
	321	+ \OC_DB::simulateUpdateDbFromStructure(\OC_App::getAppPath($appId).'/appinfo/database.xml');
322	322	}
323	323	}
324	324	}
		@@ -331,7 +331,7 @@ discard block
		block discarded – undo
331	331	* @param string $appId
332	332	*/
333	333	private function includePreUpdate($appId) {
334		- include \OC_App::getAppPath($appId) . '/appinfo/preupdate.php';
	334	+ include \OC_App::getAppPath($appId).'/appinfo/preupdate.php';
335	335	}
336	336
337	337	/**
		@@ -349,7 +349,7 @@ discard block
		block discarded – undo
349	349	foreach ($apps as $appId) {
350	350	$priorityType = false;
351	351	foreach ($priorityTypes as $type) {
352		- if(!isset($stacks[$type])) {
	352	+ if (!isset($stacks[$type])) {
353	353	$stacks[$type] = array();
354	354	}
355	355	if (\OC_App::isType($appId, [$type])) {
		@@ -369,7 +369,7 @@ discard block
		block discarded – undo
369	369	\OC_App::updateApp($appId);
370	370	$this->emit('\OC\Updater', 'appUpgrade', [$appId, \OC_App::getAppVersion($appId)]);
371	371	}
372		- if($type !== $pseudoOtherType) {
	372	+ if ($type !== $pseudoOtherType) {
373	373	// load authentication, filesystem and logging apps after
374	374	// upgrading them. Other apps my need to rely on modifying
375	375	// user and/or filesystem aspects.
		@@ -397,9 +397,9 @@ discard block
		block discarded – undo
397	397	foreach ($apps as $app) {
398	398	// check if the app is compatible with this version of ownCloud
399	399	$info = OC_App::getAppInfo($app);
400		- if($info === null \|\| !OC_App::isAppCompatible($version, $info)) {
	400	+ if ($info === null \|\| !OC_App::isAppCompatible($version, $info)) {
401	401	if ($appManager->isShipped($app)) {
402		- throw new \UnexpectedValueException('The files of the app "' . $app . '" were not correctly replaced before running the update');
	402	+ throw new \UnexpectedValueException('The files of the app "'.$app.'" were not correctly replaced before running the update');
403	403	}
404	404	\OC::$server->getAppManager()->disableApp($app);
405	405	$this->emit('\OC\Updater', 'incompatibleAppDisabled', array($app));
		@@ -437,7 +437,7 @@ discard block
		block discarded – undo
437	437	* @throws \Exception
438	438	*/
439	439	private function upgradeAppStoreApps(array $disabledApps) {
440		- foreach($disabledApps as $app) {
	440	+ foreach ($disabledApps as $app) {
441	441	try {
442	442	$this->emit('\OC\Updater', 'checkAppStoreAppBefore', [$app]);
443	443	if ($this->installer->isUpdateAvailable($app)) {
		@@ -456,22 +456,22 @@ discard block
		block discarded – undo
456	456	*/
457	457	private function emitRepairEvents() {
458	458	$dispatcher = \OC::$server->getEventDispatcher();
459		- $dispatcher->addListener('\OC\Repair::warning', function ($event) {
	459	+ $dispatcher->addListener('\OC\Repair::warning', function($event) {
460	460	if ($event instanceof GenericEvent) {
461	461	$this->emit('\OC\Updater', 'repairWarning', $event->getArguments());
462	462	}
463	463	});
464		- $dispatcher->addListener('\OC\Repair::error', function ($event) {
	464	+ $dispatcher->addListener('\OC\Repair::error', function($event) {
465	465	if ($event instanceof GenericEvent) {
466	466	$this->emit('\OC\Updater', 'repairError', $event->getArguments());
467	467	}
468	468	});
469		- $dispatcher->addListener('\OC\Repair::info', function ($event) {
	469	+ $dispatcher->addListener('\OC\Repair::info', function($event) {
470	470	if ($event instanceof GenericEvent) {
471	471	$this->emit('\OC\Updater', 'repairInfo', $event->getArguments());
472	472	}
473	473	});
474		- $dispatcher->addListener('\OC\Repair::step', function ($event) {
	474	+ $dispatcher->addListener('\OC\Repair::step', function($event) {
475	475	if ($event instanceof GenericEvent) {
476	476	$this->emit('\OC\Updater', 'repairStep', $event->getArguments());
477	477	}
		@@ -486,13 +486,13 @@ discard block
		block discarded – undo
486	486	if (!$event instanceof GenericEvent) {
487	487	return;
488	488	}
489		- $log->info('\OC\DB\Migrator::executeSql: ' . $event->getSubject() . ' (' . $event->getArgument(0) . ' of ' . $event->getArgument(1) . ')', ['app' => 'updater']);
	489	+ $log->info('\OC\DB\Migrator::executeSql: '.$event->getSubject().' ('.$event->getArgument(0).' of '.$event->getArgument(1).')', ['app' => 'updater']);
490	490	});
491	491	$dispatcher->addListener('\OC\DB\Migrator::checkTable', function($event) use ($log) {
492	492	if (!$event instanceof GenericEvent) {
493	493	return;
494	494	}
495		- $log->info('\OC\DB\Migrator::checkTable: ' . $event->getSubject() . ' (' . $event->getArgument(0) . ' of ' . $event->getArgument(1) . ')', ['app' => 'updater']);
	495	+ $log->info('\OC\DB\Migrator::checkTable: '.$event->getSubject().' ('.$event->getArgument(0).' of '.$event->getArgument(1).')', ['app' => 'updater']);
496	496	});
497	497
498	498	$repairListener = function($event) use ($log) {
		@@ -501,30 +501,30 @@ discard block
		block discarded – undo
501	501	}
502	502	switch ($event->getSubject()) {
503	503	case '\OC\Repair::startProgress':
504		- $log->info('\OC\Repair::startProgress: Starting ... ' . $event->getArgument(1) . ' (' . $event->getArgument(0) . ')', ['app' => 'updater']);
	504	+ $log->info('\OC\Repair::startProgress: Starting ... '.$event->getArgument(1).' ('.$event->getArgument(0).')', ['app' => 'updater']);
505	505	break;
506	506	case '\OC\Repair::advance':
507	507	$desc = $event->getArgument(1);
508	508	if (empty($desc)) {
509	509	$desc = '';
510	510	}
511		- $log->info('\OC\Repair::advance: ' . $desc . ' (' . $event->getArgument(0) . ')', ['app' => 'updater']);
	511	+ $log->info('\OC\Repair::advance: '.$desc.' ('.$event->getArgument(0).')', ['app' => 'updater']);
512	512
513	513	break;
514	514	case '\OC\Repair::finishProgress':
515	515	$log->info('\OC\Repair::finishProgress', ['app' => 'updater']);
516	516	break;
517	517	case '\OC\Repair::step':
518		- $log->info('\OC\Repair::step: Repair step: ' . $event->getArgument(0), ['app' => 'updater']);
	518	+ $log->info('\OC\Repair::step: Repair step: '.$event->getArgument(0), ['app' => 'updater']);
519	519	break;
520	520	case '\OC\Repair::info':
521		- $log->info('\OC\Repair::info: Repair info: ' . $event->getArgument(0), ['app' => 'updater']);
	521	+ $log->info('\OC\Repair::info: Repair info: '.$event->getArgument(0), ['app' => 'updater']);
522	522	break;
523	523	case '\OC\Repair::warning':
524		- $log->warning('\OC\Repair::warning: Repair warning: ' . $event->getArgument(0), ['app' => 'updater']);
	524	+ $log->warning('\OC\Repair::warning: Repair warning: '.$event->getArgument(0), ['app' => 'updater']);
525	525	break;
526	526	case '\OC\Repair::error':
527		- $log->error('\OC\Repair::error: Repair error: ' . $event->getArgument(0), ['app' => 'updater']);
	527	+ $log->error('\OC\Repair::error: Repair error: '.$event->getArgument(0), ['app' => 'updater']);
528	528	break;
529	529	}
530	530	};
		@@ -538,74 +538,74 @@ discard block
		block discarded – undo
538	538	$dispatcher->addListener('\OC\Repair::error', $repairListener);
539	539
540	540
541		- $this->listen('\OC\Updater', 'maintenanceEnabled', function () use($log) {
	541	+ $this->listen('\OC\Updater', 'maintenanceEnabled', function() use($log) {
542	542	$log->info('\OC\Updater::maintenanceEnabled: Turned on maintenance mode', ['app' => 'updater']);
543	543	});
544		- $this->listen('\OC\Updater', 'maintenanceDisabled', function () use($log) {
	544	+ $this->listen('\OC\Updater', 'maintenanceDisabled', function() use($log) {
545	545	$log->info('\OC\Updater::maintenanceDisabled: Turned off maintenance mode', ['app' => 'updater']);
546	546	});
547		- $this->listen('\OC\Updater', 'maintenanceActive', function () use($log) {
	547	+ $this->listen('\OC\Updater', 'maintenanceActive', function() use($log) {
548	548	$log->info('\OC\Updater::maintenanceActive: Maintenance mode is kept active', ['app' => 'updater']);
549	549	});
550		- $this->listen('\OC\Updater', 'updateEnd', function ($success) use($log) {
	550	+ $this->listen('\OC\Updater', 'updateEnd', function($success) use($log) {
551	551	if ($success) {
552	552	$log->info('\OC\Updater::updateEnd: Update successful', ['app' => 'updater']);
553	553	} else {
554	554	$log->error('\OC\Updater::updateEnd: Update failed', ['app' => 'updater']);
555	555	}
556	556	});
557		- $this->listen('\OC\Updater', 'dbUpgradeBefore', function () use($log) {
	557	+ $this->listen('\OC\Updater', 'dbUpgradeBefore', function() use($log) {
558	558	$log->info('\OC\Updater::dbUpgradeBefore: Updating database schema', ['app' => 'updater']);
559	559	});
560		- $this->listen('\OC\Updater', 'dbUpgrade', function () use($log) {
	560	+ $this->listen('\OC\Updater', 'dbUpgrade', function() use($log) {
561	561	$log->info('\OC\Updater::dbUpgrade: Updated database', ['app' => 'updater']);
562	562	});
563		- $this->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use($log) {
	563	+ $this->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function() use($log) {
564	564	$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']);
565	565	});
566		- $this->listen('\OC\Updater', 'dbSimulateUpgrade', function () use($log) {
	566	+ $this->listen('\OC\Updater', 'dbSimulateUpgrade', function() use($log) {
567	567	$log->info('\OC\Updater::dbSimulateUpgrade: Checked database schema update', ['app' => 'updater']);
568	568	});
569		- $this->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use($log) {
570		- $log->info('\OC\Updater::incompatibleAppDisabled: Disabled incompatible app: ' . $app, ['app' => 'updater']);
	569	+ $this->listen('\OC\Updater', 'incompatibleAppDisabled', function($app) use($log) {
	570	+ $log->info('\OC\Updater::incompatibleAppDisabled: Disabled incompatible app: '.$app, ['app' => 'updater']);
571	571	});
572		- $this->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use($log) {
573		- $log->info('\OC\Updater::checkAppStoreAppBefore: Checking for update of app "' . $app . '" in appstore', ['app' => 'updater']);
	572	+ $this->listen('\OC\Updater', 'checkAppStoreAppBefore', function($app) use($log) {
	573	+ $log->info('\OC\Updater::checkAppStoreAppBefore: Checking for update of app "'.$app.'" in appstore', ['app' => 'updater']);
574	574	});
575		- $this->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use($log) {
576		- $log->info('\OC\Updater::upgradeAppStoreApp: Update app "' . $app . '" from appstore', ['app' => 'updater']);
	575	+ $this->listen('\OC\Updater', 'upgradeAppStoreApp', function($app) use($log) {
	576	+ $log->info('\OC\Updater::upgradeAppStoreApp: Update app "'.$app.'" from appstore', ['app' => 'updater']);
577	577	});
578		- $this->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use($log) {
579		- $log->info('\OC\Updater::checkAppStoreApp: Checked for update of app "' . $app . '" in appstore', ['app' => 'updater']);
	578	+ $this->listen('\OC\Updater', 'checkAppStoreApp', function($app) use($log) {
	579	+ $log->info('\OC\Updater::checkAppStoreApp: Checked for update of app "'.$app.'" in appstore', ['app' => 'updater']);
580	580	});
581		- $this->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($log) {
	581	+ $this->listen('\OC\Updater', 'appUpgradeCheckBefore', function() use ($log) {
582	582	$log->info('\OC\Updater::appUpgradeCheckBefore: Checking updates of apps', ['app' => 'updater']);
583	583	});
584		- $this->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($log) {
585		- $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']);
	584	+ $this->listen('\OC\Updater', 'appSimulateUpdate', function($app) use ($log) {
	585	+ $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']);
586	586	});
587		- $this->listen('\OC\Updater', 'appUpgradeCheck', function () use ($log) {
	587	+ $this->listen('\OC\Updater', 'appUpgradeCheck', function() use ($log) {
588	588	$log->info('\OC\Updater::appUpgradeCheck: Checked database schema update for apps', ['app' => 'updater']);
589	589	});
590		- $this->listen('\OC\Updater', 'appUpgradeStarted', function ($app) use ($log) {
591		- $log->info('\OC\Updater::appUpgradeStarted: Updating <' . $app . '> ...', ['app' => 'updater']);
	590	+ $this->listen('\OC\Updater', 'appUpgradeStarted', function($app) use ($log) {
	591	+ $log->info('\OC\Updater::appUpgradeStarted: Updating <'.$app.'> ...', ['app' => 'updater']);
592	592	});
593		- $this->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($log) {
594		- $log->info('\OC\Updater::appUpgrade: Updated <' . $app . '> to ' . $version, ['app' => 'updater']);
	593	+ $this->listen('\OC\Updater', 'appUpgrade', function($app, $version) use ($log) {
	594	+ $log->info('\OC\Updater::appUpgrade: Updated <'.$app.'> to '.$version, ['app' => 'updater']);
595	595	});
596		- $this->listen('\OC\Updater', 'failure', function ($message) use($log) {
597		- $log->error('\OC\Updater::failure: ' . $message, ['app' => 'updater']);
	596	+ $this->listen('\OC\Updater', 'failure', function($message) use($log) {
	597	+ $log->error('\OC\Updater::failure: '.$message, ['app' => 'updater']);
598	598	});
599		- $this->listen('\OC\Updater', 'setDebugLogLevel', function () use($log) {
	599	+ $this->listen('\OC\Updater', 'setDebugLogLevel', function() use($log) {
600	600	$log->info('\OC\Updater::setDebugLogLevel: Set log level to debug', ['app' => 'updater']);
601	601	});
602		- $this->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($log) {
603		- $log->info('\OC\Updater::resetLogLevel: Reset log level to ' . $logLevelName . '(' . $logLevel . ')', ['app' => 'updater']);
	602	+ $this->listen('\OC\Updater', 'resetLogLevel', function($logLevel, $logLevelName) use($log) {
	603	+ $log->info('\OC\Updater::resetLogLevel: Reset log level to '.$logLevelName.'('.$logLevel.')', ['app' => 'updater']);
604	604	});
605		- $this->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use($log) {
	605	+ $this->listen('\OC\Updater', 'startCheckCodeIntegrity', function() use($log) {
606	606	$log->info('\OC\Updater::startCheckCodeIntegrity: Starting code integrity check...', ['app' => 'updater']);
607	607	});
608		- $this->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use($log) {
	608	+ $this->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function() use($log) {
609	609	$log->info('\OC\Updater::finishedCheckCodeIntegrity: Finished code integrity check', ['app' => 'updater']);
610	610	});
611	611

		@@ -69,7 +69,7 @@
		block discarded – undo
69	69	if ($this->shouldRun()) {
70	70	$count = $this->repair();
71	71
72		- $output->info('Repaired ' . $count . ' pending cron job(s).');
	72	+ $output->info('Repaired '.$count.' pending cron job(s).');
73	73	} else {
74	74	$output->info('No need to repair pending cron jobs.');
75	75	}

nextcloud / server

Push — master ( 524450...ed6352 )

Status

Category

Spacing +65 added lines, -65 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch