diff --git a/core/Command/App/CheckCode.php b/core/Command/App/CheckCode.php index bd1bac247a..aa618b26ce 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 77bf7e8182..1e617e3aee 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']); }