wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split the system from the app config

Browse source
This commit is contained in:
Joas Schilling 2015-05-08 09:58:47 +02:00
parent 16907f91ed
commit 5370bba0b6
2 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/command/config/listconfigs.php
View file

@ -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:

33
tests/core/command/config/listconfigstest.php
View file

@ -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