Remove unneeded Config namespace usages

diff --git a/bin/daemon.php b/bin/daemon.php
index 0536814b9a25a2f1b74eae3a770a2c477a66a47b..27edbfee0c2d6d23349c3cf8f6dd4bff7b035a1f 100755 (executable)
--- 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 bb71673955a62d48dab6e03d6b8e16405414e7f0..106c9b81f17ece58c7977f88b2803f7e57fcd393 100755 (executable)
--- 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 5f8f3a3be3494a9929e7b921eb28d49b318949c7..4e1249e197ce14bfb2d2f6bc58c3a43ea9ecafdc 100644 (file)
--- 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 039275f20e8f6e58f5ffc1fd671d0e4a9b5d85df..92b4e4b218548ae72ef04ca610e3bab14b245a53 100644 (file)
--- 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 5e8018d723143bc5cdc470d160f1fe5aaf2d55d6..264fa6ceb4d56603edb4168a1abeb17d6374e313 100644 (file)
--- 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 8a21adbdf0cd6a729744accaaa4c98a62b590620..4bd9eb6967e1a51fcb476e386f0ae185bc951ef0 100644 (file)
--- 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 5d10dd35d5a2841f1a46ae1b948f7f54da54e2fe..2230c93c77209a3d87460895c4b61be9bacca760 100644 (file)
--- 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 48a1e4d46ed0031fcb3adb3fa2f32365af485f0e..8114d2786101fdb4763051f207c6acf94dbd3f0c 100644 (file)
--- 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 d8140cf4104a125d82baae3326cb7ed81779050e..cf0e498d56ea714ea8a0dccedcffc3b059f584b7 100644 (file)
--- 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 9d1fe0f7fb4b84d02866849623602dbe56088a6c..61922ef88a08dae0027e738ece63022e6dc99b12 100644 (file)
--- 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 57da284c8151cb0fe11bb3086ff01110b1dcab53..aec1b6047118312149e219a97676417c91941e49 100644 (file)
--- 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 994c39cdd59abca51f7c48967e763afd614c1e17..60a96a92664e84fd5cdacc38b94e7dd9a4bb9260 100644 (file)
--- 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 36e520c0d2c36a49057030a9af64a83facd670cf..a08fe1b48a50d849bec56b4de66dcaa284c0d0b9 100644 (file)
--- 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 74e2d894679968c29db005f82e6d75a36428ae6e..c444f0389d7c5dd1da257a501649cb35e9bdbb58 100644 (file)
--- 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 ca328206919f2ad78080bb95642710bdbe8cc650..e29109160ac84363e4a4f8e51f286191051c6275 100644 (file)
--- 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 56836beff14c220c4fa2d454391f3bea88f59c90..f06b98dd4aa0ea721400b238daee19d56abd06f4 100644 (file)
--- 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 276a389e837b4c1f8f7833a65601a72afd0e1f36..8956bd5768d05ca727b186eb7c71aa812d5e072b 100644 (file)
--- 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 3661dc81d124eb8c82084dae12964e52cb38d510..a9c5d43580794d660e7fa2a83099c994bd36c6a4 100644 (file)
--- 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 479b5c901b40fc362367f201eee79c31b158446e..59426a1af8980f2e39758d53c89d34ef81bea746 100644 (file)
--- 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 0805af7c5655095fd6ff008f9a0d6cb63b76561d..b262bfd11590519489ce6bc1286c0d2e65912f27 100644 (file)
--- 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 9b8a0bc5742d25579b55665933b57cc77afc9474..db6d8eaf4516f48f8e8f84dc60c33c1e30b1ca49 100644 (file)
--- 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 50e18db47da452afb0310bde376d6fe61105a62f..c2fb8256968193ea9ecd95ad20523578043ae5a7 100644 (file)
--- 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 614900ec195a0bc84df08850fa545c9c11e9615b..4890197074ca93ecc780364d5d10310aa07bd1d3 100644 (file)
--- 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 a100ceffbde6e5eb10e06c14ae76ac4a46c970a0..8e7d63418afba2271c32b294fa15a2cef2240277 100644 (file)
--- 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 e87e44e05bb2489056a43444f1e297d090475db7..d34c78363c32f28d0e15a1336ba495ffba089c0b 100644 (file)
--- 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 8b1cc5a30d043a89eb83da4a42950ad3e29d22a5..551ae54f9b46fa5a459687489383fc71e0b1867d 100644 (file)
--- 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 33c958cae7ef0eb19cbdb126fa162fdd7435e4d5..f17d1d66b7bcccdf963fc4e0d4a454e5a47f5784 100644 (file)
--- 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 cdf6b8ee4c49a943a1c1d8fd9b4fdc669bb5faf6..2ffaaf729efedcb5cb42cccd6b496b83a41a86c1 100644 (file)
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -1,7 +1,6 @@
 <?php
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;

