From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 9 Apr 2015 12:42:44 +0000 (+0200)
Subject: Replace print_r() with pretty json
X-Git-Tag: v8.1.0alpha1~50^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=def3b687ee9881d9842c5e916c2a4fb405f88925;p=nextcloud-server.git

Replace print_r() with pretty json
---

diff --git a/core/command/base.php b/core/command/base.php
index 7e139636b63..b43022a550c 100644
--- a/core/command/base.php
+++ b/core/command/base.php
@@ -33,22 +33,19 @@ class Base extends Command {
 				'output',
 				null,
 				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, print or json, default is plain)',
+				'Output format (plain, json or json_pretty, default is plain)',
 				'plain'
 			)
 		;
 	}
 
 	protected function writeArrayInOutputFormat(InputInterface $input, OutputInterface $output, $items) {
-		$outputFormat = $input->getOption('output');
-		switch ($outputFormat) {
+		switch ($input->getOption('output')) {
 			case 'json':
-			case 'print':
-				if ($outputFormat === 'json') {
-					$output->writeln(json_encode($items));
-				} else {
-					print_r($items);
-				}
+				$output->writeln(json_encode($items));
+				break;
+			case 'json_pretty':
+				$output->writeln(json_encode($items, JSON_PRETTY_PRINT));
 				break;
 			default:
 				foreach ($items as $key => $item) {