diff --git a/lib/private/Config.php b/lib/private/Config.php index ec380aedc5d0b..1a8337907f125 100644 --- a/lib/private/Config.php +++ b/lib/private/Config.php @@ -16,6 +16,23 @@ */ class Config { public const ENV_PREFIX = 'NC_'; + public const CONF_WARNING = " +/* + * WARNING + * + * This file gets modified by automatic processes and all lines that are not + * active code (ie. comments) are lost during that process. + * + * If you want to document things with comments or use constants add your settings + * in a '.config.php' file which will be included and rendered into this file. + * + * Example: + * cache), true); $content .= ";\n"; diff --git a/tests/lib/ConfigTest.php b/tests/lib/ConfigTest.php index b2a52dbd6a449..f4177fb19129c 100644 --- a/tests/lib/ConfigTest.php +++ b/tests/lib/ConfigTest.php @@ -97,7 +97,9 @@ public function testSetValue(): void { $this->assertSame('moo', $config->getValue('foo')); $content = file_get_contents($this->configFile); - $expected = " 'moo',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " + $expected = " 'moo',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " . " 1 => 'Guinness',\n 2 => 'Kölsch',\n ),\n 'alcohol_free' => false,\n);\n"; $this->assertEquals($expected, $content); @@ -108,7 +110,9 @@ public function testSetValue(): void { $content = file_get_contents($this->configFile); - $expected = " 'moo',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " + $expected = " 'moo',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " . " 1 => 'Guinness',\n 2 => 'Kölsch',\n ),\n 'alcohol_free' => false,\n 'bar' => 'red',\n 'apps' => \n " . " array (\n 0 => 'files',\n 1 => 'gallery',\n ),\n);\n"; $this->assertEquals($expected, $content); @@ -139,7 +143,9 @@ public function testSetValues(): void { $this->assertSame(null, $config->getValue('not_exists')); $content = file_get_contents($this->configFile); - $expected = " 'moo',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " + $expected = " 'moo',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " . " 1 => 'Guinness',\n 2 => 'Kölsch',\n ),\n);\n"; $this->assertEquals($expected, $content); } @@ -150,7 +156,9 @@ public function testDeleteKey(): void { $this->assertSame('this_was_clearly_not_set_before', $config->getValue('foo', 'this_was_clearly_not_set_before')); $content = file_get_contents($this->configFile); - $expected = " \n array (\n 0 => 'Appenzeller',\n " + $expected = " \n array (\n 0 => 'Appenzeller',\n " . " 1 => 'Guinness',\n 2 => 'Kölsch',\n ),\n 'alcohol_free' => false,\n);\n"; $this->assertEquals($expected, $content); } @@ -170,7 +178,9 @@ public function testConfigMerge(): void { // Write a new value to the config $config->setValue('CoolWebsites', ['demo.owncloud.org', 'owncloud.org', 'owncloud.com']); - $expected = " 'bar',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " + $expected = " 'bar',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " . " 1 => 'Guinness',\n 2 => 'Kölsch',\n ),\n 'alcohol_free' => false,\n 'php53' => 'totallyOutdated',\n 'CoolWebsites' => \n array (\n " . " 0 => 'demo.owncloud.org',\n 1 => 'owncloud.org',\n 2 => 'owncloud.com',\n ),\n);\n"; $this->assertEquals($expected, file_get_contents($this->configFile));