Merge pull request #2520 from nextcloud/replace-string

Check for nextcloud version as well
nextcloud · Dec 5, 2016 · 572b078 · 572b078
2 parents a89b033 + 60d1e8e
commit 572b078
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/core/Command/App/CheckCode.php b/core/Command/App/CheckCode.php
@@ -135,7 +135,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			});
 
 			$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
@@ -86,7 +86,10 @@ public function analyse($appId) {
 				'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 @@ public function analyse($appId) {
 				'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']);
 		}