diff --git a/mod/regmod.php b/mod/regmod.php
index a7be3144491b8a352a1c8ab5737a7c22b1df1af7..a3039b79845d88e2d4561f9a3e4a7be2c2673977 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;

diff --git a/mod/removeme.php b/mod/removeme.php
index 8f427f3d58f2cc411ab3fc6d01f29a7bd6250d3a..48d4e0e0fe320b18ada2cf7f19a29a04ceaedf44 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.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/settings.php b/mod/settings.php
index 85fc6e1b80def61329532e2dd47dea06f8764cb4..00991d891988c7fd1f5df4094d773f2f3ab59bb1 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -8,7 +8,6 @@ use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Core\ACL;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;

diff --git a/mod/uimport.php b/mod/uimport.php
index 64eff338d2a8af8637b41a9d307a6bf71e450c27..a727e13df429bbac72e6f6e9dabbc806b3ff8644 100644 (file)
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -5,7 +5,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\UserImport;
 use Friendica\Core\Renderer;

diff --git a/mod/videos.php b/mod/videos.php
index c14f4cfb7ce06561414e7d84b04995df63f96a13..a7181d4e78aade725eac94e3b57adfc5d2c75393 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -6,7 +6,6 @@
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 8fd274a0175f21df65dce9a7581afec1d1a30e60..bb5128137f5d6be5f5ce11741b94de337d90a20b 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index eed355069337203735626e1c7c78a03ff4fb2c8f..b7504bede1f3740c92318de157c9e793f04783a2 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -9,7 +9,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;

diff --git a/mod/worker.php b/mod/worker.php
index 5c291ad0bafaec48c5f678ba1f6ddc66fb739c5d..2ebd463a765188669cd00209e1ae2a01b8c07e04 100644 (file)
--- a/mod/worker.php
+++ b/mod/worker.php
@@ -4,7 +4,6 @@
  * Module for running the worker as frontend process
  */
 
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;

diff --git a/src/Api/Entity/Mastodon/Instance.php b/src/Api/Entity/Mastodon/Instance.php
index 453abd1c7c4638be3a2b06da50620df5f70d8fe9..b122f783593c184677686315ebaa68bc4cf506f0 100644 (file)
--- a/src/Api/Entity/Mastodon/Instance.php
+++ b/src/Api/Entity/Mastodon/Instance.php
@@ -3,7 +3,6 @@
 namespace Friendica\Api\Entity\Mastodon;
 
 use Friendica\Api\BaseEntity;
-use Friendica\Core\Config;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;

diff --git a/src/Api/Entity/Mastodon/Stats.php b/src/Api/Entity/Mastodon/Stats.php
index 72a2849acace8031035f8e05b3b120fdb02d1e9f..16c9893a3bf7ac86957e8afd368ed6ddef9e08cb 100644 (file)
--- a/src/Api/Entity/Mastodon/Stats.php
+++ b/src/Api/Entity/Mastodon/Stats.php
@@ -3,7 +3,6 @@
 namespace Friendica\Api\Entity\Mastodon;
 
 use Friendica\Api\BaseEntity;
-use Friendica\Core\Config;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;

diff --git a/src/Console/AutomaticInstallation.php b/src/Console/AutomaticInstallation.php
index f93b50c1e2cf4cb8e2496e2e48e795f628828dc5..a8e32b498b8eb35b1d025b6ca1718d8d02531e11 100644 (file)
--- a/src/Console/AutomaticInstallation.php
+++ b/src/Console/AutomaticInstallation.php
@@ -5,7 +5,8 @@ namespace Friendica\Console;
 use Asika\SimpleConsole\Console;
 use Friendica\App;
 use Friendica\App\BaseURL;
-use Friendica\Core\Config;
+use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Cache;
 use Friendica\Core\Installer;
 use Friendica\Core\Theme;
 use Friendica\Database\Database;
@@ -15,23 +16,13 @@ use RuntimeException;
 
 class AutomaticInstallation extends Console
 {
-       /**
-        * @var App\Mode
-        */
+       /** @var App\Mode */
        private $appMode;
-       /**
-        * @var \Friendica\Core\Config\Cache
-        */
+       /** @var Cache */
        private $configCache;
-
-       /**
-        * @var Config\IConfig
-        */
+       /** @var IConfig */
        private $config;
-
-       /**
-        * @var Database
-        */
+       /** @var Database */
        private $dba;
 
        protected function getHelp()
@@ -89,14 +80,14 @@ Examples
 HELP;
        }
 
-       public function __construct(App\Mode $appMode, Config\Cache $configCache, Config\IConfig $config, Database $dba, array $argv = null)
+       public function __construct(App\Mode $appMode, Cache $configCache, IConfig $config, Database $dba, array $argv = null)
        {
                parent::__construct($argv);
 
-               $this->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 4d89170d61f36f1d8f135138722e6c9c53359dd1..91a319677f40cb93fc94ca79e7814d9df571764c 100644 (file)
--- 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 64e4c79c4d0679d9eafba566d15c47bf360a1c81..6b4de60361090b27373e4c36aedfe0fd186fae29 100644 (file)
--- 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 a92898b3c0e64eff24a0b75124fc28c08ea0eabb..14253b490ca34067c56168252192cbc97025c34a 100644 (file)
--- 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 5e87fd86cc1b45395a297283d86bfd36318c7d3f..7a42f9ba47c16c64a66d3b91e1defc1c3c4985f9 100644 (file)
--- 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 1bcd7b09a76da6b7e89d45eee2e3026c8c394383..f8b9fb29851d3df13abe2139a87c59d00cd43fc2 100644 (file)
--- 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 38814e0ca13b77bbc210d4947467937d8885f387..bae0cb854c6602498cf64a4af59e78d4f0690156 100644 (file)
--- 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 1aa26fdd407ca111750655b7856546011f091402..a38b9a305102d4bd16fc1067f77222743d927f06 100644 (file)
--- 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 18832b8e505c6416e3c5737decb1f03aa02bd90f..686f0582c98a06df9b6cc2127ac4feccf88719f2 100644 (file)
--- 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 44e203ab49a4d045f23a187233cd06f0ca337017..64737f604f831e1aba747751c27359969c1e4aef 100644 (file)
--- 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 585d6eb7eed192f9acf9b84ae7ed919ca7b60e02..578f3191cd354a9bb4b303684d98d33a887d82b8 100644 (file)
--- 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 2296205d3c15973bfa8d9defadc466667a2d230f..dd27daf10d36374d803730264db0638b8b4d684c 100644 (file)
--- 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 9b8f98c78dd5300a4d3f9d0f813b2b8c07745701..08c67f8efadd0f327011839583134cf673d0ea9a 100644 (file)
--- 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 b029cd40d142d2e4bba28957a71591fea8345cb2..206e7049d08dc30b257d33469874571008a245c8 100644 (file)
--- 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 34bb8559c6cc6cbb7f7377853184ada02869066a..d113f0ace472b594ca114506bf388a809c470f03 100644 (file)
--- 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 7c496269060c4e4f7c87c708a3c74217932ee4cb..9f2f45e74a28eb2cdaebe8a4300c39e9d7b7d6fe 100644 (file)
--- 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 0546b14c1f735f3ed0ad03a2efb5c2d72136af69..804ae328ef4d06a5eb58889d4aea45c356266b73 100644 (file)
--- 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 77e3471831b80155ac4b81986e115ae6d75d38a7..341727ceef4f6c84427705f4bcf03faa8ab988da 100644 (file)
--- 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 65c11258ff4e87a99c11a90c6086d7af395bdea6..0e8d11f7339e461d8f52c3222be36a220325eb3e 100644 (file)
--- 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 652439efccdf2f2d15c233056a8660cad86181b9..6c07885993b1c54d5aab2c5a57f2ffa0c1c2bc14 100644 (file)
--- 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 e4382319c95ce2f766bdd6bcf67685e971f91483..c342db93b426bde2641533e39d9716e85407f189 100644 (file)
--- 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 b73e35f54993ade1a0b6a1f508843287a21620eb..ed5abec95a1daecd7e0cac23692cd007d4d79d5a 100644 (file)
--- 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 58b837ed8909a92871326dfc998d85bab39b376d..0d83cc41a1e2507337158a4dbd2b9b333feae2a3 100644 (file)
--- 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 b4c1864ff6892428b404980d5c0d4b871f85f3b3..6b3f2027dc18e5d32cdf0045bce820b878408ab4 100644 (file)
--- 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 9921b943dbbb41bac29a9f4cd7018799e8081a26..a6607829de50aff6381e9fa7d1321f2b263a5922 100644 (file)
--- 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 035c7c6e0c1a2cbd27e0eb5f36a910fb1f468caf..131ebb88ef5146cff40a619ce1158b9d845d0d0c 100644 (file)
--- 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 e5adc271866dffc86d33ff0092acab3add85317c..234a49b410d4591fb163e9de3e148499e643623a 100644 (file)
--- 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 182906c2ef453149e928d52bd69cb2eecb532acb..c6c86b0a9992fc982c426ff0252f836c67707e4d 100644 (file)
--- 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 aa819fe41a87f2c9ff2f4fbfca65023450f935b9..4c4f31b655751c3781939ffb809f2722979cf257 100644 (file)
--- 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 41ccb97528b2d83c068e339d3e88af48f8f0c768..c4a30abd65ebe627c2ee6b5c67e910e58958ab2c 100644 (file)
--- 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 84a36295a5202857b48bb7e9f086e2b40bb6a4a2..445db070b90e25dee3167c0d599e0c6b618f70bf 100644 (file)
--- 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 48854136b3140b01171b673e870e25194d0e8bf2..199c47ac6e1bc4b368852164abcb94d5de7717e7 100644 (file)
--- 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 ead70c333ec6ccb637e107862c4d87e2df94042a..beeb6dfa0c797e7497cc163e991884859b3841c3 100644 (file)
--- 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 cac1fbd919d5236a589699007b6dd0e8f9301286..21f2698b7c8f7de2e387c495a051de20656a8bc1 100644 (file)
--- 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 e1903b8c55f3ba985f3196a9849aaa4d570ad137..97c108841c623ef0af4fb6a66a946e60ecc48fe2 100644 (file)
--- 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 ce9234da7328033d4a7e508c380510d4c4ed2cd3..09691100aa4597dcfae605ffa923dc7a8cf5aeff 100644 (file)
--- 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 4f12a898555b8eed71fd7dfbd97c4cc9ff6a0deb..8a92b250882e846f7fee46ef2eb2f28d15cf3084 100644 (file)
--- 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 737513983c3e846f9fc9aae77d2e2b466caf0529..69646fd1bd0a6bf0c8631993832093e205157b12 100644 (file)
--- 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 6c6b341face1666d4ddbbb39dec86a9c66defbc8..431781758bccb52dddde9dc4ffc3da5a4ffc75a5 100644 (file)
--- 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 05af490da68f77e5e2e53ad8badb7219ab3b7b4e..b907b7696698385bdff609b5f51228e73fc762d2 100644 (file)
--- 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 ff639adf27588bc266959f12fdca22d03ff981f0..cc41d4c6d5cb5563f00504c41ec3821aa818c570 100644 (file)
--- 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 7f6c4d0448afa7825ebb301181111bc3cf4235ef..4cd32b91aea7c13474884e6cd6357d30bfab2c73 100644 (file)
--- 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 9b725eab759b759a21c4e929cffc95449ff8118b..c3585d7cd2203d75e38714c1c855ead8a9854d24 100644 (file)
--- 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 5d3ed67a9fcad234b980c44610e1806a8c404dc2..d7624205512eed7aab78896efa9a0f8754bdfcef 100644 (file)
--- 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 53995fdde699c251476d0fc08266fd45e1e3c727..0d6991c07262d8e6500cf0422a1411acdf4148d1 100644 (file)
--- 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 adb38e8432991877f7dbaf9c69b9bf4faea61040..c9d39dede7952cf7c02d08cbbadbbf382385c805 100644 (file)
--- 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 fe362839f3419c8ce328f44f1e9f01ef9f4f7ef2..f649df558f2690149ddb39a67c5499291d3250ce 100644 (file)
--- 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 31c7ccf21cbfc47f610bc8403a84b59a309b5091..3b946e702ba0ae2f44fdd4b6b74790f4421909ce 100644 (file)
--- 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 f75b60f0d1145b3f49bc6d265e3f6e6ad9a018ac..225c2ec2b447c5341af3237909c7076bd61c46be 100644 (file)
--- 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 138c39f5a70ba7d0746d8fc0373cc5244d6c355a..58b9d738746e2debd3c55233d6420e055b9fd520 100644 (file)
--- 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 628b45f89b6c19b59896a1e3a78684aa3551939e..3ac1c3b231640e82d024c51d0c60047c14db0097 100644 (file)
--- 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 efd5958776dae1efefe6392db284ae7a13905aa9..41835b6609b7abe210cb91836645d71d1df2ee3f 100644 (file)
--- 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 7d118d26ca21c66636acb26e069a57caf54f5b83..22ac0203f73dba7b6f0ae1989c6d0d3e6d8157b0 100644 (file)
--- 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 48ed2846e8c69785c046dbe461adc56d917e2ac4..a4b84f3368520d6dba608619a4e04f55aa6f5b93 100644 (file)
--- 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 bc0556e89305575ac3bd5d44d6c56440fd6815c0..e2cfc3e849a69952d1d5e13a8f29eba2674f6305 100644 (file)
--- 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 c402884333fd7bb5af8c6225ff5fcde8077df248..6bc227591d3cc0ad001a0f1855b350cb1aabd618 100644 (file)
--- 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 4ece4cb9b325d3c12699d7ca27f9d418ba0cc2e7..bdd44a300ede1861f4683faf6d963ab04dbc6ba3 100644 (file)
--- 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 559085be24a1a48f12e2e2d2fafc35b2aaa7a593..763aa98f3486731a0f51a0e160cee0bb8d33470b 100644 (file)
--- 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 48b4923c76abfd0fff2673def260284c1f08d901..83c85fa440f55706787571a877492901122b82b8 100644 (file)
--- 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 402a70d06f34a688be36e2a4de8c85dcc5637410..04fe09faad153501e43814b30e425161d68421a4 100644 (file)
--- 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 83c9fd32323b6b947225d9621231ebadb254f451..e0ab07540c064e0213c44df3f6a3e382fa64f3af 100644 (file)
--- 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 19035ac0a3bbd03efa55e358f7da7ef88c840c01..f864200a31422bb1ce3ce69aa99b4e607ef8fe74 100644 (file)
--- 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 88a11a321c8d989872c09dd7b1a2c1db76643025..4d5393dd84dcd27717c2f77b25491804b444c443 100644 (file)
--- 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 153e7430871f544dd7de9343168180736e56a0e0..908eea3ac9cccc350d69f3ff162bcb5f22c5bdcb 100644 (file)
--- 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 5585546ce87bdabf1b1f303b6701b9f481c3102b..d8c424ed036ed5d0310e755206965f4ed9a6d6c7 100644 (file)
--- 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 812fa362623d0c345ccf94bee87888a067a3f0ad..8dbb9a47364dce03a25a76e7e9b7fbf696035533 100644 (file)
--- 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 9bae4443fc011ad3b9811c8ffbc1d934b920132d..cf4ddc609ee6a5d2b3bd3ab0af0af5745ddc54be 100644 (file)
--- 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 98ec56c48483623357f4962257dfc0f78309b7ac..72136ec0a3ef6fe7ce5e881b099934239120cba1 100644 (file)
--- 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 b6b4cb7b349d9b311e57cb1c438656d1d421fe22..d00a6f6c9c6018f4a841ea6b8cefea3b00255606 100644 (file)
--- 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 60008d0db0510982b8cefd0107e7e70d1513b028..aea03e76a2450992a5f328dd98d48d9774431c40 100644 (file)
--- 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 a038edf210dbe8799b66d8f021d3b1a21e20816a..4d12730fab6e5cbf05b486bdef307e3238864f5d 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,7 +1,6 @@
 <?php
 
 use Friendica\Core\Addon;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;

diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php
index 652cea9574c34735cd63b615c411e550061856dc..7d2c3f425685ebfdcab4c50689dab3cdc2ba6c84 100644 (file)
--- a/view/theme/duepuntozero/config.php
+++ b/view/theme/duepuntozero/config.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 

diff --git a/view/theme/duepuntozero/style.php b/view/theme/duepuntozero/style.php
index a3edf813cb1cd063617ae4d362bcabe94dc891c2..47944ec587df28fbf622be918ae0b8966fbecf96 100644 (file)
--- a/view/theme/duepuntozero/style.php
+++ b/view/theme/duepuntozero/style.php
@@ -2,7 +2,6 @@
 /**
  * @file view/theme/duepuntozero/style.php
  */
-use Friendica\Core\Config;
 use Friendica\DI;
 
 if (file_exists("$THEMEPATH/style.css")) {

diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 051ca88db19a0f784810c2a20d989627d4d1eb54..8548899a7dcb823398b3dd6bbe44e5bf81c9fc73 100644 (file)
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -1,7 +1,6 @@
 <?php
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 

diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index 2e76ae261cae6f477bb47b6874a348273fce2385..d0d1c8cb73eb27a3cbc34ce1ef4a6d02e629297b 100644 (file)
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -1,7 +1,6 @@
 <?php
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 

diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
index 6d86eac91cf9c47017542b4d4b6a3c51e8c6e77a..451fdfc5e46fda3cb6d122438d301b68c130d5df 100644 (file)
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -7,7 +7,6 @@
 <!DOCTYPE html >
 <?php
 
-use Friendica\Core\Config;
 use Friendica\DI;
 use Friendica\Model\Profile;
 

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index ed501c8f18405e6f5a4ffc182090b4f9bc04f504..09312897f6c7b688ecfbca1b1d07b3df15655767 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -3,7 +3,6 @@
  * @file view/theme/frio/style.php
  */
 
-use Friendica\Core\Config;
 use Friendica\DI;
 use Friendica\Util\Strings;
 

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 784744427adad7e848adf597a8824c2bb674b754..7e370edc0e70e9d845b69c206b4d85415d0d6d57 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -10,7 +10,6 @@
 use Friendica\App;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Content\Widget;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;

diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php
index 459a0d7f40cb6d6cd26f2c0493d8008d7f8c67a9..64284eaa06ddfdb7181e8ffc4b753fa6e147f478 100644 (file)
--- a/view/theme/quattro/config.php
+++ b/view/theme/quattro/config.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 

diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php
index b282baf88f6b3251f6933ebd0d384b723ad6b5cc..27718da6d2a9a0d79f9aeb7c53165531e86b3403 100644 (file)
--- a/view/theme/quattro/style.php
+++ b/view/theme/quattro/style.php
@@ -2,7 +2,6 @@
 /**
  * @file view/theme/quattro/style.php
  */
-use Friendica\Core\Config;
 use Friendica\DI;
 
 $uid = $_REQUEST['puid'] ?? 0;

diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php
index 2d185be2c88a9fb12b409a2182def05cd1b6de69..5891aa32f454505a6fc3c66c7fa7788e3a05ef45 100644 (file)
--- a/view/theme/vier/config.php
+++ b/view/theme/vier/config.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 

diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index 9231a9016ecc7840af3ada452f12311a608028c0..de58042fac8eee0dccdc955687da0a280c5d02e9 100644 (file)
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -3,7 +3,6 @@
  * @file view/theme/vier/style.php
  */
 use Friendica\Core\Logger;
-use Friendica\Core\Config;
 use Friendica\DI;
 
 $uid = $_REQUEST['puid'] ?? 0;

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 8c1f566671fa64f4f107bc24a4a9da5931fb4521..d4bdc6e313545f15132fe38e76be6ca4bc821bd0 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -12,7 +12,6 @@
 use Friendica\App;
 use Friendica\Content\ForumManager;
 use Friendica\Core\Addon;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;