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

diff --git a/geonames/geonames.php b/geonames/geonames.php
index cc0420f41b87509b69ac91cec3e12a47cfa61e2c..c052cef6bea1187db9e080e19ee5601b976f8197 100644 (file)
--- 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 22d6875a340d23c5f5527cdeb5af926fbdf2930c..68083b386f48d50f19bd0113b6e7e7a81de06797 100644 (file)
--- 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 1ec06cfa5c9e807745ced6bff3346e291fba5db5..dc5d355282edc0412c9e01d5cce68b051e402d55 100644 (file)
--- 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 b988e376750874b2c8d7dcf8fa61664b805ff1ae..2434beb8a2c0a643f1822c9487d52a4ccf59168d 100644 (file)
--- 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 a8cacda2d9bea0b9c93cf3342aa58a6fd046145e..43e673406027a7e0f0686787ba7ecabb332645f6 100644 (file)
--- 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 d2fe81a3b3a7ca41baeaddcaaea77afe19d65faf..edea43299750196a1b143245737ed7b8aa60f779 100644 (file)
--- 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 9e907774e30d635efa05ad3f0f0cd743f151607a..a5ab25583012426320ed104635834e7897bb7d9e 100644 (file)
--- 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 1487f370e363d0dd89b3ee7dfd98370725a3f031..cd41ad7b1040124e23e93237e03bc6a281951439 100644 (file)
--- 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 092a0615144179719236061c6afd3ff0f2b3e0b6..e6817c645b4f0b0e4989166f24aa2c5bb7c8ada5 100644 (file)
--- 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 cb295b893d4b85186191d6e874a66a9f42d95622..8731e251390616a023aa38faf45f9044a710962c 100644 (file)
--- 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 1d958ed104ed21bbb1bd349bcec29af7353e6361..f29dea19bd161a8a2a99de3027c6bcd76ce2477a 100644 (file)
--- 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 dd2241abf855b9b536b067e616541866c4af5bd7..8019e9a2da709ff663fb495153952e5f7be11619 100644 (file)
--- 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;