From 5c6108b3cc29151fb33185afe4ada805bc84a9ef Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 23 Jun 2019 19:56:21 +0200 Subject: [PATCH] Dynamic config loading - Move settings, defaults and dbstructure to directory 'static' - Dynamic loading of config files (after the static loading) - Filter out '-sample.config.php' and '-sample.ini.php' files - Remove unnecessary ConfigFileManager - Move ConfigFileLoader to Utils - Add tests for multi-loading for INI, config and sample-filtering --- geonames/geonames.php | 2 +- gravatar/gravatar.php | 2 +- impressum/impressum.php | 2 +- ldapauth/ldapauth.php | 2 +- libravatar/libravatar.php | 2 +- openstreetmap/openstreetmap.php | 2 +- phpmailer/phpmailer.php | 2 +- piwik/piwik.php | 2 +- public_server/public_server.php | 2 +- pumpio/pumpio.php | 2 +- testdrive/testdrive.php | 2 +- twitter/twitter.php | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/geonames/geonames.php b/geonames/geonames.php index cc0420f4..c052cef6 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -13,7 +13,7 @@ use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Renderer; -use Friendica\Util\Config\ConfigFileLoader; +use Friendica\Util\ConfigFileLoader; use Friendica\Util\Network; use Friendica\Util\XML; diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php index 22d6875a..68083b38 100644 --- a/gravatar/gravatar.php +++ b/gravatar/gravatar.php @@ -14,7 +14,7 @@ use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Database\DBA; -use Friendica\Util\Config\ConfigFileLoader; +use Friendica\Util\ConfigFileLoader; use Friendica\Util\Strings; /** diff --git a/impressum/impressum.php b/impressum/impressum.php index 1ec06cfa..dc5d3552 100644 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -13,7 +13,7 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Renderer; -use Friendica\Util\Config\ConfigFileLoader; +use Friendica\Util\ConfigFileLoader; use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Strings; diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php index b988e376..2434beb8 100644 --- a/ldapauth/ldapauth.php +++ b/ldapauth/ldapauth.php @@ -58,7 +58,7 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Model\User; -use Friendica\Util\Config\ConfigFileLoader; +use Friendica\Util\ConfigFileLoader; function ldapauth_install() { diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php index a8cacda2..43e67340 100644 --- a/libravatar/libravatar.php +++ b/libravatar/libravatar.php @@ -14,7 +14,7 @@ use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Database\DBA; -use Friendica\Util\Config\ConfigFileLoader; +use Friendica\Util\ConfigFileLoader; use Friendica\Util\Strings; /** diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php index d2fe81a3..edea4329 100644 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -15,7 +15,7 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Renderer; -use Friendica\Util\Config\ConfigFileLoader; +use Friendica\Util\ConfigFileLoader; use Friendica\Util\Network; use Friendica\Util\Strings; diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php index 9e907774..a5ab2558 100644 --- a/phpmailer/phpmailer.php +++ b/phpmailer/phpmailer.php @@ -10,7 +10,7 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Core\Hook; -use Friendica\Util\Config\ConfigFileLoader; +use Friendica\Util\ConfigFileLoader; use PHPMailer\PHPMailer\PHPMailer; use PHPMailer\PHPMailer\Exception; diff --git a/piwik/piwik.php b/piwik/piwik.php index 1487f370..cd41ad7b 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -36,7 +36,7 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Renderer; -use Friendica\Util\Config\ConfigFileLoader; +use Friendica\Util\ConfigFileLoader; use Friendica\Util\Strings; function piwik_install() { diff --git a/public_server/public_server.php b/public_server/public_server.php index 092a0615..e6817c64 100644 --- a/public_server/public_server.php +++ b/public_server/public_server.php @@ -14,7 +14,7 @@ use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Database\DBA; -use Friendica\Util\Config\ConfigFileLoader; +use Friendica\Util\ConfigFileLoader; use Friendica\Util\DateTimeFormat; use Friendica\Util\Strings; diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index cb295b89..8731e251 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -21,7 +21,7 @@ use Friendica\Model\Contact; use Friendica\Model\Group; use Friendica\Model\Item; use Friendica\Model\User; -use Friendica\Util\Config\ConfigFileLoader; +use Friendica\Util\ConfigFileLoader; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; use Friendica\Util\Strings; diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php index 1d958ed1..f29dea19 100644 --- a/testdrive/testdrive.php +++ b/testdrive/testdrive.php @@ -12,7 +12,7 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Database\DBA; use Friendica\Model\User; -use Friendica\Util\Config\ConfigFileLoader; +use Friendica\Util\ConfigFileLoader; use Friendica\Util\DateTimeFormat; function testdrive_install() { diff --git a/twitter/twitter.php b/twitter/twitter.php index dd2241ab..8019e9a2 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -84,7 +84,7 @@ use Friendica\Model\Item; use Friendica\Model\ItemContent; use Friendica\Model\User; use Friendica\Object\Image; -use Friendica\Util\Config\ConfigFileLoader; +use Friendica\Util\ConfigFileLoader; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; use Friendica\Util\Strings;