nextcloud / server

lib/private/App/CodeChecker/InfoChecker.php

Spacing +3 added lines, -3 removed lines

@@ -48,12 +48,12 @@
 		}
 
 		$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';
 		if ($this->appManager->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';
 		}
 
 		$errors = [];

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>");
 		}

console.php

Spacing +15 added lines, -15 removed lines

@@ -29,7 +29,7 @@ 
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 use OC\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
@@ -39,12 +39,12 @@ 
 
 function exceptionHandler($exception) {
 
-	echo "An unhandled exception has been thrown:" . PHP_EOL;
+	echo "An unhandled exception has been thrown:".PHP_EOL;
 	echo $exception;
 	exit(1);
 }
 try {
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	// set to run indefinitely if needed
 	if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
@@ -52,38 +52,38 @@ 
 	}
 
 	if (!OC::$CLI) {
-		echo "This script can be run from the command line only" . PHP_EOL;
+		echo "This script can be run from the command line only".PHP_EOL;
 		exit(1);
 	}
 
 	set_exception_handler('exceptionHandler');
 
 	if (!function_exists('posix_getuid')) {
-		echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php" . PHP_EOL;
+		echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php".PHP_EOL;
 		exit(1);
 	}
 	$user = posix_getpwuid(posix_getuid());
-	$configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php'));
+	$configUser = posix_getpwuid(fileowner(OC::$configDir.'config.php'));
 	if ($user['name'] !== $configUser['name']) {
-		echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
-		echo "Current user: " . $user['name'] . PHP_EOL;
-		echo "Owner of config.php: " . $configUser['name'] . PHP_EOL;
-		echo "Try adding 'sudo -u " . $configUser['name'] . " ' to the beginning of the command (without the single quotes)" . PHP_EOL;
+		echo "Console has to be executed with the user that owns the file config/config.php".PHP_EOL;
+		echo "Current user: ".$user['name'].PHP_EOL;
+		echo "Owner of config.php: ".$configUser['name'].PHP_EOL;
+		echo "Try adding 'sudo -u ".$configUser['name']." ' to the beginning of the command (without the single quotes)".PHP_EOL;
 		exit(1);
 	}
 
 	$oldWorkingDir = getcwd();
 	if ($oldWorkingDir === false) {
-		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
-		echo "Can't determine current working dir - the script will continue to work but be aware of the above fact." . PHP_EOL;
+		echo "This script can be run from the Nextcloud root directory only.".PHP_EOL;
+		echo "Can't determine current working dir - the script will continue to work but be aware of the above fact.".PHP_EOL;
 	} else if ($oldWorkingDir !== __DIR__ && !chdir(__DIR__)) {
-		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
-		echo "Can't change to Nextcloud root directory." . PHP_EOL;
+		echo "This script can be run from the Nextcloud root directory only.".PHP_EOL;
+		echo "Can't change to Nextcloud root directory.".PHP_EOL;
 		exit(1);
 	}
 
 	if (!function_exists('pcntl_signal') && !in_array('--no-warnings', $argv)) {
-		echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see http://php.net/manual/en/book.pcntl.php" . PHP_EOL;
+		echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see http://php.net/manual/en/book.pcntl.php".PHP_EOL;
 	}
 
 	$application = new Application(\OC::$server->getConfig(), \OC::$server->getEventDispatcher(), \OC::$server->getRequest(), \OC::$server->getLogger());