sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure $commands being an array - fixes #26073

pull/1824/head
Thomas Müller 2016-10-19 23:17:39 +07:00 committed by Morris Jobke
parent 7836a8d8c7
commit ef842ef20a
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/App/DependencyAnalyzer.php
Unescape Escape View File

@ -197,6 +197,9 @@ class DependencyAnalyzer {
if (!is_array($commands)) { if (!is_array($commands)) {
$commands = array($commands); $commands = array($commands);
} }
if (isset($commands['@value'])) {
$commands = [$commands];
}
$os = $this->platform->getOS(); $os = $this->platform->getOS();
foreach ($commands as $command) { foreach ($commands as $command) {
if (isset($command['@attributes']['os']) && $command['@attributes']['os'] !== $os) { if (isset($command['@attributes']['os']) && $command['@attributes']['os'] !== $os) {

1
tests/lib/App/DependencyAnalyzerTest.php
Unescape Escape View File

@ -266,6 +266,7 @@ class DependencyAnalyzerTest extends TestCase {
[[], [['@attributes' => ['os' => 'Windows'], '@value' => 'grepp']]], [[], [['@attributes' => ['os' => 'Windows'], '@value' => 'grepp']]],
// grep is known on all systems // grep is known on all systems
[[], 'grep'], [[], 'grep'],
[[], ['@attributes' => ['os' => 'Linux'], '@value' => 'grep']],
]; ];
} }