wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #16067 from owncloud/verbosity-in-app-code-check

Browse source 
Add verbosity option to app:check-code
This commit is contained in:
Lukas Reschke 2015-05-06 11:21:23 +02:00
commit 9a159372cb
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/command/app/checkcode.php
View file

@ -43,16 +43,27 @@ class CheckCode extends Command {
$appId = $input->getArgument('app-id');
$codeChecker = new \OC\App\CodeChecker();
$codeChecker->listen('CodeChecker', 'analyseFileBegin', function($params) use ($output) {
$output->writeln("<info>Analysing {$params}</info>");
if(OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
$output->writeln("<info>Analysing {$params}</info>");
}
});
$codeChecker->listen('CodeChecker', 'analyseFileFinished', function($params) use ($output) {
$count = count($params);
$output->writeln(" {$count} errors");
usort($params, function($a, $b) {
$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 errros 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($params as $p) {
foreach($errors as $p) {
$line = sprintf("%' 4d", $p['line']);
$output->writeln(" <error>line $line: {$p['disallowedToken']} - {$p['reason']}</error>");
}

2
lib/private/app/codechecker.php
View file

@ -119,7 +119,7 @@ class CodeChecker extends BasicEmitter {
/** @var SplFileInfo $file */
$this->emit('CodeChecker', 'analyseFileBegin', [$file->getPathname()]);
$fileErrors = $this->analyseFile($file);
$this->emit('CodeChecker', 'analyseFileFinished', [$fileErrors]);
$this->emit('CodeChecker', 'analyseFileFinished', [$file->getPathname(), $fileErrors]);
$errors = array_merge($fileErrors, $errors);
}