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

Passed

Push — master ( 54e3be...fad8dd )

by Blizzz

created 2020-11-26 17:12 UTC

Status

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

@@ -103,7 +103,7 @@  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->getSystemValueBool('maintenance');
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
 
 		// Clear CAN_INSTALL file if not on git
 		if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) {
-			if (!unlink(\OC::$configDir . '/CAN_INSTALL')) {
+			if (!unlink(\OC::$configDir.'/CAN_INSTALL')) {
 				$this->log->error('Could not cleanup CAN_INSTALL from your config folder. Please remove this file manually.');
 			}
 		}
@@ -123,18 +123,18 @@  discard block
 block discarded – undo
 		$installedVersion = $this->config->getSystemValue('version', '0.0.0');
 		$currentVersion = implode('.', \OCP\Util::getVersion());
 
-		$this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, ['app' => 'core']);
+		$this->log->debug('starting upgrade from '.$installedVersion.' to '.$currentVersion, ['app' => 'core']);
 
 		$success = true;
 		try {
 			$this->doUpgrade($currentVersion, $installedVersion);
 		} catch (HintException $exception) {
 			$this->log->logException($exception, ['app' => 'core']);
-			$this->emit('\OC\Updater', 'failure', [$exception->getMessage() . ': ' .$exception->getHint()]);
+			$this->emit('\OC\Updater', 'failure', [$exception->getMessage().': '.$exception->getHint()]);
 			$success = false;
 		} catch (\Exception $exception) {
 			$this->log->logException($exception, ['app' => 'core']);
-			$this->emit('\OC\Updater', 'failure', [get_class($exception) . ': ' .$exception->getMessage()]);
+			$this->emit('\OC\Updater', 'failure', [get_class($exception).': '.$exception->getMessage()]);
 			$success = false;
 		}
 
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
 			$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 @@  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;
 	}
@@ -173,7 +173,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;
 	}
@@ -187,7 +187,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', '');
 
@@ -234,7 +234,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());
@@ -267,7 +267,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
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
 			$info = OC_App::getAppInfo($app);
 			if ($info === null || !OC_App::isAppCompatible($version, $info)) {
 				if ($appManager->isShipped($app)) {
-					throw new \UnexpectedValueException('The files of the app "' . $app . '" were not correctly replaced before running the update');
+					throw new \UnexpectedValueException('The files of the app "'.$app.'" were not correctly replaced before running the update');
 				}
 				\OC::$server->getAppManager()->disableApp($app, true);
 				$this->emit('\OC\Updater', 'incompatibleAppDisabled', [$app]);
@@ -427,22 +427,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());
 			}
@@ -453,49 +453,49 @@  discard block
 block discarded – undo
 		$log = $this->log;
 
 		$dispatcher = \OC::$server->getEventDispatcher();
