Browse Source

Use json_pretty as default for the config lists (for easier export/import)

tags/v8.2beta1
Joas Schilling 9 years ago
parent
commit
d5dcb60e5d
2 changed files with 5 additions and 6 deletions
  1. 3
    1
      core/command/base.php
  2. 2
    5
      core/command/config/listconfigs.php

+ 3
- 1
core/command/base.php View File

@@ -27,6 +27,8 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;

class Base extends Command {
protected $defaultOutputFormat = 'plain';

protected function configure() {
$this
->addOption(
@@ -34,7 +36,7 @@ class Base extends Command {
null,
InputOption::VALUE_OPTIONAL,
'Output format (plain, json or json_pretty, default is plain)',
'plain'
$this->defaultOutputFormat
)
;
}

+ 2
- 5
core/command/config/listconfigs.php View File

@@ -30,6 +30,8 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;

class ListConfigs extends Base {
protected $defaultOutputFormat = 'json_pretty';

/** @var array */
protected $sensitiveValues = [
'dbpassword',
@@ -81,11 +83,6 @@ class ListConfigs extends Base {
$app = $input->getArgument('app');
$noSensitiveValues = !$input->getOption('private');

if ($noSensitiveValues && !$input->hasParameterOption('--output')) {
// If you post this publicly we prefer the json format
$input->setOption('output', 'json_pretty');
}

switch ($app) {
case 'system':
$configs = [

Loading…
Cancel
Save