diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2015-05-08 09:58:47 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-07-07 11:18:24 +0200 |
| commit | 5370bba0b69aaba94567604ab99661a528d5b052 (patch) | |
| tree | 37eddd163685f3fc8b2374494d195fd061044cd2 | |
| parent | 16907f91ed6f8193f487f7ce602632dc905332cb (diff) | |
| download | nextcloud-server-5370bba0b69aaba94567604ab99661a528d5b052.tar.gz nextcloud-server-5370bba0b69aaba94567604ab99661a528d5b052.zip | |
Split the system from the app config
| -rw-r--r-- | core/command/config/listconfigs.php | 8 | ||||
| -rw-r--r-- | tests/core/command/config/listconfigstest.php | 33 |
2 files changed, 23 insertions, 18 deletions
diff --git a/core/command/config/listconfigs.php b/core/command/config/listconfigs.php index aa95402080c..c139a40e269 100644 --- a/core/command/config/listconfigs.php +++ b/core/command/config/listconfigs.php @@ -93,11 +93,13 @@ class ListConfigs extends Base { case 'all': $apps = $this->appConfig->getApps(); - $configs = []; + $configs = [ + 'system' => $this->getSystemConfigs($noSensitiveValues), + 'apps' => [], + ]; foreach ($apps as $appName) { - $configs[$appName] = $this->appConfig->getValues($appName, false); + $configs['apps'][$appName] = $this->appConfig->getValues($appName, false); } - $configs['system'] = $this->getSystemConfigs($noSensitiveValues); break; default: diff --git a/tests/core/command/config/listconfigstest.php b/tests/core/command/config/listconfigstest.php index 2d65e957621..4ea4a92cf81 100644 --- a/tests/core/command/config/listconfigstest.php +++ b/tests/core/command/config/listconfigstest.php @@ -23,7 +23,6 @@ namespace Tests\Core\Command\Config; use OC\Core\Command\Config\ListConfigs; -use OC\Core\Command\Config\NoValue; use Test\TestCase; class ListConfigsTest extends TestCase { @@ -58,7 +57,7 @@ class ListConfigsTest extends TestCase { } - public function dataDisable() { + public function listData() { return [ [ 'all', @@ -82,15 +81,17 @@ class ListConfigsTest extends TestCase { ], true, json_encode([ - 'core' => [ - 'global_cache_gc_lastrun' => '1430388388', - ], - 'files' => [ - 'enabled' => 'yes', - ], 'system' => [ 'overwrite.cli.url' => 'http://localhost', ], + 'apps' => [ + 'core' => [ + 'global_cache_gc_lastrun' => '1430388388', + ], + 'files' => [ + 'enabled' => 'yes', + ], + ], ]), ], [ @@ -115,16 +116,18 @@ class ListConfigsTest extends TestCase { ], false, json_encode([ - 'core' => [ - 'global_cache_gc_lastrun' => '1430388388', - ], - 'files' => [ - 'enabled' => 'yes', - ], 'system' => [ 'secret' => 'my secret', 'overwrite.cli.url' => 'http://localhost', ], + 'apps' => [ + 'core' => [ + 'global_cache_gc_lastrun' => '1430388388', + ], + 'files' => [ + 'enabled' => 'yes', + ], + ], ]), ], [ @@ -232,7 +235,7 @@ class ListConfigsTest extends TestCase { } /** - * @dataProvider dataDisable + * @dataProvider listData * * @param string $app * @param array $systemConfigs |