From c964e193b9b476debc16e42279801372137bc3bc Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 25 Nov 2018 01:44:51 -0500 Subject: [PATCH] Replace *.ini.php by *.config.php in comments --- bin/daemon.php | 11 ++++++++--- boot.php | 12 +++++++----- mod/admin.php | 2 +- src/Core/Config/JITConfigAdapter.php | 4 ++-- src/Core/Console/Config.php | 2 +- tests/src/Core/Console/ConfigConsoleTest.php | 2 +- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/bin/daemon.php b/bin/daemon.php index f628031c35..9df8b8957a 100755 --- a/bin/daemon.php +++ b/bin/daemon.php @@ -42,9 +42,14 @@ if ($a->getMode()->isInstall()) { Config::load(); if (empty(Config::get('system', 'pidfile'))) { - die('Please set system.pidfile in config/local.ini.php. For example:'."\n". - '[system]'."\n". - 'pidfile = /path/to/daemon.pid'."\n"); + die(<< [ + 'pidfile' => '/path/to/daemon.pid', + ], +TXT + ); } $pidfile = Config::get('system', 'pidfile'); diff --git a/boot.php b/boot.php index 6373b2c64b..f3d1f6f649 100644 --- a/boot.php +++ b/boot.php @@ -56,13 +56,13 @@ define('EOL', "
\r\n"); * @brief Image storage quality. * * Lower numbers save space at cost of image detail. - * For ease of upgrade, please do not change here. Set [system] jpegquality = n in config/local.ini.php, + * For ease of upgrade, please do not change here. Set system.jpegquality = n in config/local.config.php, * where n is between 1 and 100, and with very poor results below about 50 */ define('JPEG_QUALITY', 100); /** - * [system] png_quality = n where is between 0 (uncompressed) to 9 + * system.png_quality = n where is between 0 (uncompressed) to 9 */ define('PNG_QUALITY', 8); @@ -73,10 +73,12 @@ define('PNG_QUALITY', 8); * this length (on the longest side, the other side will be scaled appropriately). * Modify this value using * - * [system] - * max_image_length = n; + * 'system' => [ + * 'max_image_length' => 'n', + * ... + * ], * - * in config/local.ini.php + * in config/local.config.php * * If you don't want to set a maximum length, set to -1. The default value is * defined by 'MAX_IMAGE_LENGTH' below. diff --git a/mod/admin.php b/mod/admin.php index 5bf55423e5..ab5c37ec02 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -914,7 +914,7 @@ function admin_page_summary(App $a) // Legacy config file warning if (file_exists('.htconfig.php')) { $showwarning = true; - $warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.ini.php, please copy config/local-sample.ini.php and move your config from .htconfig.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config'); + $warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from .htconfig.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config'); } // Check server vitality diff --git a/src/Core/Config/JITConfigAdapter.php b/src/Core/Config/JITConfigAdapter.php index b985d91c21..2018f583d6 100644 --- a/src/Core/Config/JITConfigAdapter.php +++ b/src/Core/Config/JITConfigAdapter.php @@ -65,13 +65,13 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter $this->in_db[$cat][$k] = true; return $value; } elseif (isset($a->config[$cat][$k])) { - // Assign the value (mostly) from config/local.ini.php file to the cache + // Assign the value (mostly) from config/local.config.php file to the cache $this->cache[$cat][$k] = $a->config[$cat][$k]; $this->in_db[$cat][$k] = false; return $a->config[$cat][$k]; } elseif (isset($a->config[$k])) { - // Assign the value (mostly) from config/local.ini.php file to the cache + // Assign the value (mostly) from config/local.config.php file to the cache $this->cache[$k] = $a->config[$k]; $this->in_db[$k] = false; diff --git a/src/Core/Console/Config.php b/src/Core/Console/Config.php index 3b92d5a784..ce367fffbf 100644 --- a/src/Core/Console/Config.php +++ b/src/Core/Console/Config.php @@ -59,7 +59,7 @@ Description Sets the value of the provided key in the category Notes: - Setting config entries which are manually set in config/local.ini.php may result in + Setting config entries which are manually set in config/local.config.php may result in conflict between database settings and the manual startup settings. Options diff --git a/tests/src/Core/Console/ConfigConsoleTest.php b/tests/src/Core/Console/ConfigConsoleTest.php index 8f845ae7b0..3ba2bd60d3 100644 --- a/tests/src/Core/Console/ConfigConsoleTest.php +++ b/tests/src/Core/Console/ConfigConsoleTest.php @@ -139,7 +139,7 @@ Description Sets the value of the provided key in the category Notes: - Setting config entries which are manually set in config/local.ini.php may result in + Setting config entries which are manually set in config/local.config.php may result in conflict between database settings and the manual startup settings. Options