no nested xml tags on dependencies
This commit is contained in:
parent
eb81c52b95
commit
b55ac514ac
|
@ -65,11 +65,11 @@ class DependencyAnalyzer {
|
|||
}
|
||||
|
||||
private function analyseSupportedDatabases() {
|
||||
if (!isset($this->dependencies['databases'])) {
|
||||
if (!isset($this->dependencies['database'])) {
|
||||
return;
|
||||
}
|
||||
|
||||
$supportedDatabases = $this->dependencies['databases'];
|
||||
$supportedDatabases = $this->dependencies['database'];
|
||||
if (empty($supportedDatabases)) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -23,16 +23,14 @@
|
|||
"max-version": "5.5"
|
||||
}
|
||||
},
|
||||
"databases": {
|
||||
"database": [
|
||||
{
|
||||
"@attributes" : {
|
||||
"min-version": "3.0"
|
||||
},
|
||||
"@value": "sqlite"},
|
||||
"mysql"
|
||||
]
|
||||
},
|
||||
"database": [
|
||||
{
|
||||
"@attributes" : {
|
||||
"min-version": "3.0"
|
||||
},
|
||||
"@value": "sqlite"},
|
||||
"mysql"
|
||||
],
|
||||
"command": [
|
||||
{
|
||||
"@attributes" : {
|
||||
|
|
|
@ -21,10 +21,8 @@
|
|||
<ocsid>166047</ocsid>
|
||||
<dependencies>
|
||||
<php min-version="5.4" max-version="5.5"/>
|
||||
<databases>
|
||||
<database min-version="3.0">sqlite</database>
|
||||
<database>mysql</database>
|
||||
</databases>
|
||||
<database min-version="3.0">sqlite</database>
|
||||
<database>mysql</database>
|
||||
<command os="linux">grep</command>
|
||||
<command os="windows">notepad.exe</command>
|
||||
</dependencies>
|
||||
|
|
|
@ -77,7 +77,7 @@ class DependencyAnalyzer extends \PHPUnit_Framework_TestCase {
|
|||
)
|
||||
);
|
||||
if (!is_null($databases)) {
|
||||
$app['dependencies']['databases'] = $databases;
|
||||
$app['dependencies']['database'] = $databases;
|
||||
}
|
||||
$analyser = new \OC\App\DependencyAnalyzer($app, $this->platformMock, $this->l10nMock);
|
||||
$missing = $analyser->analyze();
|
||||
|
|
Loading…
Reference in New Issue