-		$dispatcher->addListener('\OC\DB\Migrator::executeSql', function ($event) use ($log) {
+		$dispatcher->addListener('\OC\DB\Migrator::executeSql', function($event) use ($log) {
 			if (!$event instanceof GenericEvent) {
 				return;
 			}
-			$log->info('\OC\DB\Migrator::executeSql: ' . $event->getSubject() . ' (' . $event->getArgument(0) . ' of ' . $event->getArgument(1) . ')', ['app' => 'updater']);
+			$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) {
+		$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) {
+		$repairListener = function($event) use ($log) {
 			if (!$event instanceof GenericEvent) {
 				return;
 			}
 			switch ($event->getSubject()) {
 				case '\OC\Repair::startProgress':
-					$log->info('\OC\Repair::startProgress: Starting ... ' . $event->getArgument(1) .  ' (' . $event->getArgument(0) . ')', ['app' => 'updater']);
+					$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;
 			}
 		};
@@ -509,74 +509,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.

		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	$this->logAllEvents();
104	104
105	105	$logLevel = $this->config->getSystemValue('loglevel', ILogger::WARN);
106		- $this->emit('\OC\Updater', 'setDebugLogLevel', [ $logLevel, $this->logLevelNames[$logLevel] ]);
	106	+ $this->emit('\OC\Updater', 'setDebugLogLevel', [$logLevel, $this->logLevelNames[$logLevel]]);
107	107	$this->config->setSystemValue('loglevel', ILogger::DEBUG);
108	108
109	109	$wasMaintenanceModeEnabled = $this->config->getSystemValueBool('maintenance');
		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115
116	116	// Clear CAN_INSTALL file if not on git
117	117	if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) {
118		- if (!unlink(\OC::$configDir . '/CAN_INSTALL')) {
	118	+ if (!unlink(\OC::$configDir.'/CAN_INSTALL')) {
119	119	$this->log->error('Could not cleanup CAN_INSTALL from your config folder. Please remove this file manually.');
120	120	}
121	121	}
		@@ -123,18 +123,18 @@ discard block
		block discarded – undo
123	123	$installedVersion = $this->config->getSystemValue('version', '0.0.0');
124	124	$currentVersion = implode('.', \OCP\Util::getVersion());
125	125
126		- $this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, ['app' => 'core']);
	126	+ $this->log->debug('starting upgrade from '.$installedVersion.' to '.$currentVersion, ['app' => 'core']);
127	127
128	128	$success = true;
129	129	try {
130	130	$this->doUpgrade($currentVersion, $installedVersion);
131	131	} catch (HintException $exception) {
132	132	$this->log->logException($exception, ['app' => 'core']);
133		- $this->emit('\OC\Updater', 'failure', [$exception->getMessage() . ': ' .$exception->getHint()]);
	133	+ $this->emit('\OC\Updater', 'failure', [$exception->getMessage().': '.$exception->getHint()]);
134	134	$success = false;
135	135	} catch (\Exception $exception) {
136	136	$this->log->logException($exception, ['app' => 'core']);
137		- $this->emit('\OC\Updater', 'failure', [get_class($exception) . ': ' .$exception->getMessage()]);
	137	+ $this->emit('\OC\Updater', 'failure', [get_class($exception).': '.$exception->getMessage()]);
138	138	$success = false;
139	139	}
140	140
		@@ -147,7 +147,7 @@ discard block
		block discarded – undo
147	147	$this->emit('\OC\Updater', 'maintenanceActive');
148	148	}
149	149
150		- $this->emit('\OC\Updater', 'resetLogLevel', [ $logLevel, $this->logLevelNames[$logLevel] ]);
	150	+ $this->emit('\OC\Updater', 'resetLogLevel', [$logLevel, $this->logLevelNames[$logLevel]]);
151	151	$this->config->setSystemValue('loglevel', $logLevel);
152	152	$this->config->setSystemValue('installed', true);
153	153
		@@ -161,7 +161,7 @@ discard block
		block discarded – undo
161	161	*/
162	162	private function getAllowedPreviousVersions() {
163	163	// this should really be a JSON file
164		- require \OC::$SERVERROOT . '/version.php';
	164	+ require \OC::$SERVERROOT.'/version.php';
165	165	/** @var array $OC_VersionCanBeUpgradedFrom */
166	166	return $OC_VersionCanBeUpgradedFrom;
167	167	}
		@@ -173,7 +173,7 @@ discard block
		block discarded – undo
173	173	*/
174	174	private function getVendor() {
175	175	// this should really be a JSON file
176		- require \OC::$SERVERROOT . '/version.php';
	176	+ require \OC::$SERVERROOT.'/version.php';
177	177	/** @var string $vendor */
178	178	return (string) $vendor;
179	179	}
		@@ -187,7 +187,7 @@ discard block
		block discarded – undo
187	187	*/
188	188	public function isUpgradePossible($oldVersion, $newVersion, array $allowedPreviousVersions) {
189	189	$version = explode('.', $oldVersion);
190		- $majorMinor = $version[0] . '.' . $version[1];
	190	+ $majorMinor = $version[0].'.'.$version[1];
191	191
192	192	$currentVendor = $this->config->getAppValue('core', 'vendor', '');
193	193
		@@ -234,7 +234,7 @@ discard block
		block discarded – undo
234	234	// create empty file in data dir, so we can later find
235	235	// out that this is indeed an ownCloud data directory
236	236	// (in case it didn't exist before)
237		- file_put_contents($this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', '');
	237	+ file_put_contents($this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', '');
238	238
239	239	// pre-upgrade repairs
240	240	$repair = new Repair(Repair::getBeforeUpgradeRepairSteps(), \OC::$server->getEventDispatcher());
		@@ -267,7 +267,7 @@ discard block
		block discarded – undo
267	267	foreach ($errors as $appId => $exception) {
268	268	/** @var \Exception $exception */
269	269	$this->log->logException($exception, ['app' => $appId]);
270		- $this->emit('\OC\Updater', 'failure', [$appId . ': ' . $exception->getMessage()]);
	270	+ $this->emit('\OC\Updater', 'failure', [$appId.': '.$exception->getMessage()]);
271	271	}
272	272
273	273	// post-upgrade repairs
		@@ -364,7 +364,7 @@ discard block
		block discarded – undo
364	364	$info = OC_App::getAppInfo($app);
365	365	if ($info === null \|\| !OC_App::isAppCompatible($version, $info)) {
366	366	if ($appManager->isShipped($app)) {
367		- throw new \UnexpectedValueException('The files of the app "' . $app . '" were not correctly replaced before running the update');
	367	+ throw new \UnexpectedValueException('The files of the app "'.$app.'" were not correctly replaced before running the update');
368	368	}
369	369	\OC::$server->getAppManager()->disableApp($app, true);
370	370	$this->emit('\OC\Updater', 'incompatibleAppDisabled', [$app]);
		@@ -427,22 +427,22 @@ discard block
		block discarded – undo
427	427	*/
428	428	private function emitRepairEvents() {
429	429	$dispatcher = \OC::$server->getEventDispatcher();
430		- $dispatcher->addListener('\OC\Repair::warning', function ($event) {
	430	+ $dispatcher->addListener('\OC\Repair::warning', function($event) {
431	431	if ($event instanceof GenericEvent) {
432	432	$this->emit('\OC\Updater', 'repairWarning', $event->getArguments());
433	433	}
434	434	});
435		- $dispatcher->addListener('\OC\Repair::error', function ($event) {
	435	+ $dispatcher->addListener('\OC\Repair::error', function($event) {
436	436	if ($event instanceof GenericEvent) {
437	437	$this->emit('\OC\Updater', 'repairError', $event->getArguments());
438	438	}
439	439	});
440		- $dispatcher->addListener('\OC\Repair::info', function ($event) {
	440	+ $dispatcher->addListener('\OC\Repair::info', function($event) {
441	441	if ($event instanceof GenericEvent) {
442	442	$this->emit('\OC\Updater', 'repairInfo', $event->getArguments());
443	443	}
444	444	});
445		- $dispatcher->addListener('\OC\Repair::step', function ($event) {
	445	+ $dispatcher->addListener('\OC\Repair::step', function($event) {
446	446	if ($event instanceof GenericEvent) {
447	447	$this->emit('\OC\Updater', 'repairStep', $event->getArguments());
448	448	}
		@@ -453,49 +453,49 @@ discard block
		block discarded – undo
453	453	$log = $this->log;
454	454
455	455	$dispatcher = \OC::$server->getEventDispatcher();
456		- $dispatcher->addListener('\OC\DB\Migrator::executeSql', function ($event) use ($log) {
	456	+ $dispatcher->addListener('\OC\DB\Migrator::executeSql', function($event) use ($log) {
457	457	if (!$event instanceof GenericEvent) {
458	458	return;
459	459	}
460		- $log->info('\OC\DB\Migrator::executeSql: ' . $event->getSubject() . ' (' . $event->getArgument(0) . ' of ' . $event->getArgument(1) . ')', ['app' => 'updater']);
	460	+ $log->info('\OC\DB\Migrator::executeSql: '.$event->getSubject().' ('.$event->getArgument(0).' of '.$event->getArgument(1).')', ['app' => 'updater']);
461	461	});
462		- $dispatcher->addListener('\OC\DB\Migrator::checkTable', function ($event) use ($log) {
	462	+ $dispatcher->addListener('\OC\DB\Migrator::checkTable', function($event) use ($log) {
463	463	if (!$event instanceof GenericEvent) {
464	464	return;
465	465	}
466		- $log->info('\OC\DB\Migrator::checkTable: ' . $event->getSubject() . ' (' . $event->getArgument(0) . ' of ' . $event->getArgument(1) . ')', ['app' => 'updater']);
	466	+ $log->info('\OC\DB\Migrator::checkTable: '.$event->getSubject().' ('.$event->getArgument(0).' of '.$event->getArgument(1).')', ['app' => 'updater']);
467	467	});
468	468
469		- $repairListener = function ($event) use ($log) {
	469	+ $repairListener = function($event) use ($log) {
470	470	if (!$event instanceof GenericEvent) {
471	471	return;
472	472	}
473	473	switch ($event->getSubject()) {
474	474	case '\OC\Repair::startProgress':
475		- $log->info('\OC\Repair::startProgress: Starting ... ' . $event->getArgument(1) . ' (' . $event->getArgument(0) . ')', ['app' => 'updater']);
	475	+ $log->info('\OC\Repair::startProgress: Starting ... '.$event->getArgument(1).' ('.$event->getArgument(0).')', ['app' => 'updater']);
476	476	break;
477	477	case '\OC\Repair::advance':
478	478	$desc = $event->getArgument(1);
479	479	if (empty($desc)) {
480	480	$desc = '';
481	481	}
482		- $log->info('\OC\Repair::advance: ' . $desc . ' (' . $event->getArgument(0) . ')', ['app' => 'updater']);
	482	+ $log->info('\OC\Repair::advance: '.$desc.' ('.$event->getArgument(0).')', ['app' => 'updater']);
483	483
484	484	break;
485	485	case '\OC\Repair::finishProgress':
486	486	$log->info('\OC\Repair::finishProgress', ['app' => 'updater']);
487	487	break;
488	488	case '\OC\Repair::step':
489		- $log->info('\OC\Repair::step: Repair step: ' . $event->getArgument(0), ['app' => 'updater']);
	489	+ $log->info('\OC\Repair::step: Repair step: '.$event->getArgument(0), ['app' => 'updater']);
490	490	break;
491	491	case '\OC\Repair::info':
492		- $log->info('\OC\Repair::info: Repair info: ' . $event->getArgument(0), ['app' => 'updater']);
	492	+ $log->info('\OC\Repair::info: Repair info: '.$event->getArgument(0), ['app' => 'updater']);
493	493	break;
494	494	case '\OC\Repair::warning':
495		- $log->warning('\OC\Repair::warning: Repair warning: ' . $event->getArgument(0), ['app' => 'updater']);
	495	+ $log->warning('\OC\Repair::warning: Repair warning: '.$event->getArgument(0), ['app' => 'updater']);
496	496	break;
497	497	case '\OC\Repair::error':
498		- $log->error('\OC\Repair::error: Repair error: ' . $event->getArgument(0), ['app' => 'updater']);
	498	+ $log->error('\OC\Repair::error: Repair error: '.$event->getArgument(0), ['app' => 'updater']);
499	499	break;
500	500	}
501	501	};
		@@ -509,74 +509,74 @@ discard block
		block discarded – undo
509	509	$dispatcher->addListener('\OC\Repair::error', $repairListener);
510	510
511	511
512		- $this->listen('\OC\Updater', 'maintenanceEnabled', function () use ($log) {
	512	+ $this->listen('\OC\Updater', 'maintenanceEnabled', function() use ($log) {
513	513	$log->info('\OC\Updater::maintenanceEnabled: Turned on maintenance mode', ['app' => 'updater']);
514	514	});
515		- $this->listen('\OC\Updater', 'maintenanceDisabled', function () use ($log) {
	515	+ $this->listen('\OC\Updater', 'maintenanceDisabled', function() use ($log) {
516	516	$log->info('\OC\Updater::maintenanceDisabled: Turned off maintenance mode', ['app' => 'updater']);
517	517	});
518		- $this->listen('\OC\Updater', 'maintenanceActive', function () use ($log) {
	518	+ $this->listen('\OC\Updater', 'maintenanceActive', function() use ($log) {
519	519	$log->info('\OC\Updater::maintenanceActive: Maintenance mode is kept active', ['app' => 'updater']);
520	520	});
521		- $this->listen('\OC\Updater', 'updateEnd', function ($success) use ($log) {
	521	+ $this->listen('\OC\Updater', 'updateEnd', function($success) use ($log) {
522	522	if ($success) {
523	523	$log->info('\OC\Updater::updateEnd: Update successful', ['app' => 'updater']);
524	524	} else {
525	525	$log->error('\OC\Updater::updateEnd: Update failed', ['app' => 'updater']);
526	526	}
527	527	});
528		- $this->listen('\OC\Updater', 'dbUpgradeBefore', function () use ($log) {
	528	+ $this->listen('\OC\Updater', 'dbUpgradeBefore', function() use ($log) {
529	529	$log->info('\OC\Updater::dbUpgradeBefore: Updating database schema', ['app' => 'updater']);
530	530	});
531		- $this->listen('\OC\Updater', 'dbUpgrade', function () use ($log) {
	531	+ $this->listen('\OC\Updater', 'dbUpgrade', function() use ($log) {
532	532	$log->info('\OC\Updater::dbUpgrade: Updated database', ['app' => 'updater']);
533	533	});
534		- $this->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use ($log) {
	534	+ $this->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function() use ($log) {
535	535	$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']);
536	536	});
537		- $this->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($log) {
	537	+ $this->listen('\OC\Updater', 'dbSimulateUpgrade', function() use ($log) {
538	538	$log->info('\OC\Updater::dbSimulateUpgrade: Checked database schema update', ['app' => 'updater']);
539	539	});
540		- $this->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use ($log) {
541		- $log->info('\OC\Updater::incompatibleAppDisabled: Disabled incompatible app: ' . $app, ['app' => 'updater']);
	540	+ $this->listen('\OC\Updater', 'incompatibleAppDisabled', function($app) use ($log) {
	541	+ $log->info('\OC\Updater::incompatibleAppDisabled: Disabled incompatible app: '.$app, ['app' => 'updater']);
542	542	});
543		- $this->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($log) {
544		- $log->info('\OC\Updater::checkAppStoreAppBefore: Checking for update of app "' . $app . '" in appstore', ['app' => 'updater']);
	543	+ $this->listen('\OC\Updater', 'checkAppStoreAppBefore', function($app) use ($log) {
	544	+ $log->info('\OC\Updater::checkAppStoreAppBefore: Checking for update of app "'.$app.'" in appstore', ['app' => 'updater']);
545	545	});
546		- $this->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($log) {
547		- $log->info('\OC\Updater::upgradeAppStoreApp: Update app "' . $app . '" from appstore', ['app' => 'updater']);
	546	+ $this->listen('\OC\Updater', 'upgradeAppStoreApp', function($app) use ($log) {
	547	+ $log->info('\OC\Updater::upgradeAppStoreApp: Update app "'.$app.'" from appstore', ['app' => 'updater']);
548	548	});
549		- $this->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($log) {
550		- $log->info('\OC\Updater::checkAppStoreApp: Checked for update of app "' . $app . '" in appstore', ['app' => 'updater']);
	549	+ $this->listen('\OC\Updater', 'checkAppStoreApp', function($app) use ($log) {
	550	+ $log->info('\OC\Updater::checkAppStoreApp: Checked for update of app "'.$app.'" in appstore', ['app' => 'updater']);
551	551	});
552		- $this->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($log) {
	552	+ $this->listen('\OC\Updater', 'appUpgradeCheckBefore', function() use ($log) {
553	553	$log->info('\OC\Updater::appUpgradeCheckBefore: Checking updates of apps', ['app' => 'updater']);
554	554	});
555		- $this->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($log) {
556		- $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']);
	555	+ $this->listen('\OC\Updater', 'appSimulateUpdate', function($app) use ($log) {
	556	+ $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']);
557	557	});
558		- $this->listen('\OC\Updater', 'appUpgradeCheck', function () use ($log) {
	558	+ $this->listen('\OC\Updater', 'appUpgradeCheck', function() use ($log) {
559	559	$log->info('\OC\Updater::appUpgradeCheck: Checked database schema update for apps', ['app' => 'updater']);
560	560	});
561		- $this->listen('\OC\Updater', 'appUpgradeStarted', function ($app) use ($log) {
562		- $log->info('\OC\Updater::appUpgradeStarted: Updating <' . $app . '> ...', ['app' => 'updater']);
	561	+ $this->listen('\OC\Updater', 'appUpgradeStarted', function($app) use ($log) {
	562	+ $log->info('\OC\Updater::appUpgradeStarted: Updating <'.$app.'> ...', ['app' => 'updater']);
563	563	});
564		- $this->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($log) {
565		- $log->info('\OC\Updater::appUpgrade: Updated <' . $app . '> to ' . $version, ['app' => 'updater']);
	564	+ $this->listen('\OC\Updater', 'appUpgrade', function($app, $version) use ($log) {
	565	+ $log->info('\OC\Updater::appUpgrade: Updated <'.$app.'> to '.$version, ['app' => 'updater']);
566	566	});
567		- $this->listen('\OC\Updater', 'failure', function ($message) use ($log) {
568		- $log->error('\OC\Updater::failure: ' . $message, ['app' => 'updater']);
	567	+ $this->listen('\OC\Updater', 'failure', function($message) use ($log) {
	568	+ $log->error('\OC\Updater::failure: '.$message, ['app' => 'updater']);
569	569	});
570		- $this->listen('\OC\Updater', 'setDebugLogLevel', function () use ($log) {
	570	+ $this->listen('\OC\Updater', 'setDebugLogLevel', function() use ($log) {
571	571	$log->info('\OC\Updater::setDebugLogLevel: Set log level to debug', ['app' => 'updater']);
572	572	});
573		- $this->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use ($log) {
574		- $log->info('\OC\Updater::resetLogLevel: Reset log level to ' . $logLevelName . '(' . $logLevel . ')', ['app' => 'updater']);
	573	+ $this->listen('\OC\Updater', 'resetLogLevel', function($logLevel, $logLevelName) use ($log) {
	574	+ $log->info('\OC\Updater::resetLogLevel: Reset log level to '.$logLevelName.'('.$logLevel.')', ['app' => 'updater']);
575	575	});
576		- $this->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use ($log) {
	576	+ $this->listen('\OC\Updater', 'startCheckCodeIntegrity', function() use ($log) {
577	577	$log->info('\OC\Updater::startCheckCodeIntegrity: Starting code integrity check...', ['app' => 'updater']);
578	578	});
579		- $this->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use ($log) {
	579	+ $this->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function() use ($log) {
580	580	$log->info('\OC\Updater::finishedCheckCodeIntegrity: Finished code integrity check', ['app' => 'updater']);
581	581	});
582	582	}

nextcloud / server

Push — master ( 54e3be...fad8dd )

Status

Category

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