Do not allow two different version requirements
This commit is contained in:
parent
113f9f80f3
commit
fe04451cb1
|
@ -131,6 +131,10 @@ class CheckCode extends Command {
|
|||
}
|
||||
});
|
||||
|
||||
$infoChecker->listen('InfoChecker', 'duplicateRequirement', function($minMax) use ($output) {
|
||||
$output->writeln("<error>Duplicate $minMax ownCloud version requirement found</error>");
|
||||
});
|
||||
|
||||
$infoChecker->listen('InfoChecker', 'differentVersions', function($versionFile, $infoXML) use ($output) {
|
||||
$output->writeln("<error>Different versions provided (appinfo/version: $versionFile - appinfo/info.xml: $infoXML)</error>");
|
||||
});
|
||||
|
|
|
@ -77,6 +77,21 @@ class InfoChecker extends BasicEmitter {
|
|||
|
||||
$info = $this->infoParser->parse($appPath . '/appinfo/info.xml');
|
||||
|
||||
if (isset($info['dependencies']['owncloud']['@attributes']['min-version']) && ($info['requiremin'] || $info['require'])) {
|
||||
$this->emit('InfoChecker', 'duplicateRequirement', ['min']);
|
||||
$errors[] = [
|
||||
'type' => 'duplicateRequirement',
|
||||
'field' => 'min',
|
||||
];
|
||||
}
|
||||
if (isset($info['dependencies']['owncloud']['@attributes']['max-version']) && $info['requiremax']) {
|
||||
$this->emit('InfoChecker', 'duplicateRequirement', ['max']);
|
||||
$errors[] = [
|
||||
'type' => 'duplicateRequirement',
|
||||
'field' => 'max',
|
||||
];
|
||||
}
|
||||
|
||||
foreach ($info as $key => $value) {
|
||||
if(is_array($value)) {
|
||||
$value = json_encode($value);
|
||||
|
|
Loading…
Reference in New Issue