diff --git a/lib/private/Config.php b/lib/private/Config.php index 44a26a16777..1a8337907f1 100644 --- a/lib/private/Config.php +++ b/lib/private/Config.php @@ -16,6 +16,23 @@ use OCP\Util; */ 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: + * .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 3ef54f7644f..f4177fb1912 100644 --- a/tests/lib/ConfigTest.php +++ b/tests/lib/ConfigTest.php @@ -97,25 +97,8 @@ class ConfigTest extends TestCase { $this->assertSame('moo', $config->getValue('foo')); $content = file_get_contents($this->configFile); - $expected = ".config.php' file which will be included and rendered into this file. - * - * Example: - * '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); @@ -127,25 +110,8 @@ class ConfigTest extends TestCase { $content = file_get_contents($this->configFile); - $expected = ".config.php' file which will be included and rendered into this file. - * - * Example: - * '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"; @@ -177,25 +143,8 @@ class ConfigTest extends TestCase { $this->assertSame(null, $config->getValue('not_exists')); $content = file_get_contents($this->configFile); - $expected = ".config.php' file which will be included and rendered into this file. - * - * Example: - * 'moo',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " . " 1 => 'Guinness',\n 2 => 'Kölsch',\n ),\n);\n"; $this->assertEquals($expected, $content); @@ -207,25 +156,8 @@ class ConfigTest extends TestCase { $this->assertSame('this_was_clearly_not_set_before', $config->getValue('foo', 'this_was_clearly_not_set_before')); $content = file_get_contents($this->configFile); - $expected = ".config.php' file which will be included and rendered into this file. - * - * Example: - * \n array (\n 0 => 'Appenzeller',\n " . " 1 => 'Guinness',\n 2 => 'Kölsch',\n ),\n 'alcohol_free' => false,\n);\n"; $this->assertEquals($expected, $content); @@ -246,25 +178,8 @@ class ConfigTest extends TestCase { // Write a new value to the config $config->setValue('CoolWebsites', ['demo.owncloud.org', 'owncloud.org', 'owncloud.com']); - $expected = ".config.php' file which will be included and rendered into this file. - * - * Example: - * '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";