nextcloud / server

core/Command/App/CheckCode.php

Spacing +10 added lines, -10 removed lines

@@ -42,7 +42,7 @@ 
 use OC\App\CodeChecker\DeprecationCheck;
 use OC\App\CodeChecker\PrivateCheck;
 
-class CheckCode extends Command implements CompletionAwareInterface  {
+class CheckCode extends Command implements CompletionAwareInterface {
 
 	protected $checkers = [
 		'private' => PrivateCheck::class,
@@ -64,7 +64,7 @@ 
 				'c',
 				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
 				'enable the specified checker(s)',
-				[ 'private', 'deprecation', 'strong-comparison' ]
+				['private', 'deprecation', 'strong-comparison']
 			)
 			->addOption(
 				'--skip-checkers',
@@ -95,7 +95,7 @@ 
 		$codeChecker = new CodeChecker($checkList, !$input->getOption('skip-validate-info'));
 
 		$codeChecker->listen('CodeChecker', 'analyseFileBegin', function($params) use ($output) {
-			if(OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+			if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
 				$output->writeln("<info>Analysing {$params}</info>");
 			}
 		});
@@ -103,29 +103,29 @@ 
 			$count = count($errors);
 
 			// show filename if the verbosity is low, but there are errors in a file
-			if($count > 0 && OutputInterface::VERBOSITY_VERBOSE > $output->getVerbosity()) {
+			if ($count > 0 && OutputInterface::VERBOSITY_VERBOSE > $output->getVerbosity()) {
 				$output->writeln("<info>Analysing {$filename}</info>");
 			}
 
 			// show error count if there are errors present or the verbosity is high
-			if($count > 0 || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+			if ($count > 0 || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
 				$output->writeln(" {$count} errors");
 			}
 			usort($errors, function($a, $b) {
-				return $a['line'] >$b['line'];
+				return $a['line'] > $b['line'];
 			});
 
-			foreach($errors as $p) {
+			foreach ($errors as $p) {
 				$line = sprintf("%' 4d", $p['line']);
 				$output->writeln("    <error>line $line: {$p['disallowedToken']} - {$p['reason']}</error>");
 			}
 		});
 		$errors = [];
-		if(!$input->getOption('skip-checkers')) {
+		if (!$input->getOption('skip-checkers')) {
 			$errors = $codeChecker->analyse($appId);
 		}
 
-		if(!$input->getOption('skip-validate-info')) {
+		if (!$input->getOption('skip-validate-info')) {
 			// Can not inject because of circular dependency
 			$infoChecker = new InfoChecker(\OC::$server->getAppManager());
 			$infoChecker->listen('InfoChecker', 'parseError', function($error) use ($output) {
@@ -179,7 +179,7 @@ 
 			throw new \RuntimeException("No app with given id <$appId> known.");
 		}
 
-		$updatePhp = $appPath . '/appinfo/update.php';
+		$updatePhp = $appPath.'/appinfo/update.php';
 		if (file_exists($updatePhp)) {
 			$output->writeln("<info>Deprecated file found: $updatePhp - please use repair steps</info>");
 		}

lib/private/App/CodeChecker/InfoChecker.php

Spacing +4 added lines, -4 removed lines

@@ -47,13 +47,13 @@ 
 		}
 
 		$xml = new \DOMDocument();
-		$xml->load($appPath . '/appinfo/info.xml');
+		$xml->load($appPath.'/appinfo/info.xml');
 
-		$schema = \OC::$SERVERROOT . '/resources/app-info.xsd';
+		$schema = \OC::$SERVERROOT.'/resources/app-info.xsd';
 		try {
 			if ($this->isShipped($appId)) {
 				// Shipped apps are allowed to have the public and default_enabled tags
-				$schema = \OC::$SERVERROOT . '/resources/app-info-shipped.xsd';
+				$schema = \OC::$SERVERROOT.'/resources/app-info-shipped.xsd';
 			}
 		} catch (\Exception $e) {
 			// Assume it is not shipped
@@ -98,7 +98,7 @@ 
 	 */
 	protected function loadShippedJson() {
 		if ($this->shippedApps === null) {
-			$shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
+			$shippedJson = \OC::$SERVERROOT.'/core/shipped.json';
 			if (!file_exists($shippedJson)) {
 				throw new \Exception("File not found: $shippedJson");
 			}

lib/private/App/AppManager.php

Spacing +11 added lines, -11 removed lines

@@ -113,11 +113,11 @@ 
 			$values = $this->appConfig->getValues(false, 'enabled');
 
 			$alwaysEnabledApps = $this->getAlwaysEnabledApps();
-			foreach($alwaysEnabledApps as $appId) {
+			foreach ($alwaysEnabledApps as $appId) {
 				$values[$appId] = 'yes';
 			}
 
-			$this->installedAppsCache = array_filter($values, function ($value) {
+			$this->installedAppsCache = array_filter($values, function($value) {
 				return $value !== 'no';
 			});
 			ksort($this->installedAppsCache);
@@ -142,7 +142,7 @@ 
 	 */
 	public function getEnabledAppsForUser(IUser $user) {
 		$apps = $this->getInstalledAppsValues();
-		$appsForUser = array_filter($apps, function ($enabled) use ($user) {
+		$appsForUser = array_filter($apps, function($enabled) use ($user) {
 			return $this->checkAppForUser($enabled, $user);
 		});
 		return array_keys($appsForUser);
@@ -181,7 +181,7 @@ 
 		} elseif ($user === null) {
 			return false;
 		} else {
-			if(empty($enabled)){
+			if (empty($enabled)) {
 				return false;
 			}
 
@@ -189,7 +189,7 @@ 
 
 			if (!is_array($groupIds)) {
 				$jsonError = json_last_error();
-				\OC::$server->getLogger()->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']);
+				\OC::$server->getLogger()->warning('AppManger::checkAppForUser - can\'t decode group IDs: '.print_r($enabled, true).' - json error code: '.$jsonError, ['app' => 'lib']);
 				return false;
 			}
 
@@ -263,7 +263,7 @@ 
 			}
 		}
 
-		$groupIds = array_map(function ($group) {
+		$groupIds = array_map(function($group) {
 			/** @var \OCP\IGroup $group */
 			return $group->getGID();
 		}, $groups);
@@ -302,8 +302,8 @@ 
 	 */
 	public function getAppPath($appId) {
 		$appPath = \OC_App::getAppPath($appId);
-		if($appPath === false) {
-			throw new AppPathNotFoundException('Could not find path for ' . $appId);
+		if ($appPath === false) {
+			throw new AppPathNotFoundException('Could not find path for '.$appId);
 		}
 		return $appPath;
 	}
@@ -363,7 +363,7 @@ 
 			} catch (AppPathNotFoundException $e) {
 				return null;
 			}
-			$file = $appPath . '/appinfo/info.xml';
+			$file = $appPath.'/appinfo/info.xml';
 		}
 
 		$parser = new InfoParser($this->memCacheFactory->createLocal('core.appinfo'));
@@ -381,7 +381,7 @@ 
 	}
 
 	public function getAppVersion(string $appId, bool $useCache = true) {
-		if(!$useCache || !isset($this->appVersions[$appId])) {
+		if (!$useCache || !isset($this->appVersions[$appId])) {
 			$appInfo = \OC::$server->getAppManager()->getAppInfo($appId);
 			$this->appVersions[$appId] = ($appInfo !== null) ? $appInfo['version'] : '0';
 		}
@@ -429,7 +429,7 @@ 
 	 */
 	private function loadShippedJson() {
 		if ($this->shippedApps === null) {
-			$shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
+			$shippedJson = \OC::$SERVERROOT.'/core/shipped.json';
 			if (!file_exists($shippedJson)) {
 				throw new \Exception("File not found: $shippedJson");
 			}