-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Check language files and database schema with app code checker #4767
Changes from 7 commits
93fc7fc
31bb65f
8e757b3
1951c88
3571355
7ec5847
f920dfe
6dea5e6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
#!/usr/bin/env bash | ||
# | ||
RESULT=0 | ||
|
||
bash ./build/autoloaderchecker.sh | ||
RESULT=$(($RESULT+$?)) | ||
bash ./build/mergejschecker.sh | ||
RESULT=$(($RESULT+$?)) | ||
php ./build/translation-checker.php | ||
RESULT=$(($RESULT+$?)) | ||
php ./build/htaccess-checker.php | ||
RESULT=$(($RESULT+$?)) | ||
|
||
|
||
for app in $(find "apps/" -mindepth 1 -maxdepth 1 -type d -printf '%f\n'); do | ||
if | ||
[ "$app" == "dav" ] || \ | ||
[ "$app" == "encryption" ] || \ | ||
[ "$app" == "federatedfilesharing" ] || \ | ||
[ "$app" == "files" ] || \ | ||
[ "$app" == "files_external" ] || \ | ||
[ "$app" == "files_sharing" ] || \ | ||
[ "$app" == "files_trashbin" ] || \ | ||
[ "$app" == "files_versions" ] || \ | ||
[ "$app" == "lookup_server_connector" ] || \ | ||
[ "$app" == "provisioning_api" ] || \ | ||
[ "$app" == "testing" ] || \ | ||
[ "$app" == "twofactor_backupcodes" ] || \ | ||
[ "$app" == "updatenotification" ] || \ | ||
[ "$app" == "user_ldap" ] | ||
then | ||
./occ app:check-code --skip-checkers "$app" | ||
else | ||
./occ app:check-code "$app" | ||
fi | ||
RESULT=$(($RESULT+$?)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is not really helpful, because the log doesn't show what is the cause for the failure 🙈 |
||
done; | ||
|
||
php ./build/signed-off-checker.php | ||
RESULT=$(($RESULT+$?)) | ||
|
||
exit $RESULT |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,8 +26,10 @@ | |
namespace OC\Core\Command\App; | ||
|
||
use OC\App\CodeChecker\CodeChecker; | ||
use OC\App\CodeChecker\DatabaseSchemaChecker; | ||
use OC\App\CodeChecker\EmptyCheck; | ||
use OC\App\CodeChecker\InfoChecker; | ||
use OC\App\CodeChecker\LanguageParseChecker; | ||
use OC\App\InfoParser; | ||
use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface; | ||
use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext; | ||
|
@@ -69,6 +71,12 @@ protected function configure() { | |
'enable the specified checker(s)', | ||
[ 'private', 'deprecation', 'strong-comparison' ] | ||
) | ||
->addOption( | ||
'--skip-checkers', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice that you added this, but it isn't evaluated in the code below 🙈 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I fixed this. |
||
null, | ||
InputOption::VALUE_NONE, | ||
'skips the the code checkers to only check info.xml, language and database schema' | ||
) | ||
->addOption( | ||
'--skip-validate-info', | ||
null, | ||
|
@@ -171,6 +179,27 @@ protected function execute(InputInterface $input, OutputInterface $output) { | |
$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); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
<?php | ||
/** | ||
* @copyright Copyright (c) 2017, Joas Schilling <[email protected]> | ||
* | ||
* @author Joas Schilling <[email protected]> | ||
* | ||
* @license GNU AGPL version 3 or any later version | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as | ||
* published by the Free Software Foundation, either version 3 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
*/ | ||
|
||
namespace OC\App\CodeChecker; | ||
|
||
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]; | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
<?php | ||
/** | ||
* @copyright Copyright (c) 2017, Joas Schilling <[email protected]> | ||
* | ||
* @author Joas Schilling <[email protected]> | ||
* | ||
* @license GNU AGPL version 3 or any later version | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as | ||
* published by the Free Software Foundation, either version 3 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
*/ | ||
|
||
namespace OC\App\CodeChecker; | ||
|
||
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; | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why a single job?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it was before, but now devs can run this job in a simple fashion aswell