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

Invert the "public" to a "private" method

remotes/origin/handlebars-approach
Joas Schilling 2015-07-07 11:30:21 +07:00
parent e5bc9d0619
commit 85f012512e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/command/config/listconfigs.php
Unescape Escape View File

@ -69,17 +69,17 @@ class ListConfigs extends Base {
'all'
)
->addOption(
'public',
'private',
null,
InputOption::VALUE_NONE,
'Use this option when you want to exclude sensitive configs like passwords, salts, ...'
'Use this option when you want to include sensitive configs like passwords, salts, ...'
)
;
}
protected function execute(InputInterface $input, OutputInterface $output) {
$app = $input->getArgument('app');
$noSensitiveValues = $input->getOption('public');
$noSensitiveValues = !$input->getOption('private');
if ($noSensitiveValues && !$input->hasParameterOption('--output')) {
// If you post this publicly we prefer the json format

18
tests/core/command/config/listconfigstest.php
Unescape Escape View File

@ -78,7 +78,7 @@ class ListConfigsTest extends TestCase {
'global_cache_gc_lastrun' => '1430388388',
]],
],
true,
false,
json_encode([
'system' => [
'overwrite.cli.url' => 'http://localhost',
@ -113,7 +113,7 @@ class ListConfigsTest extends TestCase {
'global_cache_gc_lastrun' => '1430388388',
]],
],
false,
true,
json_encode([
'system' => [
'secret' => 'my secret',
@ -149,7 +149,7 @@ class ListConfigsTest extends TestCase {
'global_cache_gc_lastrun' => '1430388388',
]],
],
true,
false,
json_encode([
'system' => [
'overwrite.cli.url' => 'http://localhost',
@ -176,7 +176,7 @@ class ListConfigsTest extends TestCase {
'global_cache_gc_lastrun' => '1430388388',
]],
],
false,
true,
json_encode([
'system' => [
'secret' => 'my secret',
@ -204,7 +204,7 @@ class ListConfigsTest extends TestCase {
'global_cache_gc_lastrun' => '1430388388',
]],
],
true,
false,
json_encode([
'apps' => [
'files' => [
@ -233,7 +233,7 @@ class ListConfigsTest extends TestCase {
'global_cache_gc_lastrun' => '1430388388',
]],
],
false,
true,
json_encode([
'apps' => [
'files' => [
@ -252,10 +252,10 @@ class ListConfigsTest extends TestCase {
* @param array $systemConfigs
* @param array $systemConfigMap
* @param array $appConfig
* @param bool $public
* @param bool $private
* @param string $expected
*/
public function testList($app, $systemConfigs, $systemConfigMap, $appConfig, $public, $expected) {
public function testList($app, $systemConfigs, $systemConfigMap, $appConfig, $private, $expected) {
$this->systemConfig->expects($this->any())
->method('getKeys')
->willReturn($systemConfigs);
@ -279,7 +279,7 @@ class ListConfigsTest extends TestCase {
->method('getOption')
->willReturnMap([
['output', 'json'],
['public', $public],
['private', $private],
]);
global $output;