diff --git a/lib/private/app/codechecker/infochecker.php b/lib/private/app/codechecker/infochecker.php index ac92ee2661..812007d883 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; diff --git a/tests/lib/app/codechecker/infocheckertest.php b/tests/lib/app/codechecker/infocheckertest.php index 59c1316b76..b31c5fe3a7 100644 --- a/tests/lib/app/codechecker/infocheckertest.php +++ b/tests/lib/app/codechecker/infocheckertest.php @@ -54,7 +54,7 @@ class InfoCheckerTest extends TestCase { ['testapp-version', []], ['testapp-infoxml-version', []], ['testapp-infoxml-version-different', [['type' => 'differentVersions', 'message' => 'appinfo/version: 1.2.4 - appinfo/info.xml: 1.2.3']]], - ['testapp-version-missing', [['type' => 'mandatoryFieldMissing', 'field' => 'version']]], + ['testapp-version-missing', []], ['testapp-name-missing', [['type' => 'mandatoryFieldMissing', 'field' => 'name']]], ]; }