From c8a63f6b9c709d558add1fcb3d90447a918185c4 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 24 Mar 2019 12:54:26 +0100 Subject: [PATCH] Moving/Renaming ConfigCacheLoader to ConfigFileLoader --- geonames/geonames.php | 3 ++- gravatar/gravatar.php | 3 ++- impressum/impressum.php | 3 ++- ldapauth/ldapauth.php | 3 ++- libravatar/libravatar.php | 3 ++- openstreetmap/openstreetmap.php | 3 ++- piwik/piwik.php | 3 ++- public_server/public_server.php | 3 ++- pumpio/pumpio.php | 3 ++- testdrive/testdrive.php | 3 ++- twitter/twitter.php | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/geonames/geonames.php b/geonames/geonames.php index a28ff585..1ce6dbfa 100644 --- 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 d14cf9ba..22d6875a 100644 --- 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 99f8c8c7..1ec06cfa 100644 --- 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 6fef9767..b988e376 100644 --- 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 7da9eb45..a8cacda2 100644 --- 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 6507d278..d2fe81a3 100644 --- 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 17ecf68b..1487f370 100644 --- 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 639b8fce..092a0615 100644 --- 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 3ebd057f..d7b3adb4 100644 --- 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 3b4691b0..1d958ed1 100644 --- 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 e343dd24..3dbaf37b 100644 --- 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')); }