From 60d1e8e63e685a33697cccceb0517db8ca87644f Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 5 Dec 2016 22:18:24 +0100 Subject: Check for nextcloud version as well The code checker didn't consider the "nextcloud" version before, resulting in fails such as https://travis-ci.org/nextcloud/richdocuments/jobs/181470760#L415-L416 Signed-off-by: Lukas Reschke --- core/Command/App/CheckCode.php | 2 +- lib/private/App/CodeChecker/InfoChecker.php | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core/Command/App/CheckCode.php b/core/Command/App/CheckCode.php index bd1bac247a2..aa618b26cec 100644 --- a/core/Command/App/CheckCode.php +++ b/core/Command/App/CheckCode.php @@ -135,7 +135,7 @@ class CheckCode extends Command implements CompletionAwareInterface { }); $infoChecker->listen('InfoChecker', 'missingRequirement', function($minMax) use ($output) { - $output->writeln("ownCloud $minMax version requirement missing (will be an error in ownCloud 11 and later)"); + $output->writeln("Nextcloud $minMax version requirement missing (will be an error in Nextcloud 12 and later)"); }); $infoChecker->listen('InfoChecker', 'duplicateRequirement', function($minMax) use ($output) { diff --git a/lib/private/App/CodeChecker/InfoChecker.php b/lib/private/App/CodeChecker/InfoChecker.php index 77bf7e8182d..1e617e3aeec 100644 --- a/lib/private/App/CodeChecker/InfoChecker.php +++ b/lib/private/App/CodeChecker/InfoChecker.php @@ -86,7 +86,10 @@ class InfoChecker extends BasicEmitter { 'type' => 'duplicateRequirement', 'field' => 'min', ]; - } else if (!isset($info['dependencies']['owncloud']['@attributes']['min-version'])) { + } else if ( + !isset($info['dependencies']['owncloud']['@attributes']['min-version']) && + !isset($info['dependencies']['nextcloud']['@attributes']['min-version']) + ) { $this->emit('InfoChecker', 'missingRequirement', ['min']); } @@ -96,7 +99,10 @@ class InfoChecker extends BasicEmitter { 'type' => 'duplicateRequirement', 'field' => 'max', ]; - } else if (!isset($info['dependencies']['owncloud']['@attributes']['max-version'])) { + } else if ( + !isset($info['dependencies']['owncloud']['@attributes']['max-version']) && + !isset($info['dependencies']['nextcloud']['@attributes']['max-version']) + ) { $this->emit('InfoChecker', 'missingRequirement', ['max']); } -- cgit v1.2.3