mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1824 from nextcloud/downstream-26423 

Ensure $commands being an array
This commit is contained in:
Morris Jobke 2016-10-20 20:43:26 +02:00 committed by GitHub
parent 98c8464564 ef842ef20a
commit c7ba73e6f4
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/App/DependencyAnalyzer.php
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) {

15
tests/lib/App/DependencyAnalyzerTest.php
View File

@ -256,17 +256,18 @@ class DependencyAnalyzerTest extends TestCase {
* @return array * @return array
*/ */
function providesCommands() { function providesCommands() {
return array( return [
array(array(), null), [[], null],
// grep is known on linux // grep is known on linux
array(array(), array(array('@attributes' => array('os' => 'Linux'), '@value' => 'grep'))), [[], [['@attributes' => ['os' => 'Linux'], '@value' => 'grep']]],
// grepp is not known on linux // grepp is not known on linux
array(array('The command line tool grepp could not be found'), array(array('@attributes' => array('os' => 'Linux'), '@value' => 'grepp'))), [['The command line tool grepp could not be found'], [['@attributes' => ['os' => 'Linux'], '@value' => 'grepp']]],
// we don't care about tools on Windows - we are on Linux // we don't care about tools on Windows - we are on Linux
array(array(), array(array('@attributes' => array('os' => 'Windows'), '@value' => 'grepp'))), [[], [['@attributes' => ['os' => 'Windows'], '@value' => 'grepp']]],
// grep is known on all systems // grep is known on all systems
array(array(), 'grep'), [[], 'grep'],
); [[], ['@attributes' => ['os' => 'Linux'], '@value' => 'grep']],
];
} }
/** /**