From 6ed8ba0ce9f1d4ac68d6a2e53f4e0845ef8abcc5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 30 Apr 2015 15:42:18 +0200
Subject: [PATCH] Fix nested array lists
---
core/command/base.php | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/core/command/base.php b/core/command/base.php
index f84dcb1aea..f36e00b6db 100644
--- a/core/command/base.php
+++ b/core/command/base.php
@@ -44,7 +44,7 @@ class Base extends Command {
* @param OutputInterface $output
* @param array $items
*/
- protected function writeArrayInOutputFormat(InputInterface $input, OutputInterface $output, $items) {
+ protected function writeArrayInOutputFormat(InputInterface $input, OutputInterface $output, $items, $prefix = ' - ') {
switch ($input->getOption('output')) {
case 'json':
$output->writeln(json_encode($items));
@@ -54,15 +54,20 @@ class Base extends Command {
break;
default:
foreach ($items as $key => $item) {
+ if (is_array($item)) {
+ $output->writeln($prefix . $key . ':');
+ $this->writeArrayInOutputFormat($input, $output, $item, ' ' . $prefix);
+ continue;
+ }
if (!is_int($key)) {
$value = $this->valueToString($item);
if (!is_null($value)) {
- $output->writeln(' - ' . $key . ': ' . $value);
+ $output->writeln($prefix . $key . ': ' . $value);
} else {
- $output->writeln(' - ' . $key);
+ $output->writeln($prefix . $key);
}
} else {
- $output->writeln(' - ' . $this->valueToString($item));
+ $output->writeln($prefix . $this->valueToString($item));
}
}
break;
--
GitLab