From c55da1fc8d6f3487d89be1ad197a9f54c5e930b8 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 7 Jan 2016 15:04:36 +0100 Subject: [PATCH] Add a warning to the app:check-code if the version is missing --- core/command/app/checkcode.php | 4 ++++ lib/private/app/codechecker/infochecker.php | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/core/command/app/checkcode.php b/core/command/app/checkcode.php index e186d458c0..bc3ae07890 100644 --- a/core/command/app/checkcode.php +++ b/core/command/app/checkcode.php @@ -131,6 +131,10 @@ class CheckCode extends Command { } }); + $infoChecker->listen('InfoChecker', 'missingRequirement', function($minMax) use ($output) { + $output->writeln("ownCloud $minMax version requirement missing (will be an error in ownCloud 11 and later)"); + }); + $infoChecker->listen('InfoChecker', 'duplicateRequirement', function($minMax) use ($output) { $output->writeln("Duplicate $minMax ownCloud version requirement found"); }); diff --git a/lib/private/app/codechecker/infochecker.php b/lib/private/app/codechecker/infochecker.php index 24835d8148..2589277118 100644 --- a/lib/private/app/codechecker/infochecker.php +++ b/lib/private/app/codechecker/infochecker.php @@ -83,13 +83,18 @@ class InfoChecker extends BasicEmitter { 'type' => 'duplicateRequirement', 'field' => 'min', ]; + } else if (!isset($info['dependencies']['owncloud']['@attributes']['min-version'])) { + $this->emit('InfoChecker', 'missingRequirement', ['min']); } + if (isset($info['dependencies']['owncloud']['@attributes']['max-version']) && $info['requiremax']) { $this->emit('InfoChecker', 'duplicateRequirement', ['max']); $errors[] = [ 'type' => 'duplicateRequirement', 'field' => 'max', ]; + } else if (!isset($info['dependencies']['owncloud']['@attributes']['max-version'])) { + $this->emit('InfoChecker', 'missingRequirement', ['max']); } foreach ($info as $key => $value) {