From ae86b2e806699634b55def1d48b40de747e53982 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 23 Oct 2021 11:29:15 +0200 Subject: [PATCH] Restructure (P)Config to follow new paradigm --- 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 8ea183db..aff09df1 100644 --- 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 eb774d5d..ba22e089 100644 --- 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 5a0a854b..dddd226b 100644 --- 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 1043c4d8..db12976c 100644 --- 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 a62aab11..88f7b0ff 100644 --- 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 bee13a1a..4f14c597 100644 --- 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 3a8898b4..89bc2821 100644 --- 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 b23bc298..10693b7b 100644 --- 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 a29c6d7c..aaa72971 100644 --- 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 0d53db39..1139f402 100644 --- 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 df7d3c5f..6426d3c3 100644 --- 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 e9c9d259..7ea5618b 100644 --- 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;