Moving/Renaming ConfigCacheLoader to ConfigFileLoader

diff --git a/geonames/geonames.php b/geonames/geonames.php
index a28ff585ba5b2d04eaf3fa63c36cc7c403e9de04..1ce6dbfa547d0e5d1148cf4138edf5835e1e3331 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -27,6 +27,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Util\Config\ConfigFileLoader;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
 
@@ -77,7 +78,7 @@ function geonames_uninstall() {
        Logger::log("removed geonames");
 }
 
-function geonames_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
+function geonames_load_config(\Friendica\App $a, ConfigFileLoader $loader)
 {
        $a->getConfigCache()->load($loader->loadAddonConfig('geonames'));
 }

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index d14cf9ba185166743c7fa70f3c9399a8c2e77d37..22d6875a340d23c5f5527cdeb5af926fbdf2930c 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -14,6 +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\Strings;
 
 /**
@@ -36,7 +37,7 @@ function gravatar_uninstall() {
        Logger::log("unregistered gravatar in avatar_lookup hook");
 }
 
-function gravatar_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
+function gravatar_load_config(App $a, ConfigFileLoader $loader)
 {
        $a->getConfigCache()->load($loader->loadAddonConfig('gravatar'));
 }

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 99f8c8c7ccd0d354f205e4e596141c321b0a6583..1ec06cfa5c9e807745ced6bff3346e291fba5db5 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -13,6 +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\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
@@ -52,7 +53,7 @@ function impressum_footer($a, &$b) {
     }
 }
 
-function impressum_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
+function impressum_load_config(\Friendica\App $a, ConfigFileLoader $loader)
 {
        $a->getConfigCache()->load($loader->loadAddonConfig('impressum'));
 }

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 6fef97679e2771a370bf741edae16f94ecc9aa47..b988e376750874b2c8d7dcf8fa61664b805ff1ae 100644 (file)
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -58,6 +58,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Model\User;
+use Friendica\Util\Config\ConfigFileLoader;
 
 function ldapauth_install()
 {
@@ -71,7 +72,7 @@ function ldapauth_uninstall()
        Hook::unregister('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate');
 }
 
-function ldapauth_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
+function ldapauth_load_config(\Friendica\App $a, ConfigFileLoader $loader)
 {
        $a->getConfigCache()->load($loader->loadAddonConfig('ldapauth'));
 }

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 7da9eb45aa4c96edac10785dd1e6062676385468..a8cacda2d9bea0b9c93cf3342aa58a6fd046145e 100644 (file)
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -14,6 +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\Strings;
 
 /**
@@ -36,7 +37,7 @@ function libravatar_uninstall()
        Logger::log("unregistered libravatar in avatar_lookup hook");
 }
 
-function libravatar_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
+function libravatar_load_config(App $a, ConfigFileLoader $loader)
 {
        $a->getConfigCache()->load($loader->loadAddonConfig('libravatar'));
 }

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 6507d2783e07ec764e04d77b283acee38166a698..d2fe81a3b3a7ca41baeaddcaaea77afe19d65faf 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -15,6 +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\Network;
 use Friendica\Util\Strings;
 
@@ -47,7 +48,7 @@ function openstreetmap_uninstall()
        Logger::log("removed openstreetmap");
 }
 
-function openstreetmap_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
+function openstreetmap_load_config(\Friendica\App $a, ConfigFileLoader $loader)
 {
        $a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'));
 }

diff --git a/piwik/piwik.php b/piwik/piwik.php
index 17ecf68babb5c698291d6bce4abbb573289bb702..1487f370e363d0dd89b3ee7dfd98370725a3f031 100644 (file)
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -36,6 +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\Strings;
 
 function piwik_install() {
@@ -52,7 +53,7 @@ function piwik_uninstall() {
        Logger::log("uninstalled piwik addon");
 }
 
-function piwik_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
+function piwik_load_config(\Friendica\App $a, ConfigFileLoader $loader)
 {
        $a->getConfigCache()->load($loader->loadAddonConfig('piwik'));
 }

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 639b8fcef21a6a25306237803a3bf87ab991e6ed..092a0615144179719236061c6afd3ff0f2b3e0b6 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -14,6 +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\DateTimeFormat;
 use Friendica\Util\Strings;
 
@@ -35,7 +36,7 @@ function public_server_uninstall()
        Hook::unregister('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
 }
 
-function public_server_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
+function public_server_load_config(App $a, ConfigFileLoader $loader)
 {
        $a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
 }

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 3ebd057f12de5dad6f0463b057b9de390ace57e4..d7b3adb45d3bbd26b1c002deadf9fac762fce0ec 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -23,6 +23,7 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Queue;
 use Friendica\Model\User;
+use Friendica\Util\Config\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -377,7 +378,7 @@ function pumpio_settings_post(App $a, array &$b)
        }
 }
 
-function pumpio_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
+function pumpio_load_config(App $a, ConfigFileLoader $loader)
 {
        $a->getConfigCache()->load($loader->loadAddonConfig('pumpio'));
 }

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 3b4691b01ddc8c1691b0ca3dbbd9104cb237acf2..1d958ed104ed21bbb1bd349bcec29af7353e6361 100644 (file)
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -12,6 +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\DateTimeFormat;
 
 function testdrive_install() {
@@ -35,7 +36,7 @@ function testdrive_uninstall() {
 
 }
 
-function testdrive_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
+function testdrive_load_config(App $a, ConfigFileLoader $loader)
 {
        $a->getConfigCache()->load($loader->loadAddonConfig('testdrive'));
 }

diff --git a/twitter/twitter.php b/twitter/twitter.php
index e343dd24a377aee06c69dee57d7f5a8db600ccb9..3dbaf37bd99497cb827eaed8a864276ee0214416 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -86,6 +86,7 @@ use Friendica\Model\ItemContent;
 use Friendica\Model\Queue;
 use Friendica\Model\User;
 use Friendica\Object\Image;
+use Friendica\Util\Config\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -135,7 +136,7 @@ function twitter_uninstall()
        Hook::unregister('addon_settings_post', __FILE__, 'twitter_settings_post');
 }
 
-function twitter_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
+function twitter_load_config(App $a, ConfigFileLoader $loader)
 {
        $a->getConfigCache()->load($loader->loadAddonConfig('twitter'));
 }