diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-12-05 22:18:24 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2016-12-05 22:18:24 +0100 |
| commit | 60d1e8e63e685a33697cccceb0517db8ca87644f (patch) | |
| tree | a26103bb8f72d21d3ad5b1766a3dd5ea8cb90952 | |
| parent | 7fe02702b0f5a47714e0ae507d6199d8dbd8f39c (diff) | |
| download | nextcloud-server-60d1e8e63e685a33697cccceb0517db8ca87644f.tar.gz nextcloud-server-60d1e8e63e685a33697cccceb0517db8ca87644f.zip | |
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 <lukas@statuscode.ch>
| -rw-r--r-- | core/Command/App/CheckCode.php | 2 | ||||
| -rw-r--r-- | 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("<comment>ownCloud $minMax version requirement missing (will be an error in ownCloud 11 and later)</comment>"); + $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) { 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']); } |