summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-11 14:31:47 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-11 14:31:47 +0100
commitdfe267424ffbecaef7edff20d1977532de7a5702 (patch)
treeb3369629b62e75ce3da091fad66b1338664015b3 /lib
parent207c1a661b67e7b3669937109742970be1765cb0 (diff)
parent8cfdc62eaed5f80d92e7185ead451acb691a1b67 (diff)
downloadnextcloud-server-dfe267424ffbecaef7edff20d1977532de7a5702.tar.gz
nextcloud-server-dfe267424ffbecaef7edff20d1977532de7a5702.zip
Merge pull request #22315 from owncloud/update-info-checker-requirements
Update info checker requirements
Diffstat (limited to 'lib')
-rw-r--r--lib/private/app/codechecker/infochecker.php17
1 files changed, 5 insertions, 12 deletions
diff --git a/lib/private/app/codechecker/infochecker.php b/lib/private/app/codechecker/infochecker.php
index ac92ee2661c..812007d8839 100644
--- a/lib/private/app/codechecker/infochecker.php
+++ b/lib/private/app/codechecker/infochecker.php
@@ -41,21 +41,22 @@ class InfoChecker extends BasicEmitter {
'bugs',
'category',
'default_enable',
- 'dependencies',
+ 'dependencies', // TODO: Mandatory as of ownCloud 11
'documentation',
'namespace',
'ocsid',
'public',
'remote',
'repository',
- 'require',
- 'requiremin',
'types',
'version',
'website',
];
private $deprecatedFields = [
'info',
+ 'require',
+ 'requiremax',
+ 'requiremin',
'shipped',
'standalone',
];
@@ -137,7 +138,7 @@ class InfoChecker extends BasicEmitter {
$versionFile = $appPath . '/appinfo/version';
if (is_file($versionFile)) {
$version = trim(file_get_contents($versionFile));
- if(isset($info['version'])) {
+ if (isset($info['version'])) {
if($info['version'] !== $version) {
$this->emit('InfoChecker', 'differentVersions',
[$version, $info['version']]);
@@ -152,14 +153,6 @@ class InfoChecker extends BasicEmitter {
} else {
$this->emit('InfoChecker', 'migrateVersion', [$version]);
}
- } else {
- if(!isset($info['version'])) {
- $this->emit('InfoChecker', 'mandatoryFieldMissing', ['version']);
- $errors[] = [
- 'type' => 'mandatoryFieldMissing',
- 'field' => 'version',
- ];
- }
}
return $errors;