Commit b55ac514 authored by Thomas Müller's avatar Thomas Müller
Browse files

no nested xml tags on dependencies

parent eb81c52b
...@@ -65,11 +65,11 @@ class DependencyAnalyzer { ...@@ -65,11 +65,11 @@ class DependencyAnalyzer {
} }
private function analyseSupportedDatabases() { private function analyseSupportedDatabases() {
if (!isset($this->dependencies['databases'])) { if (!isset($this->dependencies['database'])) {
return; return;
} }
$supportedDatabases = $this->dependencies['databases']; $supportedDatabases = $this->dependencies['database'];
if (empty($supportedDatabases)) { if (empty($supportedDatabases)) {
return; return;
} }
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
"max-version": "5.5" "max-version": "5.5"
} }
}, },
"databases": {
"database": [ "database": [
{ {
"@attributes" : { "@attributes" : {
...@@ -31,8 +30,7 @@ ...@@ -31,8 +30,7 @@
}, },
"@value": "sqlite"}, "@value": "sqlite"},
"mysql" "mysql"
] ],
},
"command": [ "command": [
{ {
"@attributes" : { "@attributes" : {
......
...@@ -21,10 +21,8 @@ ...@@ -21,10 +21,8 @@
<ocsid>166047</ocsid> <ocsid>166047</ocsid>
<dependencies> <dependencies>
<php min-version="5.4" max-version="5.5"/> <php min-version="5.4" max-version="5.5"/>
<databases>
<database min-version="3.0">sqlite</database> <database min-version="3.0">sqlite</database>
<database>mysql</database> <database>mysql</database>
</databases>
<command os="linux">grep</command> <command os="linux">grep</command>
<command os="windows">notepad.exe</command> <command os="windows">notepad.exe</command>
</dependencies> </dependencies>
......
...@@ -77,7 +77,7 @@ class DependencyAnalyzer extends \PHPUnit_Framework_TestCase { ...@@ -77,7 +77,7 @@ class DependencyAnalyzer extends \PHPUnit_Framework_TestCase {
) )
); );
if (!is_null($databases)) { if (!is_null($databases)) {
$app['dependencies']['databases'] = $databases; $app['dependencies']['database'] = $databases;
} }
$analyser = new \OC\App\DependencyAnalyzer($app, $this->platformMock, $this->l10nMock); $analyser = new \OC\App\DependencyAnalyzer($app, $this->platformMock, $this->l10nMock);
$missing = $analyser->analyze(); $missing = $analyser->analyze();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment