Split the system from the app config

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:

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