Merge pull request #2520 from nextcloud/replace-string
Check for nextcloud version as well
This commit is contained in:
commit
572b078de7
|
@ -135,7 +135,7 @@ class CheckCode extends Command implements CompletionAwareInterface {
|
||||||
});
|
});
|
||||||
|
|
||||||
$infoChecker->listen('InfoChecker', 'missingRequirement', function($minMax) use ($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) {
|
$infoChecker->listen('InfoChecker', 'duplicateRequirement', function($minMax) use ($output) {
|
||||||
|
|
|
@ -86,7 +86,10 @@ class InfoChecker extends BasicEmitter {
|
||||||
'type' => 'duplicateRequirement',
|
'type' => 'duplicateRequirement',
|
||||||
'field' => 'min',
|
'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']);
|
$this->emit('InfoChecker', 'missingRequirement', ['min']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -96,7 +99,10 @@ class InfoChecker extends BasicEmitter {
|
||||||
'type' => 'duplicateRequirement',
|
'type' => 'duplicateRequirement',
|
||||||
'field' => 'max',
|
'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']);
|
$this->emit('InfoChecker', 'missingRequirement', ['max']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue