Remove unneeded Config namespace usages

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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 Cache */
-	 * @var \Friendica\Core\Config\Cache
-	 */
 	private $configCache;
-
+	/** @var IConfig */
-	/**
-	 * @var Config\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->appMode     = $appMode;
-		$this->configCache  =$configCache;
+		$this->configCache = $configCache;
-		$this->config = $config;
+		$this->config      = $config;
-		$this->dba = $dba;
+		$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 Installer $installer   The Installer instance
-	 * @param \Friendica\Core\Config\Cache $configCache The config cache
+	 * @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) {

src/Content/Feature.php

@@ -5,7 +5,6 @@
  */
 namespace Friendica\Content;
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\DI;
 

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;

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;

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;

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;

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;

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;

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;

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;

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)
 	{

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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');

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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
 {

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;

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;

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;

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;

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;

src/Util/Proxy.php

@@ -2,7 +2,6 @@
 
 namespace Friendica\Util;
 
-use Friendica\Core\Config;
 use Friendica\DI;
 
 /**

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;

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;

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;

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;

src/Worker/DBUpdate.php

@@ -5,7 +5,6 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\Core\Config;
 use Friendica\Core\Update;
 use Friendica\DI;
 

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;