nextcloud / server

lib/private/App/CodeChecker/LanguageParseChecker.php

Indentation +32 added lines, -32 removed lines

@@ -25,36 +25,36 @@
 
 class LanguageParseChecker {
 
-	/**
-	 * @param string $appId
-	 * @return array
-	 */
-	public function analyse($appId) {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
-
-		if (!is_dir($appPath . '/l10n/')) {
-			return [];
-		}
-
-		$errors = [];
-		$directory = new \DirectoryIterator($appPath . '/l10n/');
-
-		foreach ($directory as $file) {
-			if ($file->getExtension() !== 'json') {
-				continue;
-			}
-
-			$content = file_get_contents($file->getPathname());
-			json_decode($content, true);
-
-			if (json_last_error() !== JSON_ERROR_NONE) {
-				$errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
-			}
-		}
-
-		return $errors;
-	}
+    /**
+     * @param string $appId
+     * @return array
+     */
+    public function analyse($appId) {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new \RuntimeException("No app with given id <$appId> known.");
+        }
+
+        if (!is_dir($appPath . '/l10n/')) {
+            return [];
+        }
+
+        $errors = [];
+        $directory = new \DirectoryIterator($appPath . '/l10n/');
+
+        foreach ($directory as $file) {
+            if ($file->getExtension() !== 'json') {
+                continue;
+            }
+
+            $content = file_get_contents($file->getPathname());
+            json_decode($content, true);
+
+            if (json_last_error() !== JSON_ERROR_NONE) {
+                $errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
+            }
+        }
+
+        return $errors;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -35,12 +35,12 @@ 
 			throw new \RuntimeException("No app with given id <$appId> known.");
 		}
 
-		if (!is_dir($appPath . '/l10n/')) {
+		if (!is_dir($appPath.'/l10n/')) {
 			return [];
 		}
 
 		$errors = [];
-		$directory = new \DirectoryIterator($appPath . '/l10n/');
+		$directory = new \DirectoryIterator($appPath.'/l10n/');
 
 		foreach ($directory as $file) {
 			if ($file->getExtension() !== 'json') {
@@ -51,7 +51,7 @@ 
 			json_decode($content, true);
 
 			if (json_last_error() !== JSON_ERROR_NONE) {
-				$errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
+				$errors[] = 'Invalid language file found: l10n/'.$file->getFilename().': '.json_last_error_msg();
 			}
 		}
 

lib/private/App/CodeChecker/DatabaseSchemaChecker.php

Indentation +77 added lines, -77 removed lines

@@ -25,81 +25,81 @@
 
 class DatabaseSchemaChecker {
 
-	/**
-	 * @param string $appId
-	 * @return array
-	 */
-	public function analyse($appId) {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
-
-		if (!file_exists($appPath . '/appinfo/database.xml')) {
-			return ['errors' => [], 'warnings' => []];
-		}
-
-		libxml_use_internal_errors(true);
-		$loadEntities = libxml_disable_entity_loader(false);
-		$xml = simplexml_load_file($appPath . '/appinfo/database.xml');
-		libxml_disable_entity_loader($loadEntities);
-
-
-		$errors = $warnings = [];
-
-		foreach ($xml->table as $table) {
-			// Table names
-			if (strpos($table->name, '*dbprefix*') !== 0) {
-				$errors[] = 'Database schema error: name of table ' . $table->name . ' does not start with *dbprefix*';
-			}
-			$tableName = substr($table->name, strlen('*dbprefix*'));
-			if (strpos($tableName, '*dbprefix*') !== false) {
-				$warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . $table->name;
-			}
-
-			if (strlen($tableName) > 27) {
-				$errors[] = 'Database schema error: Name of table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
-			}
-
-			$hasAutoIncrement = false;
-
-			// Column names
-			foreach ($table->declaration->field as $column) {
-				if (strpos($column->name, '*dbprefix*') !== false) {
-					$warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . $column->name . ' on table ' . $table->name;
-				}
-
-				if (strlen($column->name) > 30) {
-					$errors[] = 'Database schema error: Name of column ' . $column->name . ' on table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
-				}
-
-				if ($column->autoincrement) {
-					if ($hasAutoIncrement) {
-						$errors[] = 'Database schema error: Table ' . $table->name . ' has multiple autoincrement columns';
-					}
-
-					if (strlen($tableName) > 21) {
-						$errors[] = 'Database schema error: Name of table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
-					}
-
-					$hasAutoIncrement = true;
-				}
-			}
-
-			// Index names
-			foreach ($table->declaration->index as $index) {
-				$hasPrefix = strpos($index->name, '*dbprefix*');
-				if ($hasPrefix !== false && $hasPrefix !== 0) {
-					$warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . $index->name . ' on table ' . $table->name;
-				}
-
-				$indexName = $hasPrefix === 0 ? substr($index->name, strlen('*dbprefix*')) : $index->name;
-				if (strlen($indexName) > 27) {
-					$errors[] = 'Database schema error: Name of index ' . $index->name . ' on table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed';
-				}
-			}
-		}
-
-		return ['errors' => $errors, 'warnings' => $warnings];
-	}
+    /**
+     * @param string $appId
+     * @return array
+     */
+    public function analyse($appId) {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new \RuntimeException("No app with given id <$appId> known.");
+        }
+
+        if (!file_exists($appPath . '/appinfo/database.xml')) {
+            return ['errors' => [], 'warnings' => []];
+        }
+
+        libxml_use_internal_errors(true);
+        $loadEntities = libxml_disable_entity_loader(false);
+        $xml = simplexml_load_file($appPath . '/appinfo/database.xml');
+        libxml_disable_entity_loader($loadEntities);
+
+
+        $errors = $warnings = [];
+
+        foreach ($xml->table as $table) {
+            // Table names
+            if (strpos($table->name, '*dbprefix*') !== 0) {
+                $errors[] = 'Database schema error: name of table ' . $table->name . ' does not start with *dbprefix*';
+            }
+            $tableName = substr($table->name, strlen('*dbprefix*'));
+            if (strpos($tableName, '*dbprefix*') !== false) {
+                $warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . $table->name;
+            }
+
+            if (strlen($tableName) > 27) {
+                $errors[] = 'Database schema error: Name of table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
+            }
+
+            $hasAutoIncrement = false;
+
+            // Column names
+            foreach ($table->declaration->field as $column) {
+                if (strpos($column->name, '*dbprefix*') !== false) {
+                    $warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . $column->name . ' on table ' . $table->name;
+                }
+
+                if (strlen($column->name) > 30) {
+                    $errors[] = 'Database schema error: Name of column ' . $column->name . ' on table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
+                }
+
+                if ($column->autoincrement) {
+                    if ($hasAutoIncrement) {
+                        $errors[] = 'Database schema error: Table ' . $table->name . ' has multiple autoincrement columns';
+                    }
+
+                    if (strlen($tableName) > 21) {
+                        $errors[] = 'Database schema error: Name of table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
+                    }
+
+                    $hasAutoIncrement = true;
+                }
+            }
+
+            // Index names
+            foreach ($table->declaration->index as $index) {
+                $hasPrefix = strpos($index->name, '*dbprefix*');
+                if ($hasPrefix !== false && $hasPrefix !== 0) {
+                    $warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . $index->name . ' on table ' . $table->name;
+                }
+
+                $indexName = $hasPrefix === 0 ? substr($index->name, strlen('*dbprefix*')) : $index->name;
+                if (strlen($indexName) > 27) {
+                    $errors[] = 'Database schema error: Name of index ' . $index->name . ' on table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed';
+                }
+            }
+        }
+
+        return ['errors' => $errors, 'warnings' => $warnings];
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -35,13 +35,13 @@ 
 			throw new \RuntimeException("No app with given id <$appId> known.");
 		}
 
-		if (!file_exists($appPath . '/appinfo/database.xml')) {
+		if (!file_exists($appPath.'/appinfo/database.xml')) {
 			return ['errors' => [], 'warnings' => []];
 		}
 
 		libxml_use_internal_errors(true);
 		$loadEntities = libxml_disable_entity_loader(false);
-		$xml = simplexml_load_file($appPath . '/appinfo/database.xml');
+		$xml = simplexml_load_file($appPath.'/appinfo/database.xml');
 		libxml_disable_entity_loader($loadEntities);
 
 
@@ -50,15 +50,15 @@ 
 		foreach ($xml->table as $table) {
 			// Table names
 			if (strpos($table->name, '*dbprefix*') !== 0) {
-				$errors[] = 'Database schema error: name of table ' . $table->name . ' does not start with *dbprefix*';
+				$errors[] = 'Database schema error: name of table '.$table->name.' does not start with *dbprefix*';
 			}
 			$tableName = substr($table->name, strlen('*dbprefix*'));
 			if (strpos($tableName, '*dbprefix*') !== false) {
-				$warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . $table->name;
+				$warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table '.$table->name;
 			}
 
 			if (strlen($tableName) > 27) {
-				$errors[] = 'Database schema error: Name of table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
+				$errors[] = 'Database schema error: Name of table '.$table->name.' is too long ('.strlen($tableName).'), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
 			}
 
 			$hasAutoIncrement = false;
@@ -66,20 +66,20 @@ 
 			// Column names
 			foreach ($table->declaration->field as $column) {
 				if (strpos($column->name, '*dbprefix*') !== false) {
-					$warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . $column->name . ' on table ' . $table->name;
+					$warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column '.$column->name.' on table '.$table->name;
 				}
 
 				if (strlen($column->name) > 30) {
-					$errors[] = 'Database schema error: Name of column ' . $column->name . ' on table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
+					$errors[] = 'Database schema error: Name of column '.$column->name.' on table '.$table->name.' is too long ('.strlen($tableName).'), max. 30 characters allowed';
 				}
 
 				if ($column->autoincrement) {
 					if ($hasAutoIncrement) {
-						$errors[] = 'Database schema error: Table ' . $table->name . ' has multiple autoincrement columns';
+						$errors[] = 'Database schema error: Table '.$table->name.' has multiple autoincrement columns';
 					}
 
 					if (strlen($tableName) > 21) {
-						$errors[] = 'Database schema error: Name of table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
+						$errors[] = 'Database schema error: Name of table '.$table->name.' is too long ('.strlen($tableName).'), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
 					}
 
 					$hasAutoIncrement = true;
@@ -90,12 +90,12 @@ 
 			foreach ($table->declaration->index as $index) {
 				$hasPrefix = strpos($index->name, '*dbprefix*');
 				if ($hasPrefix !== false && $hasPrefix !== 0) {
-					$warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . $index->name . ' on table ' . $table->name;
+					$warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index '.$index->name.' on table '.$table->name;
 				}
 
 				$indexName = $hasPrefix === 0 ? substr($index->name, strlen('*dbprefix*')) : $index->name;
 				if (strlen($indexName) > 27) {
-					$errors[] = 'Database schema error: Name of index ' . $index->name . ' on table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed';
+					$errors[] = 'Database schema error: Name of index '.$index->name.' on table '.$table->name.' is too long ('.strlen($tableName).'), max. 27 characters + *dbprefix* allowed';
 				}
 			}
 		}

core/Command/App/CheckCode.php

Indentation +214 added lines, -214 removed lines

@@ -41,218 +41,218 @@
 
 class CheckCode extends Command implements CompletionAwareInterface  {
 
-	/** @var InfoParser */
-	private $infoParser;
-
-	protected $checkers = [
-		'private' => '\OC\App\CodeChecker\PrivateCheck',
-		'deprecation' => '\OC\App\CodeChecker\DeprecationCheck',
-		'strong-comparison' => '\OC\App\CodeChecker\StrongComparisonCheck',
-	];
-
-	public function __construct(InfoParser $infoParser) {
-		parent::__construct();
-		$this->infoParser = $infoParser;
-	}
-
-	protected function configure() {
-		$this
-			->setName('app:check-code')
-			->setDescription('check code to be compliant')
-			->addArgument(
-				'app-id',
-				InputArgument::REQUIRED,
-				'check the specified app'
-			)
-			->addOption(
-				'checker',
-				'c',
-				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
-				'enable the specified checker(s)',
-				[ 'private', 'deprecation', 'strong-comparison' ]
-			)
-			->addOption(
-				'--skip-checkers',
-				null,
-				InputOption::VALUE_NONE,
-				'skips the the code checkers to only check info.xml, language and database schema'
-			)
-			->addOption(
-				'--skip-validate-info',
-				null,
-				InputOption::VALUE_NONE,
-				'skips the info.xml/version check'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$appId = $input->getArgument('app-id');
-
-		$checkList = new EmptyCheck();
-		foreach ($input->getOption('checker') as $checker) {
-			if (!isset($this->checkers[$checker])) {
-				throw new \InvalidArgumentException('Invalid checker: '.$checker);
-			}
-			$checkerClass = $this->checkers[$checker];
-			$checkList = new $checkerClass($checkList);
-		}
-
-		$codeChecker = new CodeChecker($checkList);
-
-		$codeChecker->listen('CodeChecker', 'analyseFileBegin', function($params) use ($output) {
-			if(OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
-				$output->writeln("<info>Analysing {$params}</info>");
-			}
-		});
-		$codeChecker->listen('CodeChecker', 'analyseFileFinished', function($filename, $errors) use ($output) {
-			$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()) {
-				$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()) {
-				$output->writeln(" {$count} errors");
-			}
-			usort($errors, function($a, $b) {
-				return $a['line'] >$b['line'];
-			});
-
-			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')) {
-			$errors = $codeChecker->analyse($appId);
-		}
-
-		if(!$input->getOption('skip-validate-info')) {
-			$infoChecker = new InfoChecker($this->infoParser);
-
-			$infoChecker->listen('InfoChecker', 'mandatoryFieldMissing', function($key) use ($output) {
-				$output->writeln("<error>Mandatory field missing: $key</error>");
-			});
-
-			$infoChecker->listen('InfoChecker', 'deprecatedFieldFound', function($key, $value) use ($output) {
-				if($value === [] || is_null($value) || $value === '') {
-					$output->writeln("<info>Deprecated field available: $key</info>");
-				} else {
-					$output->writeln("<info>Deprecated field available: $key => $value</info>");
-				}
-			});
-
-			$infoChecker->listen('InfoChecker', 'missingRequirement', function($minMax) use ($output) {
-				$output->writeln("<comment>Nextcloud $minMax version requirement missing (will be an error in Nextcloud 12 and later)</comment>");
-			});
-
-			$infoChecker->listen('InfoChecker', 'duplicateRequirement', function($minMax) use ($output) {
-				$output->writeln("<error>Duplicate $minMax ownCloud version requirement found</error>");
-			});
-
-			$infoChecker->listen('InfoChecker', 'differentVersions', function($versionFile, $infoXML) use ($output) {
-				$output->writeln("<error>Different versions provided (appinfo/version: $versionFile - appinfo/info.xml: $infoXML)</error>");
-			});
-
-			$infoChecker->listen('InfoChecker', 'sameVersions', function($path) use ($output) {
-				$output->writeln("<info>Version file isn't needed anymore and can be safely removed ($path)</info>");
-			});
-
-			$infoChecker->listen('InfoChecker', 'migrateVersion', function($version) use ($output) {
-				$output->writeln("<info>Migrate the app version to appinfo/info.xml (add <version>$version</version> to appinfo/info.xml and remove appinfo/version)</info>");
-			});
-
-			if(OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
-				$infoChecker->listen('InfoChecker', 'mandatoryFieldFound', function($key, $value) use ($output) {
-					$output->writeln("<info>Mandatory field available: $key => $value</info>");
-				});
-
-				$infoChecker->listen('InfoChecker', 'optionalFieldFound', function($key, $value) use ($output) {
-					$output->writeln("<info>Optional field available: $key => $value</info>");
-				});
-
-				$infoChecker->listen('InfoChecker', 'unusedFieldFound', function($key, $value) use ($output) {
-					$output->writeln("<info>Unused field available: $key => $value</info>");
-				});
-			}
-
-			$infoErrors = $infoChecker->analyse($appId);
-
-			$errors = array_merge($errors, $infoErrors);
-
-			$languageParser = new LanguageParseChecker();
-			$languageErrors = $languageParser->analyse($appId);
-
-			foreach ($languageErrors as $languageError) {
-				$output->writeln("<error>$languageError</error>");
-			}
-
-			$errors = array_merge($errors, $languageErrors);
-
-			$databaseSchema = new DatabaseSchemaChecker();
-			$schemaErrors = $databaseSchema->analyse($appId);
-
-			foreach ($schemaErrors['errors'] as $schemaError) {
-				$output->writeln("<error>$schemaError</error>");
-			}
-			foreach ($schemaErrors['warnings'] as $schemaWarning) {
-				$output->writeln("<comment>$schemaWarning</comment>");
-			}
-
-			$errors = array_merge($errors, $schemaErrors['errors']);
-		}
-
-		$this->analyseUpdateFile($appId, $output);
-
-		if (empty($errors)) {
-			$output->writeln('<info>App is compliant - awesome job!</info>');
-			return 0;
-		} else {
-			$output->writeln('<error>App is not compliant</error>');
-			return 101;
-		}
-	}
-
-	/**
-	 * @param string $appId
-	 * @param $output
-	 */
-	private function analyseUpdateFile($appId, OutputInterface $output) {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
-
-		$updatePhp = $appPath . '/appinfo/update.php';
-		if (file_exists($updatePhp)) {
-			$output->writeln("<info>Deprecated file found: $updatePhp - please use repair steps</info>");
-		}
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'checker') {
-			return ['private', 'deprecation', 'strong-comparison'];
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app-id') {
-			return \OC_App::getAllApps();
-		}
-		return [];
-	}
+    /** @var InfoParser */
+    private $infoParser;
+
+    protected $checkers = [
+        'private' => '\OC\App\CodeChecker\PrivateCheck',
+        'deprecation' => '\OC\App\CodeChecker\DeprecationCheck',
+        'strong-comparison' => '\OC\App\CodeChecker\StrongComparisonCheck',
+    ];
+
+    public function __construct(InfoParser $infoParser) {
+        parent::__construct();
+        $this->infoParser = $infoParser;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('app:check-code')
+            ->setDescription('check code to be compliant')
+            ->addArgument(
+                'app-id',
+                InputArgument::REQUIRED,
+                'check the specified app'
+            )
+            ->addOption(
+                'checker',
+                'c',
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                'enable the specified checker(s)',
+                [ 'private', 'deprecation', 'strong-comparison' ]
+            )
+            ->addOption(
+                '--skip-checkers',
+                null,
+                InputOption::VALUE_NONE,
+                'skips the the code checkers to only check info.xml, language and database schema'
+            )
+            ->addOption(
+                '--skip-validate-info',
+                null,
+                InputOption::VALUE_NONE,
+                'skips the info.xml/version check'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $appId = $input->getArgument('app-id');
+
+        $checkList = new EmptyCheck();
+        foreach ($input->getOption('checker') as $checker) {
+            if (!isset($this->checkers[$checker])) {
+                throw new \InvalidArgumentException('Invalid checker: '.$checker);
+            }
+            $checkerClass = $this->checkers[$checker];
+            $checkList = new $checkerClass($checkList);
+        }
+
+        $codeChecker = new CodeChecker($checkList);
+
+        $codeChecker->listen('CodeChecker', 'analyseFileBegin', function($params) use ($output) {
+            if(OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+                $output->writeln("<info>Analysing {$params}</info>");
+            }
+        });
+        $codeChecker->listen('CodeChecker', 'analyseFileFinished', function($filename, $errors) use ($output) {
+            $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()) {
+                $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()) {
+                $output->writeln(" {$count} errors");
+            }
+            usort($errors, function($a, $b) {
+                return $a['line'] >$b['line'];
+            });
+
+            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')) {
+            $errors = $codeChecker->analyse($appId);
+        }
+
+        if(!$input->getOption('skip-validate-info')) {
+            $infoChecker = new InfoChecker($this->infoParser);
+
+            $infoChecker->listen('InfoChecker', 'mandatoryFieldMissing', function($key) use ($output) {
+                $output->writeln("<error>Mandatory field missing: $key</error>");
+            });
+
+            $infoChecker->listen('InfoChecker', 'deprecatedFieldFound', function($key, $value) use ($output) {
+                if($value === [] || is_null($value) || $value === '') {
+                    $output->writeln("<info>Deprecated field available: $key</info>");
+                } else {
+                    $output->writeln("<info>Deprecated field available: $key => $value</info>");
+                }
+            });
+
+            $infoChecker->listen('InfoChecker', 'missingRequirement', function($minMax) use ($output) {
+                $output->writeln("<comment>Nextcloud $minMax version requirement missing (will be an error in Nextcloud 12 and later)</comment>");
+            });
+
+            $infoChecker->listen('InfoChecker', 'duplicateRequirement', function($minMax) use ($output) {
+                $output->writeln("<error>Duplicate $minMax ownCloud version requirement found</error>");
+            });
+
+            $infoChecker->listen('InfoChecker', 'differentVersions', function($versionFile, $infoXML) use ($output) {
+                $output->writeln("<error>Different versions provided (appinfo/version: $versionFile - appinfo/info.xml: $infoXML)</error>");
+            });
+
+            $infoChecker->listen('InfoChecker', 'sameVersions', function($path) use ($output) {
+                $output->writeln("<info>Version file isn't needed anymore and can be safely removed ($path)</info>");
+            });
+
+            $infoChecker->listen('InfoChecker', 'migrateVersion', function($version) use ($output) {
+                $output->writeln("<info>Migrate the app version to appinfo/info.xml (add <version>$version</version> to appinfo/info.xml and remove appinfo/version)</info>");
+            });
+
+            if(OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+                $infoChecker->listen('InfoChecker', 'mandatoryFieldFound', function($key, $value) use ($output) {
+                    $output->writeln("<info>Mandatory field available: $key => $value</info>");
+                });
+
+                $infoChecker->listen('InfoChecker', 'optionalFieldFound', function($key, $value) use ($output) {
+                    $output->writeln("<info>Optional field available: $key => $value</info>");
+                });
+
+                $infoChecker->listen('InfoChecker', 'unusedFieldFound', function($key, $value) use ($output) {
+                    $output->writeln("<info>Unused field available: $key => $value</info>");
+                });
+            }
+
+            $infoErrors = $infoChecker->analyse($appId);
+
+            $errors = array_merge($errors, $infoErrors);
+
+            $languageParser = new LanguageParseChecker();
+            $languageErrors = $languageParser->analyse($appId);
+
+            foreach ($languageErrors as $languageError) {
+                $output->writeln("<error>$languageError</error>");
+            }
+
+            $errors = array_merge($errors, $languageErrors);
+
+            $databaseSchema = new DatabaseSchemaChecker();
+            $schemaErrors = $databaseSchema->analyse($appId);
+
+            foreach ($schemaErrors['errors'] as $schemaError) {
+                $output->writeln("<error>$schemaError</error>");
+            }
+            foreach ($schemaErrors['warnings'] as $schemaWarning) {
+                $output->writeln("<comment>$schemaWarning</comment>");
+            }
+
+            $errors = array_merge($errors, $schemaErrors['errors']);
+        }
+
+        $this->analyseUpdateFile($appId, $output);
+
+        if (empty($errors)) {
+            $output->writeln('<info>App is compliant - awesome job!</info>');
+            return 0;
+        } else {
+            $output->writeln('<error>App is not compliant</error>');
+            return 101;
+        }
+    }
+
+    /**
+     * @param string $appId
+     * @param $output
+     */
+    private function analyseUpdateFile($appId, OutputInterface $output) {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new \RuntimeException("No app with given id <$appId> known.");
+        }
+
+        $updatePhp = $appPath . '/appinfo/update.php';
+        if (file_exists($updatePhp)) {
+            $output->writeln("<info>Deprecated file found: $updatePhp - please use repair steps</info>");
+        }
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'checker') {
+            return ['private', 'deprecation', 'strong-comparison'];
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app-id') {
+            return \OC_App::getAllApps();
+        }
+        return [];
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -39,7 +39,7 @@ 
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class CheckCode extends Command implements CompletionAwareInterface  {
+class CheckCode extends Command implements CompletionAwareInterface {
 
 	/** @var InfoParser */
 	private $infoParser;
@@ -69,7 +69,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',
@@ -100,7 +100,7 @@ 
 		$codeChecker = new CodeChecker($checkList);
 
 		$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>");
 			}
 		});
@@ -108,29 +108,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')) {
 			$infoChecker = new InfoChecker($this->infoParser);
 
 			$infoChecker->listen('InfoChecker', 'mandatoryFieldMissing', function($key) use ($output) {
@@ -138,7 +138,7 @@ 
 			});
 
 			$infoChecker->listen('InfoChecker', 'deprecatedFieldFound', function($key, $value) use ($output) {
-				if($value === [] || is_null($value) || $value === '') {
+				if ($value === [] || is_null($value) || $value === '') {
 					$output->writeln("<info>Deprecated field available: $key</info>");
 				} else {
 					$output->writeln("<info>Deprecated field available: $key => $value</info>");
@@ -165,7 +165,7 @@ 
 				$output->writeln("<info>Migrate the app version to appinfo/info.xml (add <version>$version</version> to appinfo/info.xml and remove appinfo/version)</info>");
 			});
 
-			if(OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+			if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
 				$infoChecker->listen('InfoChecker', 'mandatoryFieldFound', function($key, $value) use ($output) {
 					$output->writeln("<info>Mandatory field available: $key => $value</info>");
 				});
@@ -226,7 +226,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>");
 		}