Restructure (P)Config to follow new paradigm

diff --git a/geonames/geonames.php b/geonames/geonames.php
index 8ea183db0d3cea238226894bd460343fa259aec0..aff09df1fedc966ab27d7ab4a063da41fdaf4ce1 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -11,7 +11,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Cache\ConfigFileLoader;
 use Friendica\Util\XML;
 
 function geonames_install()

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index eb774d5d137a950357c10efe00cc49bcdba35fdc..ba22e0894d2edce39d9a517c31dfc44e22f15614 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -13,7 +13,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Cache\ConfigFileLoader;
 use Friendica\Util\Strings;
 
 /**

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 5a0a854b2814a57cd537eb5ff11a3c4e983191ec..dddd226b1abff4c54ff288a7ce2edeef262b7b00 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -12,7 +12,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Cache\ConfigFileLoader;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 1043c4d876c8d45a62ddaa1ceb1d2a5a17b32e40..db12976c2b7a7e6cc916058df1636405499971ed 100644 (file)
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -59,7 +59,7 @@ use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Cache\ConfigFileLoader;
 
 function ldapauth_install()
 {

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index a62aab11d88c819fea45e1c2ddde9c6b20c7e719..88f7b0ff5bdc8359c4a918b5de8ba6da446e5d87 100644 (file)
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -12,7 +12,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Cache\ConfigFileLoader;
 use Friendica\Util\Strings;
 
 /**

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index bee13a1a3e34317b6cf3552604d6be12adb90930..4f14c597f70d738ce0c45eacf873d53dbb88b885 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -14,7 +14,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Cache\ConfigFileLoader;
 use Friendica\Util\Strings;
 
 const OSM_TMS = 'https://www.openstreetmap.org';

diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index 3a8898b414b9eaf2ce5a7f8c1ca91af766c53165..89bc2821e7cd358438b90c5b0bf0273553a9fc30 100644 (file)
--- a/phpmailer/phpmailer.php
+++ b/phpmailer/phpmailer.php
@@ -11,7 +11,7 @@ use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Friendica\Object\EMail\IEmail;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Cache\ConfigFileLoader;
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception;
 

diff --git a/piwik/piwik.php b/piwik/piwik.php
index b23bc2983f0bd7b7d0bbb1debcd129b0cada8f77..10693b7b34783ec2b149067bb587fdf1a80a206e 100644 (file)
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -35,7 +35,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Cache\ConfigFileLoader;
 use Friendica\Util\Strings;
 
 function piwik_install() {

diff --git a/public_server/public_server.php b/public_server/public_server.php
index a29c6d7c43a6d93f1b34d6967be8a89850745525..aaa7297120b27eb55202de87795495ca9525d3a9 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -15,7 +15,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Notification;
 use Friendica\Model\User;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Cache\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 0d53db39f4f525ceea67e080def207ece66eba0e..1139f4026f41b81b3124340c7851098c018e4a25 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -24,7 +24,7 @@ use Friendica\Model\User;
 use Friendica\Network\HTTPClientOptions;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityNamespace;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Cache\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index df7d3c5fc0edfa30a0a3b4362d3087a78e4747ee..6426d3c34ef0ca383bf968a2ec876ba198ac8717 100644 (file)
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -13,7 +13,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Notification;
 use Friendica\Model\User;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Cache\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 
 function testdrive_install() {

diff --git a/twitter/twitter.php b/twitter/twitter.php
index e9c9d2597412fac8721ab2ed69d65e4222dfafff..7ea5618bf414469e09923cd53b4391e0ce6c4954 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -84,7 +84,7 @@ use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
 use Friendica\Protocol\Activity;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Cache\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
 use Friendica\Util\Strings;