Refactoring Core class structures ...

diff --git a/geonames/geonames.php b/geonames/geonames.php
index aff09df1fedc966ab27d7ab4a063da41fdaf4ce1..eb12728f0b331ac9c3c4058265aac7f3bb46c70b 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\Core\Config\Cache\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\XML;
 
 function geonames_install()

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index ba22e0894d2edce39d9a517c31dfc44e22f15614..1b6c8e092012e90f017dda2c7dc9b7dc42af8155 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\Core\Config\Cache\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\Strings;
 
 /**

diff --git a/impressum/impressum.php b/impressum/impressum.php
index dddd226b1abff4c54ff288a7ce2edeef262b7b00..26fec48bd862113e8dbe99c4d6f4449af69cff57 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\Core\Config\Cache\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index db12976c2b7a7e6cc916058df1636405499971ed..212c66d59f6e48f44cf3ef1636694ee1b1be8fb1 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\Core\Config\Cache\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 
 function ldapauth_install()
 {

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 88f7b0ff5bdc8359c4a918b5de8ba6da446e5d87..5e31ea9dd2da816c1cb17a7f198786adb2cdc11c 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\Core\Config\Cache\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\Strings;
 
 /**

diff --git a/notifyall/NotifyAllEmail.php b/notifyall/NotifyAllEmail.php
index aa14d98a17d01f9fc64d7fbffdd1477645fef538..abdb9549660d063290ed04dc6a86c4c212f97437 100644 (file)
--- a/notifyall/NotifyAllEmail.php
+++ b/notifyall/NotifyAllEmail.php
@@ -23,7 +23,7 @@ namespace Friendica\Addon\notifyall;
 
 use Friendica\App\BaseURL;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Object\Email;
 
@@ -32,7 +32,7 @@ use Friendica\Object\Email;
  */
 class NotifyAllEmail extends Email
 {
-       public function __construct(L10n $l10n, IConfig $config, BaseURL $baseUrl, string $text)
+       public function __construct(L10n $l10n, IManageConfigValues $config, BaseURL $baseUrl, string $text)
        {
                $sitename = $config->get('config', 'sitename');
 

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 4f14c597f70d738ce0c45eacf873d53dbb88b885..d6b2307f4b2c5bd4dbe05b3f9c938d06755facc7 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\Core\Config\Cache\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\Strings;
 
 const OSM_TMS = 'https://www.openstreetmap.org';

diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index 89bc2821e7cd358438b90c5b0bf0273553a9fc30..72113e0ac35c62d6cd0939027e137610a35a9ccd 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\Core\Config\Cache\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception;
 

diff --git a/piwik/piwik.php b/piwik/piwik.php
index 10693b7b34783ec2b149067bb587fdf1a80a206e..071fd337372e318aedd6566b23ae1fdf6dbf5fbd 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\Core\Config\Cache\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\Strings;
 
 function piwik_install() {

diff --git a/public_server/public_server.php b/public_server/public_server.php
index aaa7297120b27eb55202de87795495ca9525d3a9..0c37098107f5d1c83cb1e3992552a4dfa0de3459 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\Core\Config\Cache\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 1139f4026f41b81b3124340c7851098c018e4a25..3c3938f759082c0c520cb4db0f67b3ad2b2a0dda 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\Core\Config\Cache\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;

diff --git a/securemail/SecureTestEmail.php b/securemail/SecureTestEmail.php
index b3abcd509f06f7a198e0ab1fd7592685c60fe941..1ee41ad531f75782a209422551948015db88ac3c 100644 (file)
--- a/securemail/SecureTestEmail.php
+++ b/securemail/SecureTestEmail.php
@@ -23,8 +23,8 @@ namespace Friendica\Addon\securemail;
 
 use Friendica\App;
 use Friendica\App\BaseURL;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Model\User;
 use Friendica\Object\Email;
 
@@ -33,7 +33,7 @@ use Friendica\Object\Email;
  */
 class SecureTestEmail extends Email
 {
-       public function __construct(App $a, IConfig $config, IPConfig $pConfig, BaseURL $baseUrl)
+       public function __construct(App $a, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, BaseURL $baseUrl)
        {
                $sitename = $config->get('config', 'sitename');
 

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 6426d3c34ef0ca383bf968a2ec876ba198ac8717..58bcd88699f79010588eb00187d90f8d17c76966 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\Core\Config\Cache\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 
 function testdrive_install() {

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 7ea5618bf414469e09923cd53b4391e0ce6c4954..ef64e1a2d15c517d8f5db75e908cf0151c247267 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\Core\Config\Cache\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
 use Friendica\Util\Strings;

diff --git a/webdav_storage/src/WebDavConfig.php b/webdav_storage/src/WebDavConfig.php
index c2f235d4c77f3c0eafe9c07290068695742f57d0..f1a0aa4afb3efb701c6003c5741a44119c9c0e0e 100644 (file)
--- a/webdav_storage/src/WebDavConfig.php
+++ b/webdav_storage/src/WebDavConfig.php
@@ -2,7 +2,7 @@
 
 namespace Friendica\Addon\webdav_storage\src;
 
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Model\Storage\IStorageConfiguration;
 use Friendica\Network\HTTPClientOptions;
@@ -18,7 +18,7 @@ class WebDavConfig implements IStorageConfiguration
        /** @var L10n */
        private $l10n;
 
-       /** @var IConfig */
+       /** @var IManageConfigValues */
        private $config;
 
        /** @var string */
@@ -46,7 +46,7 @@ class WebDavConfig implements IStorageConfiguration
                return $this->authOptions;
        }
 
-       public function __construct(L10n $l10n, IConfig $config, IHTTPClient $client)
+       public function __construct(L10n $l10n, IManageConfigValues $config, IHTTPClient $client)
        {
                $this->l10n   = $l10n;
                $this->config = $config;