From ed9392469e7327639cc2d21870ad0ccacb3cda4d Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sun, 19 Jan 2020 22:50:44 +0100 Subject: [PATCH] Remove unneeded Config namespace usages --- bin/daemon.php | 1 - bin/worker.php | 1 - boot.php | 1 - include/api.php | 1 - include/conversation.php | 1 - include/enotify.php | 1 - include/items.php | 1 - mod/api.php | 1 - mod/cal.php | 1 - mod/community.php | 1 - mod/crepair.php | 1 - mod/dfrn_confirm.php | 1 - mod/dfrn_notify.php | 1 - mod/dfrn_poll.php | 1 - mod/dfrn_request.php | 1 - mod/display.php | 1 - mod/follow.php | 1 - mod/item.php | 1 - mod/lostpass.php | 1 - mod/match.php | 1 - mod/network.php | 1 - mod/photos.php | 1 - mod/ping.php | 1 - mod/poco.php | 1 - mod/profile_photo.php | 1 - mod/profiles.php | 1 - mod/profperm.php | 1 - mod/pubsubhubbub.php | 1 - mod/regmod.php | 1 - mod/removeme.php | 1 - mod/settings.php | 1 - mod/uimport.php | 1 - mod/videos.php | 1 - mod/wall_attach.php | 1 - mod/wall_upload.php | 1 - mod/worker.php | 1 - src/Api/Entity/Mastodon/Instance.php | 1 - src/Api/Entity/Mastodon/Stats.php | 1 - src/Console/AutomaticInstallation.php | 46 ++++++++++-------------- src/Content/Feature.php | 1 - src/Content/Nav.php | 1 - src/Content/OEmbed.php | 1 - src/Content/Smilies.php | 1 - src/Content/Text/BBCode.php | 1 - src/Content/Text/HTML.php | 1 - src/Content/Widget.php | 1 - src/Database/DBStructure.php | 1 - src/Database/PostUpdate.php | 1 - src/Factory/ConfigFactory.php | 3 ++ src/Model/APContact.php | 1 - src/Model/Contact.php | 1 - src/Model/GContact.php | 1 - src/Model/GServer.php | 1 - src/Model/Item.php | 1 - src/Model/Photo.php | 1 - src/Model/Profile.php | 1 - src/Model/User.php | 1 - src/Module/Admin/Blocklist/Server.php | 1 - src/Module/Admin/DBSync.php | 1 - src/Module/Admin/Features.php | 1 - src/Module/Admin/Federation.php | 1 - src/Module/Admin/Logs/Settings.php | 1 - src/Module/Admin/Logs/View.php | 1 - src/Module/Admin/Site.php | 1 - src/Module/Admin/Summary.php | 4 +-- src/Module/Admin/Themes/Index.php | 1 - src/Module/Admin/Tos.php | 1 - src/Module/Admin/Users.php | 1 - src/Module/Apps.php | 1 - src/Module/Contact/Hovercard.php | 1 - src/Module/Group.php | 1 - src/Module/Inbox.php | 2 -- src/Module/Profile.php | 1 - src/Module/Profile/Contacts.php | 1 - src/Module/Register.php | 1 - src/Module/Search/Index.php | 1 - src/Module/Security/Login.php | 1 - src/Module/Tos.php | 1 - src/Network/FKOAuthDataStore.php | 1 - src/Network/Probe.php | 1 - src/Object/Image.php | 1 - src/Object/Post.php | 1 - src/Protocol/ActivityPub/Processor.php | 1 - src/Protocol/ActivityPub/Transmitter.php | 1 - src/Protocol/DFRN.php | 1 - src/Protocol/Diaspora.php | 1 - src/Protocol/OStatus.php | 1 - src/Protocol/PortableContact.php | 8 ----- src/Util/Crypto.php | 1 - src/Util/Emailer.php | 1 - src/Util/ExAuth.php | 1 - src/Util/HTTPSignature.php | 1 - src/Util/Network.php | 1 - src/Util/Proxy.php | 1 - src/Worker/CheckVersion.php | 1 - src/Worker/Cron.php | 1 - src/Worker/CronJobs.php | 2 -- src/Worker/DBClean.php | 1 - src/Worker/DBUpdate.php | 1 - src/Worker/Delivery.php | 1 - src/Worker/Directory.php | 1 - src/Worker/Expire.php | 1 - src/Worker/Notifier.php | 2 -- src/Worker/OnePoll.php | 1 - src/Worker/SearchDirectory.php | 1 - src/Worker/UpdateGContacts.php | 1 - src/Worker/UpdateServerDirectories.php | 2 -- tests/src/Database/DBATest.php | 1 - update.php | 1 - view/theme/duepuntozero/config.php | 1 - view/theme/duepuntozero/style.php | 1 - view/theme/duepuntozero/theme.php | 1 - view/theme/frio/config.php | 1 - view/theme/frio/php/default.php | 1 - view/theme/frio/style.php | 1 - view/theme/frio/theme.php | 1 - view/theme/quattro/config.php | 1 - view/theme/quattro/style.php | 1 - view/theme/vier/config.php | 1 - view/theme/vier/style.php | 1 - view/theme/vier/theme.php | 1 - 121 files changed, 24 insertions(+), 158 deletions(-) diff --git a/bin/daemon.php b/bin/daemon.php index 0536814b9..27edbfee0 100755 --- a/bin/daemon.php +++ b/bin/daemon.php @@ -8,7 +8,6 @@ */ use Dice\Dice; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Worker; use Friendica\Database\DBA; diff --git a/bin/worker.php b/bin/worker.php index bb7167395..106c9b81f 100755 --- a/bin/worker.php +++ b/bin/worker.php @@ -7,7 +7,6 @@ use Dice\Dice; use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Update; use Friendica\Core\Worker; use Friendica\DI; diff --git a/boot.php b/boot.php index 5f8f3a3be..4e1249e19 100644 --- a/boot.php +++ b/boot.php @@ -17,7 +17,6 @@ * easily as email does today. */ -use Friendica\Core\Config; use Friendica\Core\Protocol; use Friendica\Core\System; use Friendica\Database\DBA; diff --git a/include/api.php b/include/api.php index 039275f20..92b4e4b21 100644 --- a/include/api.php +++ b/include/api.php @@ -11,7 +11,6 @@ use Friendica\Content\ContactSelector; use Friendica\Content\Feature; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; diff --git a/include/conversation.php b/include/conversation.php index 5e8018d72..264fa6ceb 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -8,7 +8,6 @@ use Friendica\Content\ContactSelector; use Friendica\Content\Feature; use Friendica\Content\Pager; use Friendica\Content\Text\BBCode; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; diff --git a/include/enotify.php b/include/enotify.php index 8a21adbdf..4bd9eb696 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -4,7 +4,6 @@ */ use Friendica\Content\Text\BBCode; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Renderer; diff --git a/include/items.php b/include/items.php index 5d10dd35d..2230c93c7 100644 --- a/include/items.php +++ b/include/items.php @@ -3,7 +3,6 @@ * @file include/items.php */ -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; diff --git a/mod/api.php b/mod/api.php index 48a1e4d46..8114d2786 100644 --- a/mod/api.php +++ b/mod/api.php @@ -4,7 +4,6 @@ */ use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; diff --git a/mod/cal.php b/mod/cal.php index d8140cf41..cf0e498d5 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -11,7 +11,6 @@ use Friendica\App; use Friendica\Content\Feature; use Friendica\Content\Nav; use Friendica\Content\Widget; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\Core\Session; use Friendica\Database\DBA; diff --git a/mod/community.php b/mod/community.php index 9d1fe0f7f..61922ef88 100644 --- a/mod/community.php +++ b/mod/community.php @@ -9,7 +9,6 @@ use Friendica\Content\Nav; use Friendica\Content\Pager; use Friendica\Content\Widget\TrendingTags; use Friendica\Core\ACL; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\Core\Session; use Friendica\Database\DBA; diff --git a/mod/crepair.php b/mod/crepair.php index 57da284c8..aec1b6047 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -4,7 +4,6 @@ */ use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Renderer; diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 994c39cdd..60a96a926 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -19,7 +19,6 @@ */ use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\System; diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 36e520c0d..a08fe1b48 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -7,7 +7,6 @@ */ use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\System; use Friendica\Database\DBA; diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 74e2d8946..c444f0389 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -5,7 +5,6 @@ */ use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\System; use Friendica\Core\Session; diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index ca3282069..e29109160 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -13,7 +13,6 @@ */ use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Renderer; diff --git a/mod/display.php b/mod/display.php index 56836beff..f06b98dd4 100644 --- a/mod/display.php +++ b/mod/display.php @@ -8,7 +8,6 @@ use Friendica\Content\Pager; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; use Friendica\Core\ACL; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Renderer; diff --git a/mod/follow.php b/mod/follow.php index 276a389e8..8956bd576 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -3,7 +3,6 @@ * @file mod/follow.php */ use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\DI; diff --git a/mod/item.php b/mod/item.php index 3661dc81d..a9c5d4358 100644 --- a/mod/item.php +++ b/mod/item.php @@ -19,7 +19,6 @@ use Friendica\App; use Friendica\Content\Pager; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; diff --git a/mod/lostpass.php b/mod/lostpass.php index 479b5c901..59426a1af 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -5,7 +5,6 @@ */ use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; diff --git a/mod/match.php b/mod/match.php index 0805af7c5..b262bfd11 100644 --- a/mod/match.php +++ b/mod/match.php @@ -5,7 +5,6 @@ use Friendica\App; use Friendica\Content\Widget; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\Core\Search; use Friendica\Database\DBA; diff --git a/mod/network.php b/mod/network.php index 9b8a0bc57..db6d8eaf4 100644 --- a/mod/network.php +++ b/mod/network.php @@ -12,7 +12,6 @@ use Friendica\Content\Pager; use Friendica\Content\Widget; use Friendica\Content\Text\HTML; use Friendica\Core\ACL; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; diff --git a/mod/photos.php b/mod/photos.php index 50e18db47..c2fb82569 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -9,7 +9,6 @@ use Friendica\Content\Nav; use Friendica\Content\Pager; use Friendica\Content\Text\BBCode; use Friendica\Core\ACL; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Renderer; diff --git a/mod/ping.php b/mod/ping.php index 614900ec1..489019707 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -7,7 +7,6 @@ use Friendica\App; use Friendica\Content\ForumManager; use Friendica\Content\Text\BBCode; use Friendica\Core\Cache\Duration; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Database\DBA; use Friendica\DI; diff --git a/mod/poco.php b/mod/poco.php index a100ceffb..8e7d63418 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -6,7 +6,6 @@ use Friendica\App; use Friendica\Content\Text\BBCode; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Renderer; diff --git a/mod/profile_photo.php b/mod/profile_photo.php index e87e44e05..d34c78363 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -5,7 +5,6 @@ use Friendica\App; use Friendica\BaseModule; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\Core\Worker; use Friendica\Database\DBA; diff --git a/mod/profiles.php b/mod/profiles.php index 8b1cc5a30..551ae54f9 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -8,7 +8,6 @@ use Friendica\BaseModule; use Friendica\Content\ContactSelector; use Friendica\Content\Feature; use Friendica\Content\Nav; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Renderer; use Friendica\Core\Worker; diff --git a/mod/profperm.php b/mod/profperm.php index 33c958cae..f17d1d66b 100644 --- a/mod/profperm.php +++ b/mod/profperm.php @@ -3,7 +3,6 @@ * @file mod/profperm.php */ use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Protocol; use Friendica\Content\Text\HTML; use Friendica\Database\DBA; diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php index cdf6b8ee4..2ffaaf729 100644 --- a/mod/pubsubhubbub.php +++ b/mod/pubsubhubbub.php @@ -1,7 +1,6 @@ appMode = $appMode; - $this->configCache =$configCache; - $this->config = $config; - $this->dba = $dba; + $this->appMode = $appMode; + $this->configCache = $configCache; + $this->config = $config; + $this->dba = $dba; } protected function doExecute() @@ -106,9 +97,9 @@ HELP; $installer = new Installer(); - $configCache = $this->configCache; + $configCache = $this->configCache; $basePathConf = $configCache->get('system', 'basepath'); - $basepath = new BasePath($basePathConf); + $basepath = new BasePath($basePathConf); $installer->setUpCache($configCache, $basepath->getPath()); $this->out(" Complete!\n\n"); @@ -241,18 +232,18 @@ HELP; } /** - * @param Installer $installer The Installer instance - * @param \Friendica\Core\Config\Cache $configCache The config cache + * @param Installer $installer The Installer instance + * @param Cache $configCache The config cache * * @return bool true if checks were successfully, otherwise false * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private function runBasicChecks(Installer $installer, Config\Cache $configCache) + private function runBasicChecks(Installer $installer, Cache $configCache) { $checked = true; $installer->resetChecks(); - if (!$installer->checkFunctions()) { + if (!$installer->checkFunctions()) { $checked = false; } if (!$installer->checkImagick()) { @@ -281,11 +272,12 @@ HELP; /** * @param array $results + * * @return string */ private function extractErrors($results) { - $errorMessage = ''; + $errorMessage = ''; $allChecksRequired = $this->getOption('a') !== null; foreach ($results as $result) { diff --git a/src/Content/Feature.php b/src/Content/Feature.php index 4d89170d6..91a319677 100644 --- a/src/Content/Feature.php +++ b/src/Content/Feature.php @@ -5,7 +5,6 @@ */ namespace Friendica\Content; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\DI; diff --git a/src/Content/Nav.php b/src/Content/Nav.php index 64e4c79c4..6b4de6036 100644 --- a/src/Content/Nav.php +++ b/src/Content/Nav.php @@ -5,7 +5,6 @@ namespace Friendica\Content; use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Renderer; use Friendica\Core\Session; diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php index a92898b3c..14253b490 100644 --- a/src/Content/OEmbed.php +++ b/src/Content/OEmbed.php @@ -11,7 +11,6 @@ use DOMText; use DOMXPath; use Exception; use Friendica\Core\Cache\Duration; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Renderer; use Friendica\Database\DBA; diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php index 5e87fd86c..7a42f9ba4 100644 --- a/src/Content/Smilies.php +++ b/src/Content/Smilies.php @@ -14,7 +14,6 @@ */ namespace Friendica\Content; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\DI; use Friendica\Util\Strings; diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 1bcd7b09a..f8b9fb298 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -10,7 +10,6 @@ use DOMXPath; use Exception; use Friendica\Content\OEmbed; use Friendica\Content\Smilies; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php index 38814e0ca..bae0cb854 100644 --- a/src/Content/Text/HTML.php +++ b/src/Content/Text/HTML.php @@ -9,7 +9,6 @@ use DOMDocument; use DOMXPath; use Friendica\Content\Widget\ContactBlock; use Friendica\Core\Hook; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Model\Contact; diff --git a/src/Content/Widget.php b/src/Content/Widget.php index 1aa26fdd4..a38b9a305 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -5,7 +5,6 @@ namespace Friendica\Content; use Friendica\Core\Addon; -use Friendica\Core\Config; use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\Core\Session; diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php index 18832b8e5..686f0582c 100644 --- a/src/Database/DBStructure.php +++ b/src/Database/DBStructure.php @@ -6,7 +6,6 @@ namespace Friendica\Database; use Exception; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\DI; diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php index 44e203ab4..64737f604 100644 --- a/src/Database/PostUpdate.php +++ b/src/Database/PostUpdate.php @@ -4,7 +4,6 @@ */ namespace Friendica\Database; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\DI; diff --git a/src/Factory/ConfigFactory.php b/src/Factory/ConfigFactory.php index 585d6eb7e..578f3191c 100644 --- a/src/Factory/ConfigFactory.php +++ b/src/Factory/ConfigFactory.php @@ -2,6 +2,7 @@ namespace Friendica\Factory; +use Exception; use Friendica\Core\Config; use Friendica\Core\Config\Cache; use Friendica\Model\Config\Config as ConfigModel; @@ -14,6 +15,8 @@ class ConfigFactory * @param ConfigFileLoader $loader The Config Cache loader (INI/config/.htconfig) * * @return Cache + * + * @throws Exception */ public function createCache(ConfigFileLoader $loader) { diff --git a/src/Model/APContact.php b/src/Model/APContact.php index 2296205d3..dd27daf10 100644 --- a/src/Model/APContact.php +++ b/src/Model/APContact.php @@ -8,7 +8,6 @@ namespace Friendica\Model; use Friendica\Content\Text\HTML; use Friendica\Core\Logger; -use Friendica\Core\Config; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Protocol\ActivityPub; diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 9b8f98c78..08c67f8ef 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -6,7 +6,6 @@ namespace Friendica\Model; use Friendica\App\BaseURL; use Friendica\Content\Pager; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; diff --git a/src/Model/GContact.php b/src/Model/GContact.php index b029cd40d..206e7049d 100644 --- a/src/Model/GContact.php +++ b/src/Model/GContact.php @@ -8,7 +8,6 @@ namespace Friendica\Model; use DOMDocument; use DOMXPath; use Exception; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\System; diff --git a/src/Model/GServer.php b/src/Model/GServer.php index 34bb8559c..d113f0ace 100644 --- a/src/Model/GServer.php +++ b/src/Model/GServer.php @@ -8,7 +8,6 @@ namespace Friendica\Model; use DOMDocument; use DOMXPath; -use Friendica\Core\Config; use Friendica\Core\Protocol; use Friendica\Core\Worker; use Friendica\Database\DBA; diff --git a/src/Model/Item.php b/src/Model/Item.php index 7c4962690..9f2f45e74 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -8,7 +8,6 @@ namespace Friendica\Model; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; diff --git a/src/Model/Photo.php b/src/Model/Photo.php index 0546b14c1..804ae328e 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -7,7 +7,6 @@ namespace Friendica\Model; use Friendica\Core\Cache\Duration; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\System; use Friendica\Database\DBA; diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 77e347183..341727cee 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -11,7 +11,6 @@ use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; use Friendica\Content\Widget\ContactBlock; use Friendica\Core\Cache\Duration; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; diff --git a/src/Model/User.php b/src/Model/User.php index 65c11258f..0e8d11f73 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -9,7 +9,6 @@ namespace Friendica\Model; use DivineOmega\PasswordExposed; use Exception; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; diff --git a/src/Module/Admin/Blocklist/Server.php b/src/Module/Admin/Blocklist/Server.php index 652439efc..6c0788599 100644 --- a/src/Module/Admin/Blocklist/Server.php +++ b/src/Module/Admin/Blocklist/Server.php @@ -2,7 +2,6 @@ namespace Friendica\Module\Admin\Blocklist; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Module\BaseAdminModule; diff --git a/src/Module/Admin/DBSync.php b/src/Module/Admin/DBSync.php index e4382319c..c342db93b 100644 --- a/src/Module/Admin/DBSync.php +++ b/src/Module/Admin/DBSync.php @@ -2,7 +2,6 @@ namespace Friendica\Module\Admin; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\Core\Update; use Friendica\Database\DBA; diff --git a/src/Module/Admin/Features.php b/src/Module/Admin/Features.php index b73e35f54..ed5abec95 100644 --- a/src/Module/Admin/Features.php +++ b/src/Module/Admin/Features.php @@ -3,7 +3,6 @@ namespace Friendica\Module\Admin; use Friendica\Content\Feature; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Module\BaseAdminModule; diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php index 58b837ed8..0d83cc41a 100644 --- a/src/Module/Admin/Federation.php +++ b/src/Module/Admin/Federation.php @@ -2,7 +2,6 @@ namespace Friendica\Module\Admin; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; diff --git a/src/Module/Admin/Logs/Settings.php b/src/Module/Admin/Logs/Settings.php index b4c1864ff..6b3f2027d 100644 --- a/src/Module/Admin/Logs/Settings.php +++ b/src/Module/Admin/Logs/Settings.php @@ -2,7 +2,6 @@ namespace Friendica\Module\Admin\Logs; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Module\BaseAdminModule; diff --git a/src/Module/Admin/Logs/View.php b/src/Module/Admin/Logs/View.php index 9921b943d..a6607829d 100644 --- a/src/Module/Admin/Logs/View.php +++ b/src/Module/Admin/Logs/View.php @@ -2,7 +2,6 @@ namespace Friendica\Module\Admin\Logs; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Module\BaseAdminModule; diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index 035c7c6e0..131ebb88e 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -3,7 +3,6 @@ namespace Friendica\Module\Admin; use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\Core\Search; use Friendica\Core\Theme; diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php index e5adc2718..234a49b41 100644 --- a/src/Module/Admin/Summary.php +++ b/src/Module/Admin/Summary.php @@ -3,7 +3,7 @@ namespace Friendica\Module\Admin; use Friendica\Core\Addon; -use Friendica\Core\Config; +use Friendica\Core\Config\Cache; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Core\Update; @@ -110,7 +110,7 @@ class Summary extends BaseAdminModule // check legacy basepath settings $configLoader = new ConfigFileLoader($a->getBasePath()); - $configCache = new Config\Cache(); + $configCache = new Cache(); $configLoader->setupCache($configCache); $confBasepath = $configCache->get('system', 'basepath'); $currBasepath = DI::config()->get('system', 'basepath'); diff --git a/src/Module/Admin/Themes/Index.php b/src/Module/Admin/Themes/Index.php index 182906c2e..c6c86b0a9 100644 --- a/src/Module/Admin/Themes/Index.php +++ b/src/Module/Admin/Themes/Index.php @@ -2,7 +2,6 @@ namespace Friendica\Module\Admin\Themes; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\Core\Theme; use Friendica\DI; diff --git a/src/Module/Admin/Tos.php b/src/Module/Admin/Tos.php index aa819fe41..4c4f31b65 100644 --- a/src/Module/Admin/Tos.php +++ b/src/Module/Admin/Tos.php @@ -2,7 +2,6 @@ namespace Friendica\Module\Admin; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Module\BaseAdminModule; diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php index 41ccb9752..c4a30abd6 100644 --- a/src/Module/Admin/Users.php +++ b/src/Module/Admin/Users.php @@ -3,7 +3,6 @@ namespace Friendica\Module\Admin; use Friendica\Content\Pager; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; diff --git a/src/Module/Apps.php b/src/Module/Apps.php index 84a36295a..445db070b 100644 --- a/src/Module/Apps.php +++ b/src/Module/Apps.php @@ -4,7 +4,6 @@ namespace Friendica\Module; use Friendica\BaseModule; use Friendica\Content\Nav; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\DI; diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php index 48854136b..199c47ac6 100644 --- a/src/Module/Contact/Hovercard.php +++ b/src/Module/Contact/Hovercard.php @@ -3,7 +3,6 @@ namespace Friendica\Module\Contact; use Friendica\BaseModule; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\Core\Session; use Friendica\Database\DBA; diff --git a/src/Module/Group.php b/src/Module/Group.php index ead70c333..beeb6dfa0 100644 --- a/src/Module/Group.php +++ b/src/Module/Group.php @@ -6,7 +6,6 @@ namespace Friendica\Module; use Friendica\BaseModule; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Database\DBA; diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php index cac1fbd91..21f2698b7 100644 --- a/src/Module/Inbox.php +++ b/src/Module/Inbox.php @@ -6,9 +6,7 @@ namespace Friendica\Module; use Friendica\BaseModule; -use Friendica\Core\Config; use Friendica\Core\Logger; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Protocol\ActivityPub; diff --git a/src/Module/Profile.php b/src/Module/Profile.php index e1903b8c5..97c108841 100644 --- a/src/Module/Profile.php +++ b/src/Module/Profile.php @@ -7,7 +7,6 @@ use Friendica\Content\Nav; use Friendica\Content\Pager; use Friendica\Content\Widget; use Friendica\Core\ACL; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Session; use Friendica\Core\System; diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php index ce9234da7..09691100a 100644 --- a/src/Module/Profile/Contacts.php +++ b/src/Module/Profile/Contacts.php @@ -6,7 +6,6 @@ use Friendica\BaseModule; use Friendica\Content\ContactSelector; use Friendica\Content\Nav; use Friendica\Content\Pager; -use Friendica\Core\Config; use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\Core\Session; diff --git a/src/Module/Register.php b/src/Module/Register.php index 4f12a8985..8a92b2508 100644 --- a/src/Module/Register.php +++ b/src/Module/Register.php @@ -4,7 +4,6 @@ namespace Friendica\Module; use Friendica\BaseModule; use Friendica\Content\Text\BBCode; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php index 737513983..69646fd1b 100644 --- a/src/Module/Search/Index.php +++ b/src/Module/Search/Index.php @@ -7,7 +7,6 @@ use Friendica\Content\Pager; use Friendica\Content\Text\HTML; use Friendica\Content\Widget; use Friendica\Core\Cache\Duration; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Core\Session; diff --git a/src/Module/Security/Login.php b/src/Module/Security/Login.php index 6c6b341fa..431781758 100644 --- a/src/Module/Security/Login.php +++ b/src/Module/Security/Login.php @@ -7,7 +7,6 @@ namespace Friendica\Module\Security; use Friendica\BaseModule; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Renderer; use Friendica\Core\Session; diff --git a/src/Module/Tos.php b/src/Module/Tos.php index 05af490da..b907b7696 100644 --- a/src/Module/Tos.php +++ b/src/Module/Tos.php @@ -9,7 +9,6 @@ namespace Friendica\Module; use Friendica\BaseModule; -use Friendica\Core\Config; use Friendica\Core\Renderer; use Friendica\Content\Text\BBCode; use Friendica\DI; diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php index ff639adf2..cc41d4c6d 100644 --- a/src/Network/FKOAuthDataStore.php +++ b/src/Network/FKOAuthDataStore.php @@ -9,7 +9,6 @@ namespace Friendica\Network; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Database\DBA; use Friendica\DI; diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 7f6c4d044..4cd32b91a 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -12,7 +12,6 @@ namespace Friendica\Network; use DOMDocument; use DomXPath; use Friendica\Core\Cache\Duration; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Database\DBA; diff --git a/src/Object/Image.php b/src/Object/Image.php index 9b725eab7..c3585d7cd 100644 --- a/src/Object/Image.php +++ b/src/Object/Image.php @@ -6,7 +6,6 @@ namespace Friendica\Object; use Exception; -use Friendica\Core\Config; use Friendica\Core\System; use Friendica\DI; use Friendica\Util\Images; diff --git a/src/Object/Post.php b/src/Object/Post.php index 5d3ed67a9..d76242055 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -7,7 +7,6 @@ namespace Friendica\Object; use Friendica\Content\ContactSelector; use Friendica\Content\Feature; use Friendica\Core\Addon; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index 53995fdde..0d6991c07 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -6,7 +6,6 @@ namespace Friendica\Protocol\ActivityPub; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Database\DBA; diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index adb38e843..c9d39dede 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -8,7 +8,6 @@ use Friendica\Content\Feature; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\Plaintext; use Friendica\Core\Cache\Duration; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\System; diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index fe362839f..f649df558 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -14,7 +14,6 @@ use Friendica\App\BaseURL; use Friendica\Content\OEmbed; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 31c7ccf21..3b946e702 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -14,7 +14,6 @@ use Friendica\Content\Feature; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\Markdown; use Friendica\Core\Cache\Duration; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\System; diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index f75b60f0d..225c2ec2b 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -9,7 +9,6 @@ use DOMXPath; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; use Friendica\Core\Cache\Duration; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Database\DBA; diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php index 138c39f5a..58b9d7387 100644 --- a/src/Protocol/PortableContact.php +++ b/src/Protocol/PortableContact.php @@ -9,26 +9,18 @@ namespace Friendica\Protocol; -use DOMDocument; -use DOMXPath; use Exception; use Friendica\Content\Text\HTML; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; -use Friendica\Model\Contact; use Friendica\Model\GContact; use Friendica\Model\GServer; -use Friendica\Model\Profile; -use Friendica\Module\Register; -use Friendica\Network\Probe; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; use Friendica\Util\Strings; -use Friendica\Util\XML; class PortableContact { diff --git a/src/Util/Crypto.php b/src/Util/Crypto.php index 628b45f89..3ac1c3b23 100644 --- a/src/Util/Crypto.php +++ b/src/Util/Crypto.php @@ -6,7 +6,6 @@ namespace Friendica\Util; use ASN_BASE; use ASNValue; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\System; diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php index efd595877..41835b660 100644 --- a/src/Util/Emailer.php +++ b/src/Util/Emailer.php @@ -4,7 +4,6 @@ */ namespace Friendica\Util; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\DI; diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php index 7d118d26c..22ac0203f 100644 --- a/src/Util/ExAuth.php +++ b/src/Util/ExAuth.php @@ -34,7 +34,6 @@ namespace Friendica\Util; -use Friendica\Core\Config; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\User; diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php index 48ed2846e..a4b84f336 100644 --- a/src/Util/HTTPSignature.php +++ b/src/Util/HTTPSignature.php @@ -6,7 +6,6 @@ namespace Friendica\Util; use Friendica\Database\DBA; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\DI; use Friendica\Model\User; diff --git a/src/Util/Network.php b/src/Util/Network.php index bc0556e89..e2cfc3e84 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -6,7 +6,6 @@ namespace Friendica\Util; use DOMDocument; use DomXPath; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\System; diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php index c40288433..6bc227591 100644 --- a/src/Util/Proxy.php +++ b/src/Util/Proxy.php @@ -2,7 +2,6 @@ namespace Friendica\Util; -use Friendica\Core\Config; use Friendica\DI; /** diff --git a/src/Worker/CheckVersion.php b/src/Worker/CheckVersion.php index 4ece4cb9b..bdd44a300 100644 --- a/src/Worker/CheckVersion.php +++ b/src/Worker/CheckVersion.php @@ -7,7 +7,6 @@ **/ namespace Friendica\Worker; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Database\DBA; use Friendica\DI; diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php index 559085be2..763aa98f3 100644 --- a/src/Worker/Cron.php +++ b/src/Worker/Cron.php @@ -5,7 +5,6 @@ namespace Friendica\Worker; use Friendica\Core\Addon; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php index 48b4923c7..83c85fa44 100644 --- a/src/Worker/CronJobs.php +++ b/src/Worker/CronJobs.php @@ -5,10 +5,8 @@ namespace Friendica\Worker; use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Core\StorageManager; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\Database\PostUpdate; diff --git a/src/Worker/DBClean.php b/src/Worker/DBClean.php index 402a70d06..04fe09faa 100644 --- a/src/Worker/DBClean.php +++ b/src/Worker/DBClean.php @@ -6,7 +6,6 @@ namespace Friendica\Worker; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Worker; use Friendica\Database\DBA; diff --git a/src/Worker/DBUpdate.php b/src/Worker/DBUpdate.php index 83c9fd323..e0ab07540 100644 --- a/src/Worker/DBUpdate.php +++ b/src/Worker/DBUpdate.php @@ -5,7 +5,6 @@ */ namespace Friendica\Worker; -use Friendica\Core\Config; use Friendica\Core\Update; use Friendica\DI; diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 19035ac0a..f864200a3 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -4,7 +4,6 @@ */ namespace Friendica\Worker; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Database\DBA; diff --git a/src/Worker/Directory.php b/src/Worker/Directory.php index 88a11a321..4d5393dd8 100644 --- a/src/Worker/Directory.php +++ b/src/Worker/Directory.php @@ -6,7 +6,6 @@ namespace Friendica\Worker; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Worker; diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php index 153e74308..908eea3ac 100644 --- a/src/Worker/Expire.php +++ b/src/Worker/Expire.php @@ -6,7 +6,6 @@ namespace Friendica\Worker; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Worker; diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index 5585546ce..d8c424ed0 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -4,7 +4,6 @@ */ namespace Friendica\Worker; -use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; @@ -24,7 +23,6 @@ use Friendica\Protocol\ActivityPub; use Friendica\Protocol\Diaspora; use Friendica\Protocol\OStatus; use Friendica\Protocol\Salmon; -use Friendica\Util\ACLFormatter; require_once 'include/items.php'; diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index 812fa3626..8dbb9a473 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -4,7 +4,6 @@ */ namespace Friendica\Worker; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Database\DBA; diff --git a/src/Worker/SearchDirectory.php b/src/Worker/SearchDirectory.php index 9bae4443f..cf4ddc609 100644 --- a/src/Worker/SearchDirectory.php +++ b/src/Worker/SearchDirectory.php @@ -5,7 +5,6 @@ namespace Friendica\Worker; use Friendica\Core\Cache\Duration; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Search; diff --git a/src/Worker/UpdateGContacts.php b/src/Worker/UpdateGContacts.php index 98ec56c48..72136ec0a 100644 --- a/src/Worker/UpdateGContacts.php +++ b/src/Worker/UpdateGContacts.php @@ -4,7 +4,6 @@ */ namespace Friendica\Worker; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Worker; diff --git a/src/Worker/UpdateServerDirectories.php b/src/Worker/UpdateServerDirectories.php index b6b4cb7b3..d00a6f6c9 100644 --- a/src/Worker/UpdateServerDirectories.php +++ b/src/Worker/UpdateServerDirectories.php @@ -4,8 +4,6 @@ */ namespace Friendica\Worker; -use Friendica\Core\Config; -use Friendica\Core\Logger; use Friendica\DI; use Friendica\Model\GContact; use Friendica\Model\GServer; diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php index 60008d0db..aea03e76a 100644 --- a/tests/src/Database/DBATest.php +++ b/tests/src/Database/DBATest.php @@ -2,7 +2,6 @@ namespace Friendica\Test\src\Database; use Dice\Dice; -use Friendica\Core\Config; use Friendica\Database\Database; use Friendica\Database\DBA; use Friendica\DI; diff --git a/update.php b/update.php index a038edf21..4d12730fa 100644 --- a/update.php +++ b/update.php @@ -1,7 +1,6 @@