Merge remote-tracking branch 'upstream/develop' into error-handling

src/App.php

@@ -25,12 +25,12 @@ use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\App\Module;
-use Friendica\Factory\ConfigFactory;
+use Friendica\Core\Config\Factory\Config;
 use Friendica\Module\Maintenance;
 use Friendica\Security\Authentication;
-use Friendica\Core\Config\Cache;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\Config\ValueObject\Cache;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
@@ -39,7 +39,6 @@ use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
-use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Profiler;
@@ -89,7 +88,7 @@ class App
 	private $currentMobileTheme;
 
 	/**
-	 * @var IConfig The config
+	 * @var IManageConfigValues The config
 	 */
 	private $config;
 
@@ -124,7 +123,7 @@ class App
 	private $process;
 
 	/**
-	 * @var IPConfig
+	 * @var IManagePersonalConfigValues
 	 */
 	private $pConfig;
 
@@ -306,18 +305,18 @@ class App
 	}
 
 	/**
-	 * @param Database        $database The Friendica Database
-	 * @param IConfig         $config   The Configuration
-	 * @param App\Mode        $mode     The mode of this Friendica app
-	 * @param BaseURL         $baseURL  The full base URL of this Friendica app
-	 * @param LoggerInterface $logger   The current app logger
-	 * @param Profiler        $profiler The profiler of this application
-	 * @param L10n            $l10n     The translator instance
-	 * @param App\Arguments   $args     The Friendica Arguments of the call
-	 * @param Core\Process    $process  The process methods
-	 * @param IPConfig        $pConfig  Personal configuration
+	 * @param Database                    $database The Friendica Database
+	 * @param IManageConfigValues         $config   The Configuration
+	 * @param App\Mode                    $mode     The mode of this Friendica app
+	 * @param BaseURL                     $baseURL  The full base URL of this Friendica app
+	 * @param LoggerInterface             $logger   The current app logger
+	 * @param Profiler                    $profiler The profiler of this application
+	 * @param L10n                        $l10n     The translator instance
+	 * @param App\Arguments               $args     The Friendica Arguments of the call
+	 * @param Core\Process                $process  The process methods
+	 * @param IManagePersonalConfigValues $pConfig  Personal configuration
 	 */
-	public function __construct(Database $database, IConfig $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process, IPConfig $pConfig)
+	public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process, IManagePersonalConfigValues $pConfig)
 	{
 		$this->database = $database;
 		$this->config   = $config;
@@ -358,7 +357,7 @@ class App
 			$this->profiler->update($this->config);
 
 			Core\Hook::loadHooks();
-			$loader = (new ConfigFactory())->createConfigFileLoader($this->getBasePath(), $_SERVER);
+			$loader = (new Config())->createConfigFileLoader($this->getBasePath(), $_SERVER);
 			Core\Hook::callAll('load_config', $loader);
 		}
 
@@ -553,16 +552,16 @@ class App
 	 *
 	 * This probably should change to limit the size of this monster method.
 	 *
-	 * @param App\Module     $module The determined module
-	 * @param App\Router     $router
-	 * @param IPConfig       $pconfig
-	 * @param Authentication $auth The Authentication backend of the node
-	 * @param App\Page       $page The Friendica page printing container
+	 * @param App\Module                  $module The determined module
+	 * @param App\Router                  $router
+	 * @param IManagePersonalConfigValues $pconfig
+	 * @param Authentication              $auth The Authentication backend of the node
+	 * @param App\Page                    $page The Friendica page printing container
 	 *
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public function runFrontend(App\Module $module, App\Router $router, IPConfig $pconfig, Authentication $auth, App\Page $page, float $start_time)
+	public function runFrontend(App\Module $module, App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, float $start_time)
 	{
 		$this->profiler->set($start_time, 'start');
 		$this->profiler->set(microtime(true), 'classinit');

src/App/BaseURL.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\App;
 
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\System;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -56,7 +56,7 @@ class BaseURL
 	/**
 	 * The Friendica Config
 	 *
-	 * @var IConfig
+	 * @var IManageConfigValues
 	 */
 	private $config;
 
@@ -272,10 +272,10 @@ class BaseURL
 	}
 
 	/**
-	 * @param IConfig $config The Friendica IConfiguration
-	 * @param array   $server The $_SERVER array
+	 * @param IManageConfigValues $config The Friendica IConfiguration
+	 * @param array               $server The $_SERVER array
 	 */
-	public function __construct(IConfig $config, array $server)
+	public function __construct(IManageConfigValues $config, array $server)
 	{
 		$this->config = $config;
 		$this->server = $server;

src/App/Mode.php

@@ -22,7 +22,7 @@
 namespace Friendica\App;
 
 use Detection\MobileDetect;
-use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Database\Database;
 use Friendica\Util\BasePath;
 

src/App/Module.php

@@ -24,6 +24,7 @@ namespace Friendica\App;
 use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\LegacyModule;
 use Friendica\Module\Home;
 use Friendica\Module\HTTPException\MethodNotAllowed;
@@ -169,15 +170,15 @@ class Module
 	/**
 	 * Determine the class of the current module
 	 *
-	 * @param Arguments           $args   The Friendica execution arguments
-	 * @param Router              $router The Friendica routing instance
-	 * @param Core\Config\IConfig $config The Friendica Configuration
+	 * @param Arguments                                             $args   The Friendica execution arguments
+	 * @param Router                                                $router The Friendica routing instance
+	 * @param IManageConfigValues $config The Friendica Configuration
 	 *
 	 * @return Module The determined module of this call
 	 *
 	 * @throws \Exception
 	 */
-	public function determineClass(Arguments $args, Router $router, Core\Config\IConfig $config)
+	public function determineClass(Arguments $args, Router $router, IManageConfigValues $config)
 	{
 		$printNotAllowedAddon = false;
 

src/App/Page.php

@@ -26,8 +26,8 @@ use DOMDocument;
 use DOMXPath;
 use Friendica\App;
 use Friendica\Content\Nav;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
@@ -190,15 +190,15 @@ class Page implements ArrayAccess
 	 * - Infinite scroll data
 	 * - head.tpl template
 	 *
-	 * @param App      $app     The Friendica App instance
-	 * @param Module   $module  The loaded Friendica module
-	 * @param L10n     $l10n    The l10n language instance
-	 * @param IConfig  $config  The Friendica configuration
-	 * @param IPConfig $pConfig The Friendica personal configuration (for user)
+	 * @param App                         $app     The Friendica App instance
+	 * @param Module                      $module  The loaded Friendica module
+	 * @param L10n                        $l10n    The l10n language instance
+	 * @param IManageConfigValues         $config  The Friendica configuration
+	 * @param IManagePersonalConfigValues $pConfig The Friendica personal configuration (for user)
 	 *
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	private function initHead(App $app, Module $module, L10n $l10n, IConfig $config, IPConfig $pConfig)
+	private function initHead(App $app, Module $module, L10n $l10n, IManageConfigValues $config, IManagePersonalConfigValues $pConfig)
 	{
 		$interval = ((local_user()) ? $pConfig->get(local_user(), 'system', 'update_interval') : 40000);
 
@@ -367,17 +367,17 @@ class Page implements ArrayAccess
 	/**
 	 * Executes the creation of the current page and prints it to the screen
 	 *
-	 * @param App      $app     The Friendica App
-	 * @param BaseURL  $baseURL The Friendica Base URL
-	 * @param Mode     $mode    The current node mode
-	 * @param Module   $module  The loaded Friendica module
-	 * @param L10n     $l10n    The l10n language class
-	 * @param IConfig  $config  The Configuration of this node
-	 * @param IPConfig $pconfig The personal/user configuration
+	 * @param App                         $app     The Friendica App
+	 * @param BaseURL                     $baseURL The Friendica Base URL
+	 * @param Mode                        $mode    The current node mode
+	 * @param Module                      $module  The loaded Friendica module
+	 * @param L10n                        $l10n    The l10n language class
+	 * @param IManageConfigValues         $config  The Configuration of this node
+	 * @param IManagePersonalConfigValues $pconfig The personal/user configuration
 	 *
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public function run(App $app, BaseURL $baseURL, Mode $mode, Module $module, L10n $l10n, Profiler $profiler, IConfig $config, IPConfig $pconfig)
+	public function run(App $app, BaseURL $baseURL, Mode $mode, Module $module, L10n $l10n, Profiler $profiler, IManageConfigValues $config, IManagePersonalConfigValues $pconfig)
 	{
 		$moduleName = $module->getName();
 

src/App/Router.php

@@ -26,11 +26,11 @@ use FastRoute\DataGenerator\GroupCountBased;
 use FastRoute\Dispatcher;
 use FastRoute\RouteCollector;
 use FastRoute\RouteParser\Std;
-use Friendica\Core\Cache\Duration;
-use Friendica\Core\Cache\ICache;
+use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Cache\Capability\ICanCache;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\Lock\ILock;
+use Friendica\Core\Lock\Capability\ICanLock;
 use Friendica\Network\HTTPException;
 
 /**
@@ -77,10 +77,10 @@ class Router
 	/** @var L10n */
 	private $l10n;
 
-	/** @var ICache */
+	/** @var ICanCache */
 	private $cache;
 
-	/** @var ILock */
+	/** @var ICanLock */
 	private $lock;
 
 	/** @var string */
@@ -90,10 +90,10 @@ class Router
 	 * @param array               $server             The $_SERVER variable
 	 * @param string              $baseRoutesFilepath The path to a base routes file to leverage cache, can be empty
 	 * @param L10n                $l10n
-	 * @param ICache              $cache
+	 * @param ICanCache           $cache
 	 * @param RouteCollector|null $routeCollector
 	 */
-	public function __construct(array $server, string $baseRoutesFilepath, L10n $l10n, ICache $cache, ILock $lock, RouteCollector $routeCollector = null)
+	public function __construct(array $server, string $baseRoutesFilepath, L10n $l10n, ICanCache $cache, ICanLock $lock, RouteCollector $routeCollector = null)
 	{
 		$this->baseRoutesFilepath = $baseRoutesFilepath;
 		$this->l10n = $l10n;

src/Console/AutomaticInstallation.php

@@ -24,8 +24,8 @@ namespace Friendica\Console;
 use Asika\SimpleConsole\Console;
 use Friendica\App;
 use Friendica\App\BaseURL;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\Installer;
 use Friendica\Core\Theme;
 use Friendica\Database\Database;
@@ -36,9 +36,9 @@ class AutomaticInstallation extends Console
 {
 	/** @var App\Mode */
 	private $appMode;
-	/** @var Cache */
+	/** @var \Friendica\Core\Config\ValueObject\Cache */
 	private $configCache;
-	/** @var IConfig */
+	/** @var IManageConfigValues */
 	private $config;
 	/** @var Database */
 	private $dba;
@@ -98,7 +98,7 @@ Examples
 HELP;
 	}
 
-	public function __construct(App\Mode $appMode, Cache $configCache, IConfig $config, Database $dba, array $argv = null)
+	public function __construct(App\Mode $appMode, Cache $configCache, IManageConfigValues $config, Database $dba, array $argv = null)
 	{
 		parent::__construct($argv);
 
@@ -252,8 +252,8 @@ HELP;
 	}
 
 	/**
-	 * @param Installer $installer   The Installer instance
-	 * @param Cache     $configCache The config cache
+	 * @param Installer                                $installer   The Installer instance
+	 * @param \Friendica\Core\Config\ValueObject\Cache $configCache The config cache
 	 *
 	 * @return bool true if checks were successfully, otherwise false
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException

src/Console/Cache.php

@@ -23,8 +23,8 @@ namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Friendica\App;
-use Friendica\Core\Cache\Duration;
-use Friendica\Core\Cache\ICache;
+use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Cache\Capability\ICanCache;
 use RuntimeException;
 
 /**
@@ -44,7 +44,7 @@ class Cache extends \Asika\SimpleConsole\Console
 	private $appMode;
 
 	/**
-	 * @var ICache
+	 * @var ICanCache
 	 */
 	private $cache;
 
@@ -82,7 +82,7 @@ HELP;
 		return $help;
 	}
 
-	public function __construct(App\Mode $appMode, ICache $cache, array $argv = null)
+	public function __construct(App\Mode $appMode, ICanCache $cache, array $argv = null)
 	{
 		parent::__construct($argv);
 

src/Console/Config.php

@@ -23,7 +23,7 @@ namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Friendica\App;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use RuntimeException;
 
 /**
@@ -56,7 +56,7 @@ class Config extends \Asika\SimpleConsole\Console
 	 */
 	private $appMode;
 	/**
-	 * @var IConfig
+	 * @var IManageConfigValues
 	 */
 	private $config;
 
@@ -94,7 +94,7 @@ HELP;
 		return $help;
 	}
 
-	public function __construct(App\Mode $appMode, IConfig $config, array $argv = null)
+	public function __construct(App\Mode $appMode, IManageConfigValues $config, array $argv = null)
 	{
 		parent::__construct($argv);
 

src/Console/DatabaseStructure.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Console;
 
-use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\Update;
 use Friendica\Database\Database;
 use Friendica\Database\DBStructure;

src/Console/Lock.php

@@ -23,7 +23,7 @@ namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Friendica\App;
-use Friendica\Core\Lock\ILock;
+use Friendica\Core\Lock\Capability\ICanLock;
 use RuntimeException;
 
 /**
@@ -42,7 +42,7 @@ class Lock extends \Asika\SimpleConsole\Console
 	private $appMode;
 
 	/**
-	 * @var ILock
+	 * @var ICanLock
 	 */
 	private $lock;
 
@@ -76,7 +76,7 @@ HELP;
 		return $help;
 	}
 
-	public function __construct(App\Mode $appMode, ILock $lock, array $argv = null)
+	public function __construct(App\Mode $appMode, ICanLock $lock, array $argv = null)
 	{
 		parent::__construct($argv);
 

src/Console/Maintenance.php

@@ -22,7 +22,7 @@
 namespace Friendica\Console;
 
 use Friendica\App;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 
 /**
  * Sets maintenance mode for this node
@@ -36,7 +36,7 @@ class Maintenance extends \Asika\SimpleConsole\Console
 	 */
 	private $appMode;
 	/**
-	 * @var IConfig
+	 * @var IManageConfigValues
 	 */
 	private $config;
 
@@ -69,7 +69,7 @@ HELP;
 		return $help;
 	}
 
-	public function __construct(App\Mode $appMode, IConfig $config, $argv = null)
+	public function __construct(App\Mode $appMode, IManageConfigValues $config, $argv = null)
 	{
 		parent::__construct($argv);
 

src/Console/PostUpdate.php

@@ -22,7 +22,7 @@
 namespace Friendica\Console;
 
 use Friendica\App;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Update;
 
@@ -38,7 +38,7 @@ class PostUpdate extends \Asika\SimpleConsole\Console
 	 */
 	private $appMode;
 	/**
-	 * @var IConfig
+	 * @var IManageConfigValues
 	 */
 	private $config;
 	/**
@@ -60,7 +60,7 @@ HELP;
 		return $help;
 	}
 
-	public function __construct(App\Mode $appMode, IConfig $config, L10n $l10n, array $argv = null)
+	public function __construct(App\Mode $appMode, IManageConfigValues $config, L10n $l10n, array $argv = null)
 	{
 		parent::__construct($argv);
 

src/Console/ServerBlock.php

@@ -24,7 +24,7 @@ namespace Friendica\Console;
 use Asika\SimpleConsole\CommandArgsException;
 use Asika\SimpleConsole\Console;
 use Console_Table;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 
 /**
  * Manage blocked servers
@@ -39,7 +39,7 @@ class ServerBlock extends Console
 	protected $helpOptions = ['h', 'help', '?'];
 
 	/**
-	 * @var IConfig
+	 * @var IManageConfigValues
 	 */
 	private $config;
 
@@ -72,7 +72,7 @@ HELP;
 		return $help;
 	}
 
-	public function __construct(IConfig $config, $argv = null)
+	public function __construct(IManageConfigValues $config, $argv = null)
 	{
 		parent::__construct($argv);
 
@@ -105,9 +105,9 @@ HELP;
 	 * Exports the list of blocked domains including the reason for the
 	 * block to a CSV file.
 	 *
-	 * @param IConfig $config
+	 * @param IManageConfigValues $config
 	 */
-	private function exportBlockedServers(IConfig $config)
+	private function exportBlockedServers(IManageConfigValues $config)
 	{
 		$filename = $this->getArgument(1);
 		$blocklist = $config->get('system', 'blocklist', []);
@@ -123,9 +123,9 @@ HELP;
 	 * Imports a list of domains and a reason for the block from a CSV
 	 * file, e.g. created with the export function.
 	 *
-	 * @param IConfig $config
+	 * @param IManageConfigValues $config
 	 */
-	private function importBlockedServers(IConfig $config)
+	private function importBlockedServers(IManageConfigValues $config)
 	{
 		$filename = $this->getArgument(1);
 		$currBlockList = $config->get('system', 'blocklist', []);
@@ -167,9 +167,9 @@ HELP;
 	/**
 	 * Prints the whole list of blocked domains including the reason
 	 *
-	 * @param IConfig $config
+	 * @param IManageConfigValues $config
 	 */
-	private function printBlockedServers(IConfig $config)
+	private function printBlockedServers(IManageConfigValues $config)
 	{
 		$table = new Console_Table();
 		$table->setHeaders(['Domain', 'Reason']);
@@ -183,11 +183,11 @@ HELP;
 	/**
 	 * Adds a server to the blocked list
 	 *
-	 * @param IConfig $config
+	 * @param IManageConfigValues $config
 	 *
 	 * @return int The return code (0 = success, 1 = failed)
 	 */
-	private function addBlockedServer(IConfig $config)
+	private function addBlockedServer(IManageConfigValues $config)
 	{
 		if (count($this->args) < 2 || count($this->args) > 3) {
 			throw new CommandArgsException('Add needs a domain and optional a reason.');
@@ -235,11 +235,11 @@ HELP;
 	/**
 	 * Removes a server from the blocked list
 	 *
-	 * @param IConfig $config
+	 * @param IManageConfigValues $config
 	 *
 	 * @return int The return code (0 = success, 1 = failed)
 	 */
-	private function removeBlockedServer(IConfig $config)
+	private function removeBlockedServer(IManageConfigValues $config)
 	{
 		if (count($this->args) !== 2) {
 			throw new CommandArgsException('Remove needs a second parameter.');

src/Console/Storage.php

@@ -22,9 +22,9 @@
 namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
-use Friendica\Core\StorageManager;
-use Friendica\Model\Storage\ReferenceStorageException;
-use Friendica\Model\Storage\StorageException;
+use Friendica\Core\Storage\Repository\StorageManager;
+use Friendica\Core\Storage\Exception\ReferenceStorageException;
+use Friendica\Core\Storage\Exception\StorageException;
 
 /**
  * tool to manage storage backend and stored data from CLI

src/Console/Typo.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Console;
 
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 
 /**
  * Tired of chasing typos and finding them after a commit.
@@ -32,7 +32,7 @@ class Typo extends \Asika\SimpleConsole\Console
 	protected $helpOptions = ['h', 'help', '?'];
 
 	/**
-	 * @var IConfig
+	 * @var IManageConfigValues
 	 */
 	private $config;
 
@@ -53,7 +53,7 @@ HELP;
 		return $help;
 	}
 
-	public function __construct(IConfig $config, array $argv = null)
+	public function __construct(IManageConfigValues $config, array $argv = null)
 	{
 		parent::__construct($argv);
 

src/Console/User.php

@@ -25,7 +25,7 @@ use Console_Table;
 use Friendica\App;
 use Friendica\Content\Pager;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Model\Register;
 use Friendica\Model\User as UserModel;
 use Friendica\Util\Temporal;
@@ -48,7 +48,7 @@ class User extends \Asika\SimpleConsole\Console
 	 */
 	private $l10n;
 	/**
-	 * @var IPConfig
+	 * @var IManagePersonalConfigValues
 	 */
 	private $pConfig;
 
@@ -88,7 +88,7 @@ HELP;
 		return $help;
 	}
 
-	public function __construct(App\Mode $appMode, L10n $l10n, IPConfig $pConfig, array $argv = null)
+	public function __construct(App\Mode $appMode, L10n $l10n, IManagePersonalConfigValues $pConfig, array $argv = null)
 	{
 		parent::__construct($argv);
 

src/Content/Conversation.php

@@ -26,10 +26,10 @@ use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Core\ACL;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -66,11 +66,11 @@ class Conversation
 	private $item;
 	/** @var App\Arguments */
 	private $args;
-	/** @var IPConfig */
+	/** @var IManagePersonalConfigValues */
 	private $pConfig;
 	/** @var BaseURL */
 	private $baseURL;
-	/** @var IConfig */
+	/** @var IManageConfigValues */
 	private $config;
 	/** @var App */
 	private $app;
@@ -79,7 +79,7 @@ class Conversation
 	/** @var App\Mode */
 	private $mode;
 
-	public function __construct(LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IConfig $config, IPConfig $pConfig, App\Page $page, App\Mode $mode, App $app)
+	public function __construct(LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, App\Page $page, App\Mode $mode, App $app)
 	{
 		$this->activity = $activity;
 		$this->item     = $item;
@@ -629,7 +629,7 @@ class Conversation
 
 					$body_html = ItemModel::prepareBody($item, true, $preview);
 
-					list($categories, $folders) = $this->item->determineCategoriesTerms($item, local_user());
+					[$categories, $folders] = $this->item->determineCategoriesTerms($item, local_user());
 
 					if (!empty($item['content-warning']) && $this->pConfig->get(local_user(), 'system', 'disable_cw', false)) {
 						$title = ucfirst($item['content-warning']);

src/Content/Nav.php

@@ -190,7 +190,7 @@ class Nav
 			$nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname(), DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')];
 			$nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname() . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
 			$nav['usermenu'][] = ['photos/' . $a->getLoggedInUserNickname(), DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
-			$nav['usermenu'][] = ['media/' . $a->getLoggedInUserNickname(), DI::l10n()->t('Media'), '', DI::l10n()->t('Your postings with media')];
+			$nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname() . '/media', DI::l10n()->t('Media'), '', DI::l10n()->t('Your postings with media')];
 			$nav['usermenu'][] = ['events/', DI::l10n()->t('Events'), '', DI::l10n()->t('Your events')];
 			$nav['usermenu'][] = ['notes/', DI::l10n()->t('Personal notes'), '', DI::l10n()->t('Your personal notes')];
 

src/Content/OEmbed.php

@@ -26,7 +26,7 @@ use DOMNode;
 use DOMText;
 use DOMXPath;
 use Exception;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\Database;

src/Content/Text/BBCode.php

@@ -39,7 +39,7 @@ use Friendica\Model\Event;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
-use Friendica\Network\HTTPClientOptions;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Object\Image;
 use Friendica\Protocol\Activity;
 use Friendica\Util\Images;
@@ -1201,7 +1201,7 @@ class BBCode
 		$text = DI::cache()->get($cache_key);
 
 		if (is_null($text)) {
-			$curlResult = DI::httpClient()->head($match[1], [HTTPClientOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout')]);
+			$curlResult = DI::httpClient()->head($match[1], [HttpClientOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout')]);
 			if ($curlResult->isSuccess()) {
 				$mimetype = $curlResult->getHeader('Content-Type')[0] ?? '';
 			} else {
@@ -1272,7 +1272,7 @@ class BBCode
 			return $text;
 		}
 
-		$curlResult = DI::httpClient()->head($match[1], [HTTPClientOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout')]);
+		$curlResult = DI::httpClient()->head($match[1], [HttpClientOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout')]);
 		if ($curlResult->isSuccess()) {
 			$mimetype = $curlResult->getHeader('Content-Type')[0] ?? '';
 		} else {

src/Content/Widget.php

@@ -22,7 +22,7 @@
 namespace Friendica\Content;
 
 use Friendica\Core\Addon;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;

src/Core/Cache/Capability/ICanCache.php

@@ -19,21 +19,24 @@
  *
  */
 
-namespace Friendica\Core\Cache;
+namespace Friendica\Core\Cache\Capability;
+
+use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Cache\Exception\CachePersistenceException;
 
 /**
- * Cache Interface
+ * Interface for caches
  */
-interface ICache
+interface ICanCache
 {
 	/**
 	 * Lists all cache keys
 	 *
-	 * @param string prefix optional a prefix to search
+	 * @param string|null prefix optional a prefix to search
 	 *
 	 * @return array Empty if it isn't supported by the cache driver
 	 */
-	public function getAllKeys($prefix = null);
+	public function getAllKeys(?string $prefix = null): array;
 
 	/**
 	 * Fetches cached data according to the key
@@ -41,41 +44,50 @@ interface ICache
 	 * @param string $key The key to the cached data
 	 *
 	 * @return mixed Cached $value or "null" if not found
+	 *
+	 * @throws CachePersistenceException In case the underlying cache driver has errors during persistence
 	 */
-	public function get($key);
+	public function get(string $key);
 
 	/**
 	 * Stores data in the cache identified by the key. The input $value can have multiple formats.
 	 *
-	 * @param string  $key      The cache key
-	 * @param mixed   $value    The value to store
-	 * @param integer $ttl      The cache lifespan, must be one of the Cache constants
+	 * @param string  $key   The cache key
+	 * @param mixed   $value The value to store
+	 * @param integer $ttl   The cache lifespan, must be one of the Cache constants
 	 *
 	 * @return bool
+	 *
+	 * @throws CachePersistenceException In case the underlying cache driver has errors during persistence
 	 */
-	public function set($key, $value, $ttl = Duration::FIVE_MINUTES);
+	public function set(string $key, $value, int $ttl = Duration::FIVE_MINUTES): bool;
 
 	/**
 	 * Delete a key from the cache
 	 *
-	 * @param string $key      The cache key
+	 * @param string $key The cache key
 	 *
 	 * @return bool
+	 *
+	 * @throws CachePersistenceException In case the underlying cache driver has errors during persistence
 	 */
-	public function delete($key);
+	public function delete(string $key): bool;
 
 	/**
 	 * Remove outdated data from the cache
-	 * @param  boolean $outdated just remove outdated values
+	 *
+	 * @param boolean $outdated just remove outdated values
 	 *
 	 * @return bool
+	 *
+	 * @throws CachePersistenceException In case the underlying cache driver has errors during persistence
 	 */
-	public function clear($outdated = true);
+	public function clear(bool $outdated = true): bool;
 
 	/**
 	 * Returns the name of the current cache
 	 *
 	 * @return string
 	 */
-	public function getName();
+	public function getName(): string;
 }

src/Core/Cache/Capability/ICanCacheInMemory.php

@@ -19,41 +19,52 @@
  *
  */
 
-namespace Friendica\Core\Cache;
+namespace Friendica\Core\Cache\Capability;
+
+use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Cache\Exception\CachePersistenceException;
 
 /**
  * This interface defines methods for Memory-Caches only
  */
-interface IMemoryCache extends ICache
+interface ICanCacheInMemory extends ICanCache
 {
 	/**
 	 * Sets a value if it's not already stored
 	 *
-	 * @param string $key      The cache key
-	 * @param mixed  $value    The old value we know from the cache
-	 * @param int    $ttl      The cache lifespan, must be one of the Cache constants
+	 * @param string $key   The cache key
+	 * @param mixed  $value The old value we know from the cache
+	 * @param int    $ttl   The cache lifespan, must be one of the Cache constants
+	 *
 	 * @return bool
+	 *
+	 * @throws CachePersistenceException In case the underlying cache driver has errors during persistence
 	 */
-	public function add($key, $value, $ttl = Duration::FIVE_MINUTES);
+	public function add(string $key, $value, int $ttl = Duration::FIVE_MINUTES): bool;
 
 	/**
 	 * Compares if the old value is set and sets the new value
 	 *
-	 * @param string $key         The cache key
-	 * @param mixed  $oldValue    The old value we know from the cache
-	 * @param mixed  $newValue    The new value we want to set
-	 * @param int    $ttl      	  The cache lifespan, must be one of the Cache constants
+	 * @param string $key      The cache key
+	 * @param mixed  $oldValue The old value we know from the cache
+	 * @param mixed  $newValue The new value we want to set
+	 * @param int    $ttl      The cache lifespan, must be one of the Cache constants
 	 *
 	 * @return bool
+	 *
+	 * @throws CachePersistenceException In case the underlying cache driver has errors during persistence
 	 */
-	public function compareSet($key, $oldValue, $newValue, $ttl = Duration::FIVE_MINUTES);
+	public function compareSet(string $key, $oldValue, $newValue, int $ttl = Duration::FIVE_MINUTES): bool;
 
 	/**
 	 * Compares if the old value is set and removes it
 	 *
-	 * @param string $key          The cache key
-	 * @param mixed  $value        The old value we know and want to delete
+	 * @param string $key   The cache key
+	 * @param mixed  $value The old value we know and want to delete
+	 *
 	 * @return bool
+	 *
+	 * @throws CachePersistenceException In case the underlying cache driver has errors during persistence
 	 */
-	public function compareDelete($key, $value);
+	public function compareDelete(string $key, $value): bool;
 }

src/Core/Cache/DatabaseCache.php

@@ -1,138 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Core\Cache;
-
-use Friendica\Database\Database;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Core\BaseCache;
-
-/**
- * Database Cache
- */
-class DatabaseCache extends BaseCache implements ICache
-{
-	/**
-	 * @var Database
-	 */
-	private $dba;
-
-	public function __construct(string $hostname, Database $dba)
-	{
-		parent::__construct($hostname);
-
-		$this->dba = $dba;
-	}
-
-	/**
-	 * (@inheritdoc)
-	 */
-	public function getAllKeys($prefix = null)
-	{
-		if (empty($prefix)) {
-			$where = ['`expires` >= ?', DateTimeFormat::utcNow()];
-		} else {
-			$where = ['`expires` >= ? AND `k` LIKE CONCAT(?, \'%\')', DateTimeFormat::utcNow(), $prefix];
-		}
-
-		$stmt = $this->dba->select('cache', ['k'], $where);
-
-		$keys = [];
-		while ($key = $this->dba->fetch($stmt)) {
-			array_push($keys, $key['k']);
-		}
-		$this->dba->close($stmt);
-
-		return $keys;
-	}
-
-	/**
-	 * (@inheritdoc)
-	 */
-	public function get($key)
-	{
-		$cache = $this->dba->selectFirst('cache', ['v'], ['`k` = ? AND (`expires` >= ? OR `expires` = -1)', $key, DateTimeFormat::utcNow()]);
-
-		if ($this->dba->isResult($cache)) {
-			$cached = $cache['v'];
-			$value = @unserialize($cached);
-
-			// Only return a value if the serialized value is valid.
-			// We also check if the db entry is a serialized
-			// boolean 'false' value (which we want to return).
-			if ($cached === serialize(false) || $value !== false) {
-				return $value;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * (@inheritdoc)
-	 */
-	public function set($key, $value, $ttl = Duration::FIVE_MINUTES)
-	{
-		if ($ttl > 0) {
-			$fields = [
-				'v' => serialize($value),
-				'expires' => DateTimeFormat::utc('now + ' . $ttl . 'seconds'),
-				'updated' => DateTimeFormat::utcNow()
-			];
-		} else {
-			$fields = [
-				'v' => serialize($value),
-				'expires' => -1,
-				'updated' => DateTimeFormat::utcNow()
-			];
-		}
-
-		return $this->dba->update('cache', $fields, ['k' => $key], true);
-	}
-
-	/**
-	 * (@inheritdoc)
-	 */
-	public function delete($key)
-	{
-		return $this->dba->delete('cache', ['k' => $key]);
-	}
-
-	/**
-	 * (@inheritdoc)
-	 */
-	public function clear($outdated = true)
-	{
-		if ($outdated) {
-			return $this->dba->delete('cache', ['`expires` < NOW()']);
-		} else {
-			return $this->dba->delete('cache', ['`k` IS NOT NULL ']);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName()
-	{
-		return Type::DATABASE;
-	}
-}

src/Core/Cache/Enum/Duration.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Core\Cache;
+namespace Friendica\Core\Cache\Enum;
 
 /**
  * Enumeration for cache durations

src/Core/Cache/Enum/Type.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Core\Cache;
+namespace Friendica\Core\Cache\Enum;
 
 /**
  * Enumeration for cache types

src/Core/Cache/Exception/CachePersistenceException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Friendica\Core\Cache\Exception;
+
+use Throwable;
+
+class CachePersistenceException extends \RuntimeException
+{
+	public function __construct($message = "", Throwable $previous = null)
+	{
+		parent::__construct($message, 500, $previous);
+	}
+}

src/Core/Cache/Exception/InvalidCacheDriverException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Friendica\Core\Cache\Exception;
+
+use Throwable;
+
+class InvalidCacheDriverException extends \RuntimeException
+{
+	public function __construct($message = "", Throwable $previous = null)
+	{
+		parent::__construct($message, 500, $previous);
+	}
+}

src/Core/Cache/Factory/Cache.php

@@ -19,12 +19,15 @@
  *
  */
 
-namespace Friendica\Factory;
+namespace Friendica\Core\Cache\Factory;
 
 use Friendica\App\BaseURL;
-use Friendica\Core\Cache;
-use Friendica\Core\Cache\ICache;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Cache\Enum;
+use Friendica\Core\Cache\Capability\ICanCache;
+use Friendica\Core\Cache\Exception\CachePersistenceException;
+use Friendica\Core\Cache\Exception\InvalidCacheDriverException;
+use Friendica\Core\Cache\Type;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Database\Database;
 use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
@@ -36,15 +39,15 @@ use Psr\Log\LoggerInterface;
  *
  * A basic class to generate a CacheDriver
  */
-class CacheFactory
+class Cache
 {
 	/**
 	 * @var string The default cache if nothing set
 	 */
-	const DEFAULT_TYPE = Cache\Type::DATABASE;
+	const DEFAULT_TYPE = Enum\Type::DATABASE;
 
 	/**
-	 * @var IConfig The IConfiguration to read parameters out of the config
+	 * @var IManageConfigValues The IConfiguration to read parameters out of the config
 	 */
 	private $config;
 
@@ -68,7 +71,7 @@ class CacheFactory
 	 */
 	private $logger;
 
-	public function __construct(BaseURL $baseURL, IConfig $config, Database $dba, Profiler $profiler, LoggerInterface $logger)
+	public function __construct(BaseURL $baseURL, IManageConfigValues $config, Database $dba, Profiler $profiler, LoggerInterface $logger)
 	{
 		$this->hostname = $baseURL->getHostname();
 		$this->config   = $config;
@@ -80,39 +83,41 @@ class CacheFactory
 	/**
 	 * This method creates a CacheDriver for the given cache driver name
 	 *
-	 * @param string $type The cache type to create (default is per config)
+	 * @param string|null $type The cache type to create (default is per config)
 	 *
-	 * @return ICache  The instance of the CacheDriver
-	 * @throws \Exception    The exception if something went wrong during the CacheDriver creation
+	 * @return ICanCache  The instance of the CacheDriver
+	 *
+	 * @throws InvalidCacheDriverException In case the underlying cache driver isn't valid or not configured properly
+	 * @throws CachePersistenceException In case the underlying cache has errors during persistence
 	 */
-	public function create(string $type = null)
+	public function create(string $type = null): ICanCache
 	{
 		if (empty($type)) {
 			$type = $this->config->get('system', 'cache_driver', self::DEFAULT_TYPE);
 		}
 
 		switch ($type) {
-			case Cache\Type::MEMCACHE:
-				$cache = new Cache\MemcacheCache($this->hostname, $this->config);
+			case Enum\Type::MEMCACHE:
+				$cache = new Type\MemcacheCache($this->hostname, $this->config);
 				break;
-			case Cache\Type::MEMCACHED:
-				$cache = new Cache\MemcachedCache($this->hostname, $this->config, $this->logger);
+			case Enum\Type::MEMCACHED:
+				$cache = new Type\MemcachedCache($this->hostname, $this->config, $this->logger);
 				break;
-			case Cache\Type::REDIS:
-				$cache = new Cache\RedisCache($this->hostname, $this->config);
+			case Enum\Type::REDIS:
+				$cache = new Type\RedisCache($this->hostname, $this->config);
 				break;
-			case Cache\Type::APCU:
-				$cache = new Cache\APCuCache($this->hostname);
+			case Enum\Type::APCU:
+				$cache = new Type\APCuCache($this->hostname);
 				break;
 			default:
-				$cache = new Cache\DatabaseCache($this->hostname, $this->dba);
+				$cache = new Type\DatabaseCache($this->hostname, $this->dba);
 		}
 
 		$profiling = $this->config->get('system', 'profiling', false);
 
 		// In case profiling is enabled, wrap the ProfilerCache around the current cache
 		if (isset($profiling) && $profiling !== false) {
-			return new Cache\ProfilerCache($cache, $this->profiler);
+			return new Type\ProfilerCacheDecorator($cache, $this->profiler);
 		} else {
 			return $cache;
 		}

src/Core/Cache/Type/APCuCache.php

@@ -19,26 +19,30 @@
  *
  */
 
-namespace Friendica\Core\Cache;
+namespace Friendica\Core\Cache\Type;
 
-use Exception;
-use Friendica\Core\BaseCache;
+use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Cache\Capability\ICanCacheInMemory;
+use Friendica\Core\Cache\Enum\Type;
+use Friendica\Core\Cache\Exception\InvalidCacheDriverException;
 
 /**
  * APCu Cache.
  */
-class APCuCache extends BaseCache implements IMemoryCache
+class APCuCache extends AbstractCache implements ICanCacheInMemory
 {
-	use TraitCompareSet;
-	use TraitCompareDelete;
+	use CompareSetTrait;
+	use CompareDeleteTrait;
 
 	/**
-	 * @throws Exception
+	 * @param string $hostname
+	 *
+	 * @throws InvalidCacheDriverException
 	 */
 	public function __construct(string $hostname)
 	{
 		if (!self::isAvailable()) {
-			throw new Exception('APCu is not available.');
+			throw new InvalidCacheDriverException('APCu is not available.');
 		}
 
 		parent::__construct($hostname);
@@ -47,9 +51,9 @@ class APCuCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function getAllKeys($prefix = null)
+	public function getAllKeys(?string $prefix = null): array
 	{
-		$ns = $this->getCacheKey($prefix);
+		$ns = $this->getCacheKey($prefix ?? '');
 		$ns = preg_quote($ns, '/');
 
 		if (class_exists('\APCIterator')) {
@@ -69,12 +73,11 @@ class APCuCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function get($key)
+	public function get(string $key)
 	{
-		$return = null;
-		$cachekey = $this->getCacheKey($key);
+		$cacheKey = $this->getCacheKey($key);
 
-		$cached = apcu_fetch($cachekey, $success);
+		$cached = apcu_fetch($cacheKey, $success);
 		if (!$success) {
 			return null;
 		}
@@ -85,30 +88,30 @@ class APCuCache extends BaseCache implements IMemoryCache
 		// We also check if the db entry is a serialized
 		// boolean 'false' value (which we want to return).
 		if ($cached === serialize(false) || $value !== false) {
-			$return = $value;
+			return $value;
 		}
 
-		return $return;
+		return null;
 	}
 
 	/**
 	 * (@inheritdoc)
 	 */
-	public function set($key, $value, $ttl = Duration::FIVE_MINUTES)
+	public function set(string $key, $value, int $ttl = Duration::FIVE_MINUTES): bool
 	{
-		$cachekey = $this->getCacheKey($key);
+		$cacheKey = $this->getCacheKey($key);
 
 		$cached = serialize($value);
 
 		if ($ttl > 0) {
 			return apcu_store(
-				$cachekey,
+				$cacheKey,
 				$cached,
 				$ttl
 			);
 		} else {
 			return apcu_store(
-				$cachekey,
+				$cacheKey,
 				$cached
 			);
 		}
@@ -117,16 +120,16 @@ class APCuCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function delete($key)
+	public function delete(string $key): bool
 	{
-		$cachekey = $this->getCacheKey($key);
-		return apcu_delete($cachekey);
+		$cacheKey = $this->getCacheKey($key);
+		return apcu_delete($cacheKey);
 	}
 
 	/**
 	 * (@inheritdoc)
 	 */
-	public function clear($outdated = true)
+	public function clear(bool $outdated = true): bool
 	{
 		if ($outdated) {
 			return true;
@@ -147,15 +150,15 @@ class APCuCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function add($key, $value, $ttl = Duration::FIVE_MINUTES)
+	public function add(string $key, $value, int $ttl = Duration::FIVE_MINUTES): bool
 	{
-		$cachekey = $this->getCacheKey($key);
-		$cached = serialize($value);
+		$cacheKey = $this->getCacheKey($key);
+		$cached   = serialize($value);
 
-		return apcu_add($cachekey, $cached);
+		return apcu_add($cacheKey, $cached);
 	}
 
-	public static function isAvailable()
+	public static function isAvailable(): bool
 	{
 		if (!extension_loaded('apcu')) {
 			return false;
@@ -174,7 +177,7 @@ class APCuCache extends BaseCache implements IMemoryCache
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getName()
+	public function getName(): string
 	{
 		return Type::APCU;
 	}

src/Core/Cache/Type/AbstractCache.php

@@ -19,14 +19,14 @@
  *
  */
 
-namespace Friendica\Core;
+namespace Friendica\Core\Cache\Type;
 
-use Friendica\Core\Cache\ICache;
+use Friendica\Core\Cache\Capability\ICanCache;
 
 /**
  * Abstract class for common used functions
  */
-abstract class BaseCache implements ICache
+abstract class AbstractCache implements ICanCache
 {
 	/**
 	 * @var string The hostname
@@ -42,9 +42,8 @@ abstract class BaseCache implements ICache
 	 * Returns the prefix (to avoid namespace conflicts)
 	 *
 	 * @return string
-	 * @throws \Exception
 	 */
-	protected function getPrefix()
+	protected function getPrefix(): string
 	{
 		// We fetch with the hostname as key to avoid problems with other applications
 		return $this->hostName;
@@ -52,19 +51,20 @@ abstract class BaseCache implements ICache
 
 	/**
 	 * @param string $key The original key
+	 *
 	 * @return string        The cache key used for the cache
-	 * @throws \Exception
 	 */
-	protected function getCacheKey($key)
+	protected function getCacheKey(string $key): string
 	{
 		return $this->getPrefix() . ":" . $key;
 	}
 
 	/**
-	 * @param array $keys   A list of cached keys
-	 * @return array        A list of original keys
+	 * @param string[] $keys A list of cached keys
+	 *
+	 * @return string[] A list of original keys
 	 */
-	protected function getOriginalKeys($keys)
+	protected function getOriginalKeys(array $keys): array
 	{
 		if (empty($keys)) {
 			return [];
@@ -84,12 +84,12 @@ abstract class BaseCache implements ICache
 	 * Filters the keys of an array with a given prefix
 	 * Returns the filtered keys as an new array
 	 *
-	 * @param array $keys The keys, which should get filtered
+	 * @param string[]    $keys   The keys, which should get filtered
 	 * @param string|null $prefix The prefix (if null, all keys will get returned)
 	 *
-	 * @return array The filtered array with just the keys
+	 * @return string[] The filtered array with just the keys
 	 */
-	protected function filterArrayKeysByPrefix(array $keys, string $prefix = null)
+	protected function filterArrayKeysByPrefix(array $keys, string $prefix = null): array
 	{
 		if (empty($prefix)) {
 			return $keys;

src/Core/Cache/Type/ArrayCache.php

@@ -19,24 +19,25 @@
  *
  */
 
-namespace Friendica\Core\Cache;
+namespace Friendica\Core\Cache\Type;
 
-use Friendica\Core\BaseCache;
+use Friendica\Core\Cache\Capability\ICanCacheInMemory;
+use Friendica\Core\Cache\Enum;
 
 /**
  * Implementation of the IMemoryCache mainly for testing purpose
  */
-class ArrayCache extends BaseCache implements IMemoryCache
+class ArrayCache extends AbstractCache implements ICanCacheInMemory
 {
-	use TraitCompareDelete;
+	use CompareDeleteTrait;
 
 	/** @var array Array with the cached data */
-	protected $cachedData = array();
+	protected $cachedData = [];
 
 	/**
 	 * (@inheritdoc)
 	 */
-	public function getAllKeys($prefix = null)
+	public function getAllKeys(?string $prefix = null): array
 	{
 		return $this->filterArrayKeysByPrefix(array_keys($this->cachedData), $prefix);
 	}
@@ -44,7 +45,7 @@ class ArrayCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function get($key)
+	public function get(string $key)
 	{
 		if (isset($this->cachedData[$key])) {
 			return $this->cachedData[$key];
@@ -55,7 +56,7 @@ class ArrayCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function set($key, $value, $ttl = Duration::FIVE_MINUTES)
+	public function set(string $key, $value, int $ttl = Enum\Duration::FIVE_MINUTES): bool
 	{
 		$this->cachedData[$key] = $value;
 		return true;
@@ -64,7 +65,7 @@ class ArrayCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function delete($key)
+	public function delete(string $key): bool
 	{
 		unset($this->cachedData[$key]);
 		return true;
@@ -73,7 +74,7 @@ class ArrayCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function clear($outdated = true)
+	public function clear(bool $outdated = true): bool
 	{
 		// Array doesn't support TTL so just don't delete something
 		if ($outdated) {
@@ -87,7 +88,7 @@ class ArrayCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function add($key, $value, $ttl = Duration::FIVE_MINUTES)
+	public function add(string $key, $value, int $ttl = Enum\Duration::FIVE_MINUTES): bool
 	{
 		if (isset($this->cachedData[$key])) {
 			return false;
@@ -99,7 +100,7 @@ class ArrayCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function compareSet($key, $oldValue, $newValue, $ttl = Duration::FIVE_MINUTES)
+	public function compareSet(string $key, $oldValue, $newValue, int $ttl = Enum\Duration::FIVE_MINUTES): bool
 	{
 		if ($this->get($key) === $oldValue) {
 			return $this->set($key, $newValue);
@@ -111,8 +112,8 @@ class ArrayCache extends BaseCache implements IMemoryCache
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getName()
+	public function getName(): string
 	{
-		return Type::ARRAY;
+		return Enum\Type::ARRAY;
 	}
 }

src/Core/Cache/Type/CompareDeleteTrait.php

@@ -19,31 +19,33 @@
  *
  */
 
-namespace Friendica\Core\Cache;
+namespace Friendica\Core\Cache\Type;
+
+use Friendica\Core\Cache\Enum\Duration;
 
 /**
- * Trait TraitCompareSetDelete
- *
- * This Trait is to compensate non native "exclusive" sets/deletes in caches
+ * This Trait is to compensate nonnative "exclusive" sets/deletes in caches
  */
-trait TraitCompareDelete
+trait CompareDeleteTrait
 {
-	abstract public function get($key);
+	abstract public function get(string $key);
 
-	abstract public function set($key, $value, $ttl = Duration::FIVE_MINUTES);
+	abstract public function set(string $key, $value, int $ttl = Duration::FIVE_MINUTES);
 
-	abstract public function delete($key);
+	abstract public function delete(string $key);
 
-	abstract public function add($key, $value, $ttl = Duration::FIVE_MINUTES);
+	abstract public function add(string $key, $value, int $ttl = Duration::FIVE_MINUTES);
 
 	/**
 	 * NonNative - Compares if the old value is set and removes it
 	 *
-	 * @param string $key          The cache key
-	 * @param mixed  $value        The old value we know and want to delete
+	 * @param string $key   The cache key
+	 * @param mixed  $value The old value we know and want to delete
+	 *
 	 * @return bool
 	 */
-	public function compareDelete($key, $value) {
+	public function compareDelete(string $key, $value): bool
+	{
 		if ($this->add($key . "_lock", true)) {
 			if ($this->get($key) === $value) {
 				$this->delete($key);

src/Core/Cache/Type/CompareSetTrait.php

@@ -19,40 +19,41 @@
  *
  */
 
-namespace Friendica\Core\Cache;
+namespace Friendica\Core\Cache\Type;
+
+use Friendica\Core\Cache\Enum\Duration;
 
 /**
- * Trait TraitCompareSetDelete
- *
- * This Trait is to compensate non native "exclusive" sets/deletes in caches
+ * This Trait is to compensate nonnative "exclusive" sets/deletes in caches
  */
-trait TraitCompareSet
+trait CompareSetTrait
 {
-	abstract public function get($key);
+	abstract public function get(string $key);
 
-	abstract public function set($key, $value, $ttl = Duration::FIVE_MINUTES);
+	abstract public function set(string $key, $value, int $ttl = Duration::FIVE_MINUTES);
 
-	abstract public function delete($key);
+	abstract public function delete(string $key);
 
-	abstract public function add($key, $value, $ttl = Duration::FIVE_MINUTES);
+	abstract public function add(string $key, $value, int $ttl = Duration::FIVE_MINUTES);
 
 	/**
 	 * NonNative - Compares if the old value is set and sets the new value
 	 *
-	 * @param string $key         The cache key
-	 * @param mixed  $oldValue    The old value we know from the cache
-	 * @param mixed  $newValue    The new value we want to set
+	 * @param string $key      The cache key
+	 * @param mixed  $oldValue The old value we know from the cache
+	 * @param mixed  $newValue The new value we want to set
 	 * @param int    $ttl      The cache lifespan, must be one of the Cache constants
 	 *
 	 * @return bool
 	 */
-	public function compareSet($key, $oldValue, $newValue, $ttl = Duration::FIVE_MINUTES) {
+	public function compareSet(string $key, $oldValue, $newValue, int $ttl = Duration::FIVE_MINUTES): bool
+	{
 		if ($this->add($key . "_lock", true)) {
 			if ($this->get($key) === $oldValue) {
 				$this->set($key, $newValue, $ttl);
 				$this->delete($key . "_lock");
 				return true;
- 			} else {
+			} else {
 				$this->delete($key . "_lock");
 				return false;
 			}

src/Core/Cache/Type/DatabaseCache.php

@@ -0,0 +1,165 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Core\Cache\Type;
+
+use Friendica\Core\Cache\Capability\ICanCache;
+use Friendica\Core\Cache\Enum;
+use Friendica\Core\Cache\Exception\CachePersistenceException;
+use Friendica\Database\Database;
+use Friendica\Util\DateTimeFormat;
+
+/**
+ * Database Cache
+ */
+class DatabaseCache extends AbstractCache implements ICanCache
+{
+	/**
+	 * @var Database
+	 */
+	private $dba;
+
+	public function __construct(string $hostname, Database $dba)
+	{
+		parent::__construct($hostname);
+
+		$this->dba = $dba;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 *
+	 * @throws CachePersistenceException
+	 */
+	public function getAllKeys(?string $prefix = null): array
+	{
+		try {
+			if (empty($prefix)) {
+				$where = ['`expires` >= ?', DateTimeFormat::utcNow()];
+			} else {
+				$where = ['`expires` >= ? AND `k` LIKE CONCAT(?, \'%\')', DateTimeFormat::utcNow(), $prefix];
+			}
+
+			$stmt = $this->dba->select('cache', ['k'], $where);
+
+			$keys = [];
+			while ($key = $this->dba->fetch($stmt)) {
+				array_push($keys, $key['k']);
+			}
+		} catch (\Exception $exception) {
+			throw new CachePersistenceException(sprintf('Cannot fetch all keys with prefix %s', $prefix), $exception);
+		} finally {
+			$this->dba->close($stmt);
+		}
+
+		return $keys;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function get(string $key)
+	{
+		try {
+			$cache = $this->dba->selectFirst('cache', ['v'], [
+				'`k` = ? AND (`expires` >= ? OR `expires` = -1)', $key, DateTimeFormat::utcNow()
+			]);
+
+			if ($this->dba->isResult($cache)) {
+				$cached = $cache['v'];
+				$value  = @unserialize($cached);
+
+				// Only return a value if the serialized value is valid.
+				// We also check if the db entry is a serialized
+				// boolean 'false' value (which we want to return).
+				if ($cached === serialize(false) || $value !== false) {
+					return $value;
+				}
+			}
+		} catch (\Exception $exception) {
+			throw new CachePersistenceException(sprintf('Cannot get cache entry with key %s', $key), $exception);
+		}
+
+		return null;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function set(string $key, $value, int $ttl = Enum\Duration::FIVE_MINUTES): bool
+	{
+		try {
+			if ($ttl > 0) {
+				$fields = [
+					'v'       => serialize($value),
+					'expires' => DateTimeFormat::utc('now + ' . $ttl . 'seconds'),
+					'updated' => DateTimeFormat::utcNow()
+				];
+			} else {
+				$fields = [
+					'v'       => serialize($value),
+					'expires' => -1,
+					'updated' => DateTimeFormat::utcNow()
+				];
+			}
+
+			return $this->dba->update('cache', $fields, ['k' => $key], true);
+		} catch (\Exception $exception) {
+			throw new CachePersistenceException(sprintf('Cannot set cache entry with key %s', $key), $exception);
+		}
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function delete(string $key): bool
+	{
+		try {
+			return $this->dba->delete('cache', ['k' => $key]);
+		} catch (\Exception $exception) {
+			throw new CachePersistenceException(sprintf('Cannot delete cache entry with key %s', $key), $exception);
+		}
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function clear(bool $outdated = true): bool
+	{
+		try {
+			if ($outdated) {
+				return $this->dba->delete('cache', ['`expires` < NOW()']);
+			} else {
+				return $this->dba->delete('cache', ['`k` IS NOT NULL ']);
+			}
+		} catch (\Exception $exception) {
+			throw new CachePersistenceException('Cannot clear cache', $exception);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getName(): string
+	{
+		return Enum\Type::DATABASE;
+	}
+}

src/Core/Cache/Type/MemcacheCache.php

@@ -19,21 +19,24 @@
  *
  */
 
-namespace Friendica\Core\Cache;
+namespace Friendica\Core\Cache\Type;
 
-use Exception;
-use Friendica\Core\BaseCache;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Cache\Capability\ICanCacheInMemory;
+use Friendica\Core\Cache\Enum\Type;
+use Friendica\Core\Cache\Exception\CachePersistenceException;
+use Friendica\Core\Cache\Exception\InvalidCacheDriverException;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Memcache;
 
 /**
  * Memcache Cache
  */
-class MemcacheCache extends BaseCache implements IMemoryCache
+class MemcacheCache extends AbstractCache implements ICanCacheInMemory
 {
-	use TraitCompareSet;
-	use TraitCompareDelete;
-	use TraitMemcacheCommand;
+	use CompareSetTrait;
+	use CompareDeleteTrait;
+	use MemcacheCommandTrait;
 
 	/**
 	 * @var Memcache
@@ -41,30 +44,34 @@ class MemcacheCache extends BaseCache implements IMemoryCache
 	private $memcache;
 
 	/**
-	 * @throws Exception
+	 * @param string              $hostname
+	 * @param IManageConfigValues $config
+	 *
+	 * @throws InvalidCacheDriverException
+	 * @throws CachePersistenceException
 	 */
-	public function __construct(string $hostname, IConfig $config)
+	public function __construct(string $hostname, IManageConfigValues $config)
 	{
 		if (!class_exists('Memcache', false)) {
-			throw new Exception('Memcache class isn\'t available');
+			throw new InvalidCacheDriverException('Memcache class isn\'t available');
 		}
 
 		parent::__construct($hostname);
 
 		$this->memcache = new Memcache();
 
-		$this->server = $config->get('system', 'memcache_host');;
-		$this->port = $config->get('system', 'memcache_port');
+		$this->server = $config->get('system', 'memcache_host');
+		$this->port   = $config->get('system', 'memcache_port');
 
 		if (!@$this->memcache->connect($this->server, $this->port)) {
-			throw new Exception('Expected Memcache server at ' . $this->server . ':' . $this->port . ' isn\'t available');
+			throw new CachePersistenceException('Expected Memcache server at ' . $this->server . ':' . $this->port . ' isn\'t available');
 		}
 	}
 
 	/**
 	 * (@inheritdoc)
 	 */
-	public function getAllKeys($prefix = null)
+	public function getAllKeys(?string $prefix = null): array
 	{
 		$keys = $this->getOriginalKeys($this->getMemcacheKeys());
 
@@ -74,17 +81,16 @@ class MemcacheCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function get($key)
+	public function get(string $key)
 	{
-		$return   = null;
-		$cachekey = $this->getCacheKey($key);
+		$cacheKey = $this->getCacheKey($key);
 
 		// We fetch with the hostname as key to avoid problems with other applications
-		$cached = $this->memcache->get($cachekey);
+		$cached = $this->memcache->get($cacheKey);
 
 		// @see http://php.net/manual/en/memcache.get.php#84275
 		if (is_bool($cached) || is_double($cached) || is_long($cached)) {
-			return $return;
+			return null;
 		}
 
 		$value = @unserialize($cached);
@@ -93,30 +99,30 @@ class MemcacheCache extends BaseCache implements IMemoryCache
 		// We also check if the db entry is a serialized
 		// boolean 'false' value (which we want to return).
 		if ($cached === serialize(false) || $value !== false) {
-			$return = $value;
+			return $value;
 		}
 
-		return $return;
+		return null;
 	}
 
 	/**
 	 * (@inheritdoc)
 	 */
-	public function set($key, $value, $ttl = Duration::FIVE_MINUTES)
+	public function set(string $key, $value, int $ttl = Duration::FIVE_MINUTES): bool
 	{
-		$cachekey = $this->getCacheKey($key);
+		$cacheKey = $this->getCacheKey($key);
 
 		// We store with the hostname as key to avoid problems with other applications
 		if ($ttl > 0) {
 			return $this->memcache->set(
-				$cachekey,
+				$cacheKey,
 				serialize($value),
 				MEMCACHE_COMPRESSED,
 				time() + $ttl
 			);
 		} else {
 			return $this->memcache->set(
-				$cachekey,
+				$cacheKey,
 				serialize($value),
 				MEMCACHE_COMPRESSED
 			);
@@ -126,16 +132,16 @@ class MemcacheCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function delete($key)
+	public function delete(string $key): bool
 	{
-		$cachekey = $this->getCacheKey($key);
-		return $this->memcache->delete($cachekey);
+		$cacheKey = $this->getCacheKey($key);
+		return $this->memcache->delete($cacheKey);
 	}
 
 	/**
 	 * (@inheritdoc)
 	 */
-	public function clear($outdated = true)
+	public function clear(bool $outdated = true): bool
 	{
 		if ($outdated) {
 			return true;
@@ -147,16 +153,16 @@ class MemcacheCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function add($key, $value, $ttl = Duration::FIVE_MINUTES)
+	public function add(string $key, $value, int $ttl = Duration::FIVE_MINUTES): bool
 	{
-		$cachekey = $this->getCacheKey($key);
-		return $this->memcache->add($cachekey, serialize($value), MEMCACHE_COMPRESSED, $ttl);
+		$cacheKey = $this->getCacheKey($key);
+		return $this->memcache->add($cacheKey, serialize($value), MEMCACHE_COMPRESSED, $ttl);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getName()
+	public function getName(): string
 	{
 		return Type::MEMCACHE;
 	}

src/Core/Cache/Type/MemcacheCommandTrait.php

@@ -19,9 +19,9 @@
  *
  */
 
-namespace Friendica\Core\Cache;
+namespace Friendica\Core\Cache\Type;
 
-use Friendica\Network\HTTPException\ServiceUnavailableException;
+use Friendica\Core\Cache\Exception\CachePersistenceException;
 
 /**
  * Trait for Memcache to add a custom version of the
@@ -29,7 +29,7 @@ use Friendica\Network\HTTPException\ServiceUnavailableException;
  *
  * Adds the possibility to directly communicate with the memcache too
  */
-trait TraitMemcacheCommand
+trait MemcacheCommandTrait
 {
 	/**
 	 * @var string server address
@@ -52,23 +52,19 @@ trait TraitMemcacheCommand
 	 *
 	 * @return array All keys of the memcache instance
 	 *
-	 * @throws ServiceUnavailableException
+	 * @throws CachePersistenceException
 	 */
-	protected function getMemcacheKeys()
+	protected function getMemcacheKeys(): array
 	{
 		$string = $this->sendMemcacheCommand("stats items");
 		$lines  = explode("\r\n", $string);
-		$slabs  = [];
 		$keys   = [];
 
 		foreach ($lines as $line) {
-
 			if (preg_match("/STAT items:([\d]+):number ([\d]+)/", $line, $matches) &&
-			    isset($matches[1]) &&
-			    !in_array($matches[1], $keys)) {
-
-				$slabs[] = $matches[1];
-				$string  = $this->sendMemcacheCommand("stats cachedump " . $matches[1] . " " . $matches[2]);
+				isset($matches[1]) &&
+				!in_array($matches[1], $keys)) {
+				$string = $this->sendMemcacheCommand("stats cachedump " . $matches[1] . " " . $matches[2]);
 				preg_match_all("/ITEM (.*?) /", $string, $matches);
 				$keys = array_merge($keys, $matches[1]);
 			}
@@ -88,20 +84,19 @@ trait TraitMemcacheCommand
 	 *
 	 * @return string The returned buffer result
 	 *
-	 * @throws ServiceUnavailableException In case the memcache server isn't available (anymore)
+	 * @throws CachePersistenceException In case the memcache server isn't available (anymore)
 	 */
-	protected function sendMemcacheCommand(string $command)
+	protected function sendMemcacheCommand(string $command): string
 	{
 		$s = @fsockopen($this->server, $this->port);
 		if (!$s) {
-			throw new ServiceUnavailableException("Cant connect to:" . $this->server . ':' . $this->port);
+			throw new CachePersistenceException("Cant connect to:" . $this->server . ':' . $this->port);
 		}
 
 		fwrite($s, $command . "\r\n");
 		$buf = '';
 
 		while (!feof($s)) {
-
 			$buf .= fgets($s, 256);
 
 			if (strpos($buf, "END\r\n") !== false) { // stat says end

src/Core/Cache/Type/MemcachedCache.php

@@ -19,22 +19,25 @@
  *
  */
 
-namespace Friendica\Core\Cache;
+namespace Friendica\Core\Cache\Type;
 
-use Exception;
-use Friendica\Core\BaseCache;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Cache\Capability\ICanCacheInMemory;
+use Friendica\Core\Cache\Enum\Type;
+use Friendica\Core\Cache\Exception\CachePersistenceException;
+use Friendica\Core\Cache\Exception\InvalidCacheDriverException;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Memcached;
 use Psr\Log\LoggerInterface;
 
 /**
  * Memcached Cache
  */
-class MemcachedCache extends BaseCache implements IMemoryCache
+class MemcachedCache extends AbstractCache implements ICanCacheInMemory
 {
-	use TraitCompareSet;
-	use TraitCompareDelete;
-	use TraitMemcacheCommand;
+	use CompareSetTrait;
+	use CompareDeleteTrait;
+	use MemcacheCommandTrait;
 
 	/**
 	 * @var \Memcached
@@ -53,14 +56,17 @@ class MemcachedCache extends BaseCache implements IMemoryCache
 	 *   1 => ...
 	 * }
 	 *
-	 * @param array $memcached_hosts
+	 * @param string              $hostname
+	 * @param IManageConfigValues $config
+	 * @param LoggerInterface     $logger
 	 *
-	 * @throws \Exception
+	 * @throws InvalidCacheDriverException
+	 * @throws CachePersistenceException
 	 */
-	public function __construct(string $hostname, IConfig $config, LoggerInterface $logger)
+	public function __construct(string $hostname, IManageConfigValues $config, LoggerInterface $logger)
 	{
 		if (!class_exists('Memcached', false)) {
-			throw new Exception('Memcached class isn\'t available');
+			throw new InvalidCacheDriverException('Memcached class isn\'t available');
 		}
 
 		parent::__construct($hostname);
@@ -78,19 +84,19 @@ class MemcachedCache extends BaseCache implements IMemoryCache
 		});
 
 		$this->server = $memcached_hosts[0][0] ?? 'localhost';
-		$this->port = $memcached_hosts[0][1] ?? 11211;
+		$this->port   = $memcached_hosts[0][1] ?? 11211;
 
 		$this->memcached->addServers($memcached_hosts);
 
 		if (count($this->memcached->getServerList()) == 0) {
-			throw new Exception('Expected Memcached servers aren\'t available, config:' . var_export($memcached_hosts, true));
+			throw new CachePersistenceException('Expected Memcached servers aren\'t available, config:' . var_export($memcached_hosts, true));
 		}
 	}
 
 	/**
 	 * (@inheritdoc)
 	 */
-	public function getAllKeys($prefix = null)
+	public function getAllKeys(?string $prefix = null): array
 	{
 		$keys = $this->getOriginalKeys($this->getMemcacheKeys());
 
@@ -100,40 +106,40 @@ class MemcachedCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function get($key)
+	public function get(string $key)
 	{
-		$return   = null;
-		$cachekey = $this->getCacheKey($key);
+		$cacheKey = $this->getCacheKey($key);
 
 		// We fetch with the hostname as key to avoid problems with other applications
-		$value = $this->memcached->get($cachekey);
+		$value = $this->memcached->get($cacheKey);
 
 		if ($this->memcached->getResultCode() === Memcached::RES_SUCCESS) {
-			$return = $value;
+			return $value;
+		} elseif ($this->memcached->getResultCode() === Memcached::RES_NOTFOUND) {
+			$this->logger->notice('Try to use unknown key.', ['key' => $key]);
+			return null;
 		} else {
-			$this->logger->debug('Memcached \'get\' failed', ['result' => $this->memcached->getResultMessage()]);
+			throw new CachePersistenceException(sprintf('Cannot get cache entry with key %s', $key), new \MemcachedException($this->memcached->getResultMessage(), $this->memcached->getResultCode()));
 		}
-
-		return $return;
 	}
 
 	/**
 	 * (@inheritdoc)
 	 */
-	public function set($key, $value, $ttl = Duration::FIVE_MINUTES)
+	public function set(string $key, $value, int $ttl = Duration::FIVE_MINUTES): bool
 	{
-		$cachekey = $this->getCacheKey($key);
+		$cacheKey = $this->getCacheKey($key);
 
 		// We store with the hostname as key to avoid problems with other applications
 		if ($ttl > 0) {
 			return $this->memcached->set(
-				$cachekey,
+				$cacheKey,
 				$value,
 				$ttl
 			);
 		} else {
 			return $this->memcached->set(
-				$cachekey,
+				$cacheKey,
 				$value
 			);
 		}
@@ -142,16 +148,16 @@ class MemcachedCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function delete($key)
+	public function delete(string $key): bool
 	{
-		$cachekey = $this->getCacheKey($key);
-		return $this->memcached->delete($cachekey);
+		$cacheKey = $this->getCacheKey($key);
+		return $this->memcached->delete($cacheKey);
 	}
 
 	/**
 	 * (@inheritdoc)
 	 */
-	public function clear($outdated = true)
+	public function clear(bool $outdated = true): bool
 	{
 		if ($outdated) {
 			return true;
@@ -163,16 +169,16 @@ class MemcachedCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function add($key, $value, $ttl = Duration::FIVE_MINUTES)
+	public function add(string $key, $value, int $ttl = Duration::FIVE_MINUTES): bool
 	{
-		$cachekey = $this->getCacheKey($key);
-		return $this->memcached->add($cachekey, $value, $ttl);
+		$cacheKey = $this->getCacheKey($key);
+		return $this->memcached->add($cacheKey, $value, $ttl);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getName()
+	public function getName(): string
 	{
 		return Type::MEMCACHED;
 	}

src/Core/Cache/Type/ProfilerCacheDecorator.php

@@ -19,20 +19,22 @@
  *
  */
 
-namespace Friendica\Core\Cache;
+namespace Friendica\Core\Cache\Type;
 
-use Friendica\Core\System;
+use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Cache\Capability\ICanCache;
+use Friendica\Core\Cache\Capability\ICanCacheInMemory;
 use Friendica\Util\Profiler;
 
 /**
- * This class wraps cache driver so they can get profiled - in case the profiler is enabled
+ * This class wraps cache driver, so they can get profiled - in case the profiler is enabled
  *
- * It is using the decorator pattern (@see
+ * It is using the decorator pattern (@see https://en.wikipedia.org/wiki/Decorator_pattern )
  */
-class ProfilerCache implements ICache, IMemoryCache
+class ProfilerCacheDecorator implements ICanCache, ICanCacheInMemory
 {
 	/**
-	 * @var ICache The original cache driver
+	 * @var ICanCache The original cache driver
 	 */
 	private $cache;
 
@@ -41,7 +43,7 @@ class ProfilerCache implements ICache, IMemoryCache
 	 */
 	private $profiler;
 
-	public function __construct(ICache $cache, Profiler $profiler)
+	public function __construct(ICanCache $cache, Profiler $profiler)
 	{
 		$this->cache    = $cache;
 		$this->profiler = $profiler;
@@ -50,7 +52,7 @@ class ProfilerCache implements ICache, IMemoryCache
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getAllKeys($prefix = null)
+	public function getAllKeys(?string $prefix = null): array
 	{
 		$this->profiler->startRecording('cache');
 
@@ -64,7 +66,7 @@ class ProfilerCache implements ICache, IMemoryCache
 	/**
 	 * {@inheritDoc}
 	 */
-	public function get($key)
+	public function get(string $key)
 	{
 		$this->profiler->startRecording('cache');
 
@@ -78,7 +80,7 @@ class ProfilerCache implements ICache, IMemoryCache
 	/**
 	 * {@inheritDoc}
 	 */
-	public function set($key, $value, $ttl = Duration::FIVE_MINUTES)
+	public function set(string $key, $value, int $ttl = Duration::FIVE_MINUTES): bool
 	{
 		$this->profiler->startRecording('cache');
 
@@ -92,7 +94,7 @@ class ProfilerCache implements ICache, IMemoryCache
 	/**
 	 * {@inheritDoc}
 	 */
-	public function delete($key)
+	public function delete(string $key): bool
 	{
 		$this->profiler->startRecording('cache');
 
@@ -106,7 +108,7 @@ class ProfilerCache implements ICache, IMemoryCache
 	/**
 	 * {@inheritDoc}
 	 */
-	public function clear($outdated = true)
+	public function clear(bool $outdated = true): bool
 	{
 		$this->profiler->startRecording('cache');
 
@@ -120,9 +122,9 @@ class ProfilerCache implements ICache, IMemoryCache
 	/**
 	 * {@inheritDoc}
 	 */
-	public function add($key, $value, $ttl = Duration::FIVE_MINUTES)
+	public function add(string $key, $value, int $ttl = Duration::FIVE_MINUTES): bool
 	{
-		if ($this->cache instanceof IMemoryCache) {
+		if ($this->cache instanceof ICanCacheInMemory) {
 			$this->profiler->startRecording('cache');
 
 			$return = $this->cache->add($key, $value, $ttl);
@@ -138,9 +140,9 @@ class ProfilerCache implements ICache, IMemoryCache
 	/**
 	 * {@inheritDoc}
 	 */
-	public function compareSet($key, $oldValue, $newValue, $ttl = Duration::FIVE_MINUTES)
+	public function compareSet(string $key, $oldValue, $newValue, int $ttl = Duration::FIVE_MINUTES): bool
 	{
-		if ($this->cache instanceof IMemoryCache) {
+		if ($this->cache instanceof ICanCacheInMemory) {
 			$this->profiler->startRecording('cache');
 
 			$return = $this->cache->compareSet($key, $oldValue, $newValue, $ttl);
@@ -156,9 +158,9 @@ class ProfilerCache implements ICache, IMemoryCache
 	/**
 	 * {@inheritDoc}
 	 */
-	public function compareDelete($key, $value)
+	public function compareDelete(string $key, $value): bool
 	{
-		if ($this->cache instanceof IMemoryCache) {
+		if ($this->cache instanceof ICanCacheInMemory) {
 			$this->profiler->startRecording('cache');
 
 			$return = $this->cache->compareDelete($key, $value);
@@ -174,7 +176,7 @@ class ProfilerCache implements ICache, IMemoryCache
 	/**
 	 * {@inheritDoc}
 	 */
-	public function GetName()
+	public function GetName(): string
 	{
 		return $this->cache->getName() . ' (with profiler)';
 	}

src/Core/Cache/Type/RedisCache.php

@@ -19,17 +19,21 @@
  *
  */
 
-namespace Friendica\Core\Cache;
+namespace Friendica\Core\Cache\Type;
 
 use Exception;
-use Friendica\Core\BaseCache;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Cache\Capability\ICanCacheInMemory;
+use Friendica\Core\Cache\Enum\Type;
+use Friendica\Core\Cache\Exception\CachePersistenceException;
+use Friendica\Core\Cache\Exception\InvalidCacheDriverException;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Redis;
 
 /**
  * Redis Cache. This driver is based on Memcache driver
  */
-class RedisCache extends BaseCache implements IMemoryCache
+class RedisCache extends AbstractCache implements ICanCacheInMemory
 {
 	/**
 	 * @var Redis
@@ -37,12 +41,13 @@ class RedisCache extends BaseCache implements IMemoryCache
 	private $redis;
 
 	/**
-	 * @throws Exception
+	 * @throws InvalidCacheDriverException
+	 * @throws CachePersistenceException
 	 */
-	public function __construct(string $hostname, IConfig $config)
+	public function __construct(string $hostname, IManageConfigValues $config)
 	{
 		if (!class_exists('Redis', false)) {
-			throw new Exception('Redis class isn\'t available');
+			throw new InvalidCacheDriverException('Redis class isn\'t available');
 		}
 
 		parent::__construct($hostname);
@@ -55,24 +60,24 @@ class RedisCache extends BaseCache implements IMemoryCache
 		$redis_db   = $config->get('system', 'redis_db', 0);
 
 		if (isset($redis_port) && !@$this->redis->connect($redis_host, $redis_port)) {
-			throw new Exception('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available');
+			throw new CachePersistenceException('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available');
 		} elseif (!@$this->redis->connect($redis_host)) {
-			throw new Exception('Expected Redis server at ' . $redis_host . ' isn\'t available');
+			throw new CachePersistenceException('Expected Redis server at ' . $redis_host . ' isn\'t available');
 		}
 
 		if (isset($redis_pw) && !$this->redis->auth($redis_pw)) {
-			throw new Exception('Cannot authenticate redis server at ' . $redis_host . ':' . $redis_port);
+			throw new CachePersistenceException('Cannot authenticate redis server at ' . $redis_host . ':' . $redis_port);
 		}
 
 		if ($redis_db !== 0 && !$this->redis->select($redis_db)) {
-			throw new Exception('Cannot switch to redis db ' . $redis_db . ' at ' . $redis_host . ':' . $redis_port);
+			throw new CachePersistenceException('Cannot switch to redis db ' . $redis_db . ' at ' . $redis_host . ':' . $redis_port);
 		}
 	}
 
 	/**
 	 * (@inheritdoc)
 	 */
-	public function getAllKeys($prefix = null)
+	public function getAllKeys(?string $prefix = null): array
 	{
 		if (empty($prefix)) {
 			$search = '*';
@@ -88,13 +93,13 @@ class RedisCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function get($key)
+	public function get(string $key)
 	{
-		$return = null;
-		$cachekey = $this->getCacheKey($key);
+		$return   = null;
+		$cacheKey = $this->getCacheKey($key);
 
-		$cached = $this->redis->get($cachekey);
-		if ($cached === false && !$this->redis->exists($cachekey)) {
+		$cached = $this->redis->get($cacheKey);
+		if ($cached === false && !$this->redis->exists($cacheKey)) {
 			return null;
 		}
 
@@ -113,21 +118,21 @@ class RedisCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function set($key, $value, $ttl = Duration::FIVE_MINUTES)
+	public function set(string $key, $value, int $ttl = Duration::FIVE_MINUTES): bool
 	{
-		$cachekey = $this->getCacheKey($key);
+		$cacheKey = $this->getCacheKey($key);
 
 		$cached = serialize($value);
 
 		if ($ttl > 0) {
 			return $this->redis->setex(
-				$cachekey,
+				$cacheKey,
 				$ttl,
 				$cached
 			);
 		} else {
 			return $this->redis->set(
-				$cachekey,
+				$cacheKey,
 				$cached
 			);
 		}
@@ -136,10 +141,10 @@ class RedisCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function delete($key)
+	public function delete(string $key): bool
 	{
-		$cachekey = $this->getCacheKey($key);
-		$this->redis->del($cachekey);
+		$cacheKey = $this->getCacheKey($key);
+		$this->redis->del($cacheKey);
 		// Redis doesn't have an error state for del()
 		return true;
 	}
@@ -147,7 +152,7 @@ class RedisCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function clear($outdated = true)
+	public function clear(bool $outdated = true): bool
 	{
 		if ($outdated) {
 			return true;
@@ -159,34 +164,30 @@ class RedisCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function add($key, $value, $ttl = Duration::FIVE_MINUTES)
+	public function add(string $key, $value, int $ttl = Duration::FIVE_MINUTES): bool
 	{
-		$cachekey = $this->getCacheKey($key);
-		$cached = serialize($value);
+		$cacheKey = $this->getCacheKey($key);
+		$cached   = serialize($value);
 
-		return $this->redis->setnx($cachekey, $cached);
+		return $this->redis->setnx($cacheKey, $cached);
 	}
 
 	/**
 	 * (@inheritdoc)
 	 */
-	public function compareSet($key, $oldValue, $newValue, $ttl = Duration::FIVE_MINUTES)
+	public function compareSet(string $key, $oldValue, $newValue, int $ttl = Duration::FIVE_MINUTES): bool
 	{
-		$cachekey = $this->getCacheKey($key);
+		$cacheKey = $this->getCacheKey($key);
 
 		$newCached = serialize($newValue);
 
-		$this->redis->watch($cachekey);
+		$this->redis->watch($cacheKey);
 		// If the old value isn't what we expected, somebody else changed the key meanwhile
 		if ($this->get($key) === $oldValue) {
 			if ($ttl > 0) {
-				$result = $this->redis->multi()
-					->setex($cachekey, $ttl, $newCached)
-					->exec();
+				$result = $this->redis->multi()->setex($cacheKey, $ttl, $newCached)->exec();
 			} else {
-				$result = $this->redis->multi()
-					->set($cachekey, $newCached)
-					->exec();
+				$result = $this->redis->multi()->set($cacheKey, $newCached)->exec();
 			}
 			return $result !== false;
 		}
@@ -197,17 +198,15 @@ class RedisCache extends BaseCache implements IMemoryCache
 	/**
 	 * (@inheritdoc)
 	 */
-	public function compareDelete($key, $value)
+	public function compareDelete(string $key, $value): bool
 	{
-		$cachekey = $this->getCacheKey($key);
+		$cacheKey = $this->getCacheKey($key);
 
-		$this->redis->watch($cachekey);
+		$this->redis->watch($cacheKey);
 		// If the old value isn't what we expected, somebody else changed the key meanwhile
 		if ($this->get($key) === $value) {
-			$result = $this->redis->multi()
-				->del($cachekey)
-				->exec();
-			return $result !== false;
+			$this->redis->multi()->del($cacheKey)->exec();
+			return true;
 		}
 		$this->redis->unwatch();
 		return false;
@@ -216,7 +215,7 @@ class RedisCache extends BaseCache implements IMemoryCache
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getName()
+	public function getName(): string
 	{
 		return Type::REDIS;
 	}

src/Core/Config/Capability/IManageConfigValues.php

@@ -19,30 +19,35 @@
  *
  */
 
-namespace Friendica\Core\Config;
+namespace Friendica\Core\Config\Capability;
+
+use Friendica\Core\Config\Exception\ConfigPersistenceException;
+use Friendica\Core\Config\ValueObject\Cache;
 
 /**
- * Interface for accessing system wide configurations
+ * Interface for accessing system-wide configurations
  */
-interface IConfig
+interface IManageConfigValues
 {
-
 	/**
 	 * Loads all configuration values of family into a cached storage.
 	 *
-	 * All configuration values of the system are stored in the cache ( @param string $cat The category of the configuration value
+	 * All configuration values of the system are stored in the cache.
+	 *
+	 * @param string $cat The category of the configuration value
 	 *
 	 * @return void
+	 *
+	 * @throws ConfigPersistenceException In case the persistence layer throws errors
 	 */
-	function load(string $cat = 'config');
+	public function load(string $cat = 'config');
 
 	/**
 	 * Get a particular user's config variable given the category name
 	 * ($cat) and a $key.
 	 *
 	 * Get a particular config value from the given category ($cat)
-	 * and the $key from a cached storage either from the $this->configAdapter
-	 * (@see IConfigAdapter) or from the $this->configCache (@see ConfigCache).
+	 * and the $key from a cached storage either from the database or from the cache.
 	 *
 	 * @param string  $cat        The category of the configuration value
 	 * @param string  $key           The configuration key to query
@@ -50,8 +55,11 @@ interface IConfig
 	 * @param boolean $refresh       optional, If true the config is loaded from the db and not from the cache (default: false)
 	 *
 	 * @return mixed Stored value or null if it does not exist
+	 *
+	 * @throws ConfigPersistenceException In case the persistence layer throws errors
+	 *
 	 */
-	function get(string $cat, string $key, $default_value = null, bool $refresh = false);
+	public function get(string $cat, string $key, $default_value = null, bool $refresh = false);
 
 	/**
 	 * Sets a configuration value for system config
@@ -65,26 +73,30 @@ interface IConfig
 	 * @param mixed  $value  The value to store
 	 *
 	 * @return bool Operation success
+	 *
+	 * @throws ConfigPersistenceException In case the persistence layer throws errors
 	 */
-	function set(string $cat, string $key, $value);
+	public function set(string $cat, string $key, $value): bool;
 
 	/**
 	 * Deletes the given key from the system configuration.
 	 *
-	 * Removes the configured value from the stored cache in $this->configCache
-	 * (@see ConfigCache) and removes it from the database (@see IConfigAdapter).
+	 * Removes the configured value from the stored cache in the cache and removes it from the database.
 	 *
 	 * @param string $cat The category of the configuration value
 	 * @param string $key    The configuration key to delete
 	 *
 	 * @return bool
+	 *
+	 * @throws ConfigPersistenceException In case the persistence layer throws errors
+	 *
 	 */
-	function delete(string $cat, string $key);
+	public function delete(string $cat, string $key): bool;
 
 	/**
 	 * Returns the Config Cache
 	 *
 	 * @return Cache
 	 */
-	function getCache();
+	public function getCache(): Cache;
 }

src/Core/Config/Exception/ConfigFileException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Friendica\Core\Config\Exception;
+
+use Throwable;
+
+class ConfigFileException extends \RuntimeException
+{
+	public function __construct($message = "", $code = 0, Throwable $previous = null)
+	{
+		parent::__construct($message, 500, $previous);
+	}
+}

src/Core/Config/Exception/ConfigPersistenceException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Friendica\Core\Config\Exception;
+
+use Throwable;
+
+class ConfigPersistenceException extends \RuntimeException
+{
+	public function __construct($message = "", Throwable $previous = null)
+	{
+		parent::__construct($message, 500, $previous);
+	}
+}

src/Core/Config/Factory/Config.php

@@ -19,16 +19,15 @@
  *
  */
 
-namespace Friendica\Factory;
+namespace Friendica\Core\Config\Factory;
 
-use Exception;
-use Friendica\Core\Config;
-use Friendica\Core\Config\Cache;
-use Friendica\Model\Config\Config as ConfigModel;
-use Friendica\Model\Config\PConfig as PConfigModel;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Capability;
+use Friendica\Core\Config\Repository;
+use Friendica\Core\Config\Type;
+use Friendica\Core\Config\Util;
+use Friendica\Core\Config\ValueObject\Cache;
 
-class ConfigFactory
+class Config
 {
 	/**
 	 * The key of the $_SERVER variable to override the config directory
@@ -53,11 +52,11 @@ class ConfigFactory
 
 	/**
 	 * @param string $basePath The basepath of FRIENDICA
-	 * @param array $serer the $_SERVER array
+	 * @param array  $server   The $_SERVER array
 	 *
-	 * @return ConfigFileLoader
+	 * @return Util\ConfigFileLoader
 	 */
-	public function createConfigFileLoader(string $basePath, array $server = [])
+	public function createConfigFileLoader(string $basePath, array $server = []): Util\ConfigFileLoader
 	{
 		if (!empty($server[self::CONFIG_DIR_ENV]) && is_dir($server[self::CONFIG_DIR_ENV])) {
 			$configDir = $server[self::CONFIG_DIR_ENV];
@@ -66,17 +65,16 @@ class ConfigFactory
 		}
 		$staticDir = $basePath . DIRECTORY_SEPARATOR . self::STATIC_DIR;
 
-		return new ConfigFileLoader($basePath, $configDir, $staticDir);
+		return new Util\ConfigFileLoader($basePath, $configDir, $staticDir);
 	}
 
 	/**
-	 * @param ConfigFileLoader $loader The Config Cache loader (INI/config/.htconfig)
+	 * @param Util\ConfigFileLoader $loader The Config Cache loader (INI/config/.htconfig)
+	 * @param array                 $server
 	 *
 	 * @return Cache
-	 *
-	 * @throws Exception
 	 */
-	public function createCache(ConfigFileLoader $loader, array $server = [])
+	public function createCache(Util\ConfigFileLoader $loader, array $server = []): Cache
 	{
 		$configCache = new Cache();
 		$loader->setupCache($configCache, $server);
@@ -85,36 +83,17 @@ class ConfigFactory
 	}
 
 	/**
-	 * @param Cache       $configCache The config cache of this adapter
-	 * @param ConfigModel $configModel The configuration model
+	 * @param Cache $configCache The config cache of this adapter
+	 * @param Repository\Config $configRepo  The configuration repository
 	 *
-	 * @return Config\IConfig
+	 * @return Capability\IManageConfigValues
 	 */
-	public function createConfig(Cache $configCache, ConfigModel $configModel)
+	public function create(Cache $configCache, Repository\Config $configRepo)
 	{
 		if ($configCache->get('system', 'config_adapter') === 'preload') {
-			$configuration = new Config\PreloadConfig($configCache, $configModel);
+			$configuration = new Type\PreloadConfig($configCache, $configRepo);
 		} else {
-			$configuration = new Config\JitConfig($configCache, $configModel);
-		}
-
-
-		return $configuration;
-	}
-
-	/**
-	 * @param Cache                         $configCache  The config cache
-	 * @param \Friendica\Core\PConfig\Cache $pConfigCache The personal config cache
-	 * @param PConfigModel                  $configModel  The configuration model
-	 *
-	 * @return \Friendica\Core\PConfig\IPConfig
-	 */
-	public function createPConfig(Cache $configCache, \Friendica\Core\PConfig\Cache $pConfigCache, PConfigModel $configModel)
-	{
-		if ($configCache->get('system', 'config_adapter') === 'preload') {
-			$configuration = new \Friendica\Core\PConfig\PreloadPConfig($pConfigCache, $configModel);
-		} else {
-			$configuration = new \Friendica\Core\PConfig\JitPConfig($pConfigCache, $configModel);
+			$configuration = new Type\JitConfig($configCache, $configRepo);
 		}
 
 		return $configuration;

src/Core/Config/Repository/Config.php

@@ -0,0 +1,187 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Core\Config\Repository;
+
+use Friendica\Core\Config\Exception\ConfigPersistenceException;
+use Friendica\Core\Config\Util\ValueConversion;
+use Friendica\Database\Database;
+
+/**
+ * The Config Repository, which is using the general DB-model backend for configs
+ */
+class Config
+{
+	/** @var Database */
+	protected $db;
+
+	public function __construct(Database $db)
+	{
+		$this->db = $db;
+	}
+
+	protected static $table_name = 'config';
+
+	/**
+	 * Checks if the model is currently connected
+	 *
+	 * @return bool
+	 */
+	public function isConnected(): bool
+	{
+		return $this->db->isConnected();
+	}
+
+	/**
+	 * Loads all configuration values and returns the loaded category as an array.
+	 *
+	 * @param string|null $cat The category of the configuration values to load
+	 *
+	 * @return array The config array
+	 *
+	 * @throws ConfigPersistenceException In case the persistence layer throws errors
+	 */
+	public function load(?string $cat = null): array
+	{
+		$return = [];
+
+		try {
+			if (empty($cat)) {
+				$configs = $this->db->select(static::$table_name, ['cat', 'v', 'k']);
+			} else {
+				$configs = $this->db->select(static::$table_name, ['cat', 'v', 'k'], ['cat' => $cat]);
+			}
+
+			while ($config = $this->db->fetch($configs)) {
+				$key   = $config['k'];
+				$value = ValueConversion::toConfigValue($config['v']);
+
+				// just save it in case it is set
+				if (isset($value)) {
+					$return[$config['cat']][$key] = $value;
+				}
+			}
+		} catch (\Exception $exception) {
+			throw new ConfigPersistenceException(sprintf('Cannot load config category %s', $cat), $exception);
+		} finally {
+			$this->db->close($configs);
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Get a particular, system-wide config variable out of the DB with the
+	 * given category name ($cat) and a key ($key).
+	 *
+	 * Note: Boolean variables are defined as 0/1 in the database
+	 *
+	 * @param string $cat The category of the configuration value
+	 * @param string $key The configuration key to query
+	 *
+	 * @return array|string|null Stored value or null if it does not exist
+	 *
+	 * @throws ConfigPersistenceException In case the persistence layer throws errors
+	 */
+	public function get(string $cat, string $key)
+	{
+		if (!$this->isConnected()) {
+			return null;
+		}
+
+		try {
+			$config = $this->db->selectFirst(static::$table_name, ['v'], ['cat' => $cat, 'k' => $key]);
+			if ($this->db->isResult($config)) {
+				$value = ValueConversion::toConfigValue($config['v']);
+
+				// just return it in case it is set
+				if (isset($value)) {
+					return $value;
+				}
+			}
+		} catch (\Exception $exception) {
+			throw new ConfigPersistenceException(sprintf('Cannot get config with category %s and key %s', $cat, $key), $exception);
+		}
+
+		return null;
+	}
+
+	/**
+	 * Stores a config value ($value) in the category ($cat) under the key ($key).
+	 *
+	 * Note: Please do not store booleans - convert to 0/1 integer values!
+	 *
+	 * @param string $cat   The category of the configuration value
+	 * @param string $key   The configuration key to set
+	 * @param mixed  $value The value to store
+	 *
+	 * @return bool Operation success
+	 *
+	 * @throws ConfigPersistenceException In case the persistence layer throws errors
+	 */
+	public function set(string $cat, string $key, $value): bool
+	{
+		if (!$this->isConnected()) {
+			return false;
+		}
+
+		// We store our setting values in a string variable.
+		// So we have to do the conversion here so that the compare below works.
+		// The exception are array values.
+		$compare_value = (!is_array($value) ? (string)$value : $value);
+		$stored_value  = $this->get($cat, $key);
+
+		if (isset($stored_value) && ($stored_value === $compare_value)) {
+			return true;
+		}
+
+		$dbValue = ValueConversion::toDbValue($value);
+
+		try {
+			return $this->db->update(static::$table_name, ['v' => $dbValue], ['cat' => $cat, 'k' => $key], true);
+		} catch (\Exception $exception) {
+			throw new ConfigPersistenceException(sprintf('Cannot set config with category %s and key %s', $cat, $key), $exception);
+		}
+	}
+
+	/**
+	 * Removes the configured value from the database.
+	 *
+	 * @param string $cat The category of the configuration value
+	 * @param string $key The configuration key to delete
+	 *
+	 * @return bool Operation success
+	 *
+	 * @throws ConfigPersistenceException In case the persistence layer throws errors
+	 */
+	public function delete(string $cat, string $key): bool
+	{
+		if (!$this->isConnected()) {
+			return false;
+		}
+
+		try {
+			return $this->db->delete(static::$table_name, ['cat' => $cat, 'k' => $key]);
+		} catch (\Exception $exception) {
+			throw new ConfigPersistenceException(sprintf('Cannot delete config with category %s and key %s', $cat, $key), $exception);
+		}
+	}
+}

src/Core/Config/Type/AbstractConfig.php

@@ -19,19 +19,19 @@
  *
  */
 
-namespace Friendica\Core;
+namespace Friendica\Core\Config\Type;
 
-use Friendica\Core\Config\Cache;
-use Friendica\Core\Config\IConfig;
-use Friendica\Model;
+use Friendica\Core\Config\Repository\Config;
+use Friendica\Core\Config\ValueObject\Cache;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 
 /**
  * This class is responsible for all system-wide configuration values in Friendica
  * There are two types of storage
- * - The Config-Files    (loaded into the FileCache @see Cache\ConfigCache)
- * - The Config-DB-Table (per Config-DB-model @see Model\Config\Config)
+ * - The Config-Files    (loaded into the FileCache @see Cache)
+ * - The Config-Repository (per Config-Repository @see Config )
  */
-abstract class BaseConfig implements IConfig
+abstract class AbstractConfig implements IManageConfigValues
 {
 	/**
 	 * @var Cache
@@ -39,24 +39,24 @@ abstract class BaseConfig implements IConfig
 	protected $configCache;
 
 	/**
-	 * @var Model\Config\Config
+	 * @var Config
 	 */
-	protected $configModel;
+	protected $configRepo;
 
 	/**
-	 * @param Cache $configCache The configuration cache (based on the config-files)
-	 * @param Model\Config\Config          $configModel The configuration model
+	 * @param Cache  $configCache The configuration cache (based on the config-files)
+	 * @param Config $configRepo  The configuration repository
 	 */
-	public function __construct(Cache $configCache, Model\Config\Config $configModel)
+	public function __construct(Cache $configCache, Config $configRepo)
 	{
 		$this->configCache = $configCache;
-		$this->configModel = $configModel;
+		$this->configRepo  = $configRepo;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getCache()
+	public function getCache(): Cache
 	{
 		return $this->configCache;
 	}

src/Core/Config/Type/JitConfig.php

@@ -19,10 +19,10 @@
  *
  */
 
-namespace Friendica\Core\Config;
+namespace Friendica\Core\Config\Type;
 
-use Friendica\Core\BaseConfig;
-use Friendica\Model;
+use Friendica\Core\Config\ValueObject\Cache;
+use Friendica\Core\Config\Repository\Config;
 
 /**
  * This class implements the Just-In-Time configuration, which will cache
@@ -31,7 +31,7 @@ use Friendica\Model;
  * Default Configuration type.
  * Provides the best performance for pages loading few configuration variables.
  */
-class JitConfig extends BaseConfig
+class JitConfig extends AbstractConfig
 {
 	/**
 	 * @var array Array of already loaded db values (even if there was no value)
@@ -39,12 +39,12 @@ class JitConfig extends BaseConfig
 	private $db_loaded;
 
 	/**
-	 * @param Cache               $configCache The configuration cache (based on the config-files)
-	 * @param Model\Config\Config $configModel The configuration model
+	 * @param Cache  $configCache The configuration cache (based on the config-files)
+	 * @param Config $configRepo  The configuration model
 	 */
-	public function __construct(Cache $configCache, Model\Config\Config $configModel)
+	public function __construct(Cache $configCache, Config $configRepo)
 	{
-		parent::__construct($configCache, $configModel);
+		parent::__construct($configCache, $configRepo);
 		$this->db_loaded = [];
 
 		$this->load();
@@ -52,16 +52,15 @@ class JitConfig extends BaseConfig
 
 	/**
 	 * {@inheritDoc}
-	 *
 	 */
 	public function load(string $cat = 'config')
 	{
 		// If not connected, do nothing
-		if (!$this->configModel->isConnected()) {
+		if (!$this->configRepo->isConnected()) {
 			return;
 		}
 
-		$config = $this->configModel->load($cat);
+		$config = $this->configRepo->load($cat);
 
 		if (!empty($config[$cat])) {
 			foreach ($config[$cat] as $key => $value) {
@@ -79,15 +78,14 @@ class JitConfig extends BaseConfig
 	public function get(string $cat, string $key, $default_value = null, bool $refresh = false)
 	{
 		// if the value isn't loaded or refresh is needed, load it to the cache
-		if ($this->configModel->isConnected() &&
-		    (empty($this->db_loaded[$cat][$key]) ||
-		     $refresh)) {
+		if ($this->configRepo->isConnected() &&
+			(empty($this->db_loaded[$cat][$key]) ||
+			 $refresh)) {
+			$dbValue = $this->configRepo->get($cat, $key);
 
-			$dbvalue = $this->configModel->get($cat, $key);
-
-			if (isset($dbvalue)) {
-				$this->configCache->set($cat, $key, $dbvalue, Cache::SOURCE_DB);
-				unset($dbvalue);
+			if (isset($dbValue)) {
+				$this->configCache->set($cat, $key, $dbValue, Cache::SOURCE_DB);
+				unset($dbValue);
 			}
 
 			$this->db_loaded[$cat][$key] = true;
@@ -102,17 +100,17 @@ class JitConfig extends BaseConfig
 	/**
 	 * {@inheritDoc}
 	 */
-	public function set(string $cat, string $key, $value)
+	public function set(string $cat, string $key, $value): bool
 	{
 		// set the cache first
 		$cached = $this->configCache->set($cat, $key, $value, Cache::SOURCE_DB);
 
 		// If there is no connected adapter, we're finished
-		if (!$this->configModel->isConnected()) {
+		if (!$this->configRepo->isConnected()) {
 			return $cached;
 		}
 
-		$stored = $this->configModel->set($cat, $key, $value);
+		$stored = $this->configRepo->set($cat, $key, $value);
 
 		$this->db_loaded[$cat][$key] = $stored;
 
@@ -122,7 +120,7 @@ class JitConfig extends BaseConfig
 	/**
 	 * {@inheritDoc}
 	 */
-	public function delete(string $cat, string $key)
+	public function delete(string $cat, string $key): bool
 	{
 		$cacheRemoved = $this->configCache->delete($cat, $key);
 
@@ -130,11 +128,11 @@ class JitConfig extends BaseConfig
 			unset($this->db_loaded[$cat][$key]);
 		}
 
-		if (!$this->configModel->isConnected()) {
+		if (!$this->configRepo->isConnected()) {
 			return $cacheRemoved;
 		}
 
-		$storeRemoved = $this->configModel->delete($cat, $key);
+		$storeRemoved = $this->configRepo->delete($cat, $key);
 
 		return $cacheRemoved || $storeRemoved;
 	}

src/Core/Config/Type/PreloadConfig.php

@@ -19,10 +19,10 @@
  *
  */
 
-namespace Friendica\Core\Config;
+namespace Friendica\Core\Config\Type;
 
-use Friendica\Core\BaseConfig;
-use Friendica\Model;
+use Friendica\Core\Config\ValueObject\Cache;
+use Friendica\Core\Config\Repository\Config;
 
 /**
  * This class implements the preload configuration, which will cache
@@ -30,18 +30,18 @@ use Friendica\Model;
  *
  * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
  */
-class PreloadConfig extends BaseConfig
+class PreloadConfig extends AbstractConfig
 {
 	/** @var bool */
 	private $config_loaded;
 
 	/**
-	 * @param Cache               $configCache The configuration cache (based on the config-files)
-	 * @param Model\Config\Config $configModel The configuration model
+	 * @param Cache  $configCache The configuration cache (based on the config-files)
+	 * @param Config $configRepo  The configuration model
 	 */
-	public function __construct(Cache $configCache, Model\Config\Config $configModel)
+	public function __construct(Cache $configCache, Config $configRepo)
 	{
-		parent::__construct($configCache, $configModel);
+		parent::__construct($configCache, $configRepo);
 		$this->config_loaded = false;
 
 		$this->load();
@@ -51,7 +51,6 @@ class PreloadConfig extends BaseConfig
 	 * {@inheritDoc}
 	 *
 	 * This loads all config values everytime load is called
-	 *
 	 */
 	public function load(string $cat = 'config')
 	{
@@ -61,11 +60,11 @@ class PreloadConfig extends BaseConfig
 		}
 
 		// If not connected, do nothing
-		if (!$this->configModel->isConnected()) {
+		if (!$this->configRepo->isConnected()) {
 			return;
 		}
 
-		$config              = $this->configModel->load();
+		$config              = $this->configRepo->load();
 		$this->config_loaded = true;
 
 		// load the whole category out of the DB into the cache
@@ -78,8 +77,8 @@ class PreloadConfig extends BaseConfig
 	public function get(string $cat, string $key, $default_value = null, bool $refresh = false)
 	{
 		if ($refresh) {
-			if ($this->configModel->isConnected()) {
-				$config = $this->configModel->get($cat, $key);
+			if ($this->configRepo->isConnected()) {
+				$config = $this->configRepo->get($cat, $key);
 				if (isset($config)) {
 					$this->configCache->set($cat, $key, $config, Cache::SOURCE_DB);
 				}
@@ -95,7 +94,7 @@ class PreloadConfig extends BaseConfig
 	/**
 	 * {@inheritDoc}
 	 */
-	public function set(string $cat, string $key, $value)
+	public function set(string $cat, string $key, $value): bool
 	{
 		if (!$this->config_loaded) {
 			$this->load();
@@ -105,11 +104,11 @@ class PreloadConfig extends BaseConfig
 		$cached = $this->configCache->set($cat, $key, $value, Cache::SOURCE_DB);
 
 		// If there is no connected adapter, we're finished
-		if (!$this->configModel->isConnected()) {
+		if (!$this->configRepo->isConnected()) {
 			return $cached;
 		}
 
-		$stored = $this->configModel->set($cat, $key, $value);
+		$stored = $this->configRepo->set($cat, $key, $value);
 
 		return $cached && $stored;
 	}
@@ -117,7 +116,7 @@ class PreloadConfig extends BaseConfig
 	/**
 	 * {@inheritDoc}
 	 */
-	public function delete(string $cat, string $key)
+	public function delete(string $cat, string $key): bool
 	{
 		if ($this->config_loaded) {
 			$this->load();
@@ -125,26 +124,12 @@ class PreloadConfig extends BaseConfig
 
 		$cacheRemoved = $this->configCache->delete($cat, $key);
 
-		if (!$this->configModel->isConnected()) {
+		if (!$this->configRepo->isConnected()) {
 			return $cacheRemoved;
 		}
 
-		$storeRemoved = $this->configModel->delete($cat, $key);
+		$storeRemoved = $this->configRepo->delete($cat, $key);
 
 		return $cacheRemoved || $storeRemoved;
 	}
-
-	public function testSetDouble()
-	{
-		$this->configModel->shouldReceive('isConnected')
-						  ->andReturn(true);
-
-		// constructor loading
-		$this->configModel->shouldReceive('load')
-						  ->with('config')
-						  ->andReturn(['config' => ['test' => 'it']])
-						  ->once();
-
-		parent::testSetDouble();
-	}
 }

src/Core/Config/Util/ConfigFileLoader.php

@@ -19,11 +19,11 @@
  *
  */
 
-namespace Friendica\Util;
+namespace Friendica\Core\Config\Util;
 
-use Exception;
 use Friendica\Core\Addon;
-use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\Exception\ConfigFileException;
+use Friendica\Core\Config\ValueObject\Cache;
 
 /**
  * The ConfigFileLoader loads config-files and stores them in a ConfigCache ( @see Cache )
@@ -91,7 +91,7 @@ class ConfigFileLoader
 	 * @param array $server The $_SERVER array
 	 * @param bool  $raw    Setup the raw config format
 	 *
-	 * @throws Exception
+	 * @throws ConfigFileException
 	 */
 	public function setupCache(Cache $config, array $server = [], bool $raw = false)
 	{
@@ -122,9 +122,9 @@ class ConfigFileLoader
 	 *
 	 * @return array The config array (empty if no config found)
 	 *
-	 * @throws Exception if the configuration file isn't readable
+	 * @throws ConfigFileException if the configuration file isn't readable
 	 */
-	private function loadStaticConfig($name)
+	private function loadStaticConfig(string $name): array
 	{
 		$configName = $this->staticDir . DIRECTORY_SEPARATOR . $name . '.config.php';
 		$iniName    = $this->staticDir . DIRECTORY_SEPARATOR . $name . '.ini.php';
@@ -143,9 +143,7 @@ class ConfigFileLoader
 	 *
 	 * @param Cache $config The Config cache
 	 *
-	 * @return array The config array (empty if no config found)
-	 *
-	 * @throws Exception if the configuration file isn't readable
+	 * @throws ConfigFileException if the configuration file isn't readable
 	 */
 	private function loadCoreConfig(Cache $config)
 	{
@@ -158,8 +156,6 @@ class ConfigFileLoader
 		foreach ($this->getConfigFiles() as $configFile) {
 			$config->load($this->loadConfigFile($configFile), Cache::SOURCE_FILE);
 		}
-
-		return [];
 	}
 
 	/**
@@ -169,15 +165,15 @@ class ConfigFileLoader
 	 *
 	 * @return array The config array (empty if no config found)
 	 *
-	 * @throws Exception if the configuration file isn't readable
+	 * @throws ConfigFileException if the configuration file isn't readable
 	 */
-	public function loadAddonConfig($name)
+	public function loadAddonConfig(string $name): array
 	{
 		$filepath = $this->baseDir . DIRECTORY_SEPARATOR .   // /var/www/html/
-		            Addon::DIRECTORY . DIRECTORY_SEPARATOR . // addon/
-		            $name . DIRECTORY_SEPARATOR .            // openstreetmap/
-		            'config'. DIRECTORY_SEPARATOR . 		 // config/
-		            $name . ".config.php";                   // openstreetmap.config.php
+					Addon::DIRECTORY . DIRECTORY_SEPARATOR . // addon/
+					$name . DIRECTORY_SEPARATOR .            // openstreetmap/
+					'config'. DIRECTORY_SEPARATOR . 		 // config/
+					$name . ".config.php";                   // openstreetmap.config.php
 
 		if (file_exists($filepath)) {
 			return $this->loadConfigFile($filepath);
@@ -193,9 +189,9 @@ class ConfigFileLoader
 	 *
 	 * @return array The config array (empty if no config was found)
 	 *
-	 * @throws Exception if the configuration file isn't readable
+	 * @throws ConfigFileException if the configuration file isn't readable
 	 */
-	public function loadEnvConfig(array $server)
+	public function loadEnvConfig(array $server): array
 	{
 		$filepath = $this->staticDir . DIRECTORY_SEPARATOR .   // /var/www/html/static/
 					"env.config.php";                          // env.config.php
@@ -224,10 +220,10 @@ class ConfigFileLoader
 	 *
 	 * @return array
 	 */
-	private function getConfigFiles(bool $ini = false)
+	private function getConfigFiles(bool $ini = false): array
 	{
 		$files = scandir($this->configDir);
-		$found = array();
+		$found = [];
 
 		$filePattern = ($ini ? '*.ini.php' : '*.config.php');
 
@@ -252,7 +248,7 @@ class ConfigFileLoader
 	 *
 	 * @deprecated since version 2018.09
 	 */
-	private function loadLegacyConfig($name = '')
+	private function loadLegacyConfig(string $name = ''): array
 	{
 		$name     = !empty($name) ? $name : self::CONFIG_HTCONFIG;
 		$fullName = $this->baseDir . DIRECTORY_SEPARATOR . '.' . $name . '.php';
@@ -322,17 +318,17 @@ class ConfigFileLoader
 	 * @param string $filepath
 	 *
 	 * @return array The configuration array
-	 * @throws Exception
+	 * @throws ConfigFileException
 	 * @deprecated since version 2018.12
 	 */
-	private function loadINIConfigFile($filepath)
+	private function loadINIConfigFile(string $filepath): array
 	{
 		$contents = include($filepath);
 
 		$config = parse_ini_string($contents, true, INI_SCANNER_TYPED);
 
 		if ($config === false) {
-			throw new Exception('Error parsing INI config file ' . $filepath);
+			throw new ConfigFileException('Error parsing INI config file ' . $filepath);
 		}
 
 		return $config;
@@ -353,14 +349,14 @@ class ConfigFileLoader
 	 *
 	 * @return array The config array0
 	 *
-	 * @throws Exception if the config cannot get loaded.
+	 * @throws ConfigFileException if the config cannot get loaded.
 	 */
-	private function loadConfigFile($filepath)
+	private function loadConfigFile(string $filepath): array
 	{
 		$config = include($filepath);
 
 		if (!is_array($config)) {
-			throw new Exception('Error loading config file ' . $filepath);
+			throw new ConfigFileException('Error loading config file ' . $filepath);
 		}
 
 		return $config;

src/Core/Config/Util/ValueConversion.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Friendica\Core\Config\Util;
+
+/**
+ * Util class to help to convert from/to (p)config values
+ */
+class ValueConversion
+{
+	/**
+	 * Formats a DB value to a config value
+	 * - null   = The db-value isn't set
+	 * - bool   = The db-value is either '0' or '1'
+	 * - array  = The db-value is a serialized array
+	 * - string = The db-value is a string
+	 *
+	 * Keep in mind that there aren't any numeric/integer config values in the database
+	 *
+	 * @param string|null $value
+	 *
+	 * @return null|array|string
+	 */
+	public static function toConfigValue(?string $value)
+	{
+		if (!isset($value)) {
+			return null;
+		}
+
+		switch (true) {
+			// manage array value
+			case preg_match("|^a:[0-9]+:{.*}$|s", $value):
+				return unserialize($value);
+
+			default:
+				return $value;
+		}
+	}
+
+	/**
+	 * Formats a config value to a DB value (string)
+	 *
+	 * @param mixed $value
+	 *
+	 * @return string
+	 */
+	public static function toDbValue($value): string
+	{
+		// if not set, save an empty string
+		if (!isset($value)) {
+			return '';
+		}
+
+		switch (true) {
+			// manage arrays
+			case is_array($value):
+				return serialize($value);
+
+			default:
+				return (string)$value;
+		}
+	}
+}

src/Core/Config/ValueObject/Cache.php

@@ -19,8 +19,9 @@
  *
  */
 
-namespace Friendica\Core\Config;
+namespace Friendica\Core\Config\ValueObject;
 
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use ParagonIE\HiddenString\HiddenString;
 
 /**
@@ -45,7 +46,7 @@ class Cache
 	/**
 	 * @var array
 	 */
-	private $config;
+	private $config = [];
 
 	/**
 	 * @var int[][]
@@ -96,16 +97,16 @@ class Cache
 	/**
 	 * Gets a value from the config cache.
 	 *
-	 * @param string $cat Config category
-	 * @param string $key Config key
+	 * @param string      $cat Config category
+	 * @param string|null $key Config key
 	 *
 	 * @return null|mixed Returns the value of the Config entry or null if not set
 	 */
-	public function get(string $cat, string $key = null)
+	public function get(string $cat, ?string $key = null)
 	{
 		if (isset($this->config[$cat][$key])) {
 			return $this->config[$cat][$key];
-		} else if (!isset($key) && isset($this->config[$cat])) {
+		} elseif (!isset($key) && isset($this->config[$cat])) {
 			return $this->config[$cat];
 		} else {
 			return null;
@@ -122,7 +123,7 @@ class Cache
 	 *
 	 * @return bool True, if the value is set
 	 */
-	public function set(string $cat, string $key, $value, $source = self::SOURCE_DEFAULT)
+	public function set(string $cat, string $key, $value, int $source = self::SOURCE_DEFAULT): bool
 	{
 		if (!isset($this->config[$cat])) {
 			$this->config[$cat] = [];
@@ -155,7 +156,7 @@ class Cache
 	 *
 	 * @return bool true, if deleted
 	 */
-	public function delete(string $cat, string $key)
+	public function delete(string $cat, string $key): bool
 	{
 		if (isset($this->config[$cat][$key])) {
 			unset($this->config[$cat][$key]);
@@ -173,9 +174,9 @@ class Cache
 	/**
 	 * Returns the whole configuration
 	 *
-	 * @return array The configuration
+	 * @return string[][] The configuration
 	 */
-	public function getAll()
+	public function getAll(): array
 	{
 		return $this->config;
 	}
@@ -183,11 +184,11 @@ class Cache
 	/**
 	 * Returns an array with missing categories/Keys
 	 *
-	 * @param array $config The array to check
+	 * @param string[][] $config The array to check
 	 *
-	 * @return array
+	 * @return string[][]
 	 */
-	public function keyDiff(array $config)
+	public function keyDiff(array $config): array
 	{
 		$return = [];
 

src/Core/Installer.php

@@ -23,7 +23,7 @@ namespace Friendica\Core;
 
 use DOMDocument;
 use Exception;
-use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Database\Database;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
@@ -278,7 +278,7 @@ class Installer
 			$cmd = "$phppath -v";
 			$result = trim(shell_exec($cmd));
 			$passed2 = (strpos($result, "(cli)") !== false);
-			list($result) = explode("\n", $result);
+			[$result] = explode("\n", $result);
 			$help = "";
 			if (!$passed2) {
 				$help .= DI::l10n()->t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29") . EOL;
@@ -678,8 +678,8 @@ class Installer
 	/**
 	 * Setup the default cache for a new installation
 	 *
-	 * @param Cache  $configCache The configuration cache
-	 * @param string $basePath    The determined basepath
+	 * @param \Friendica\Core\Config\ValueObject\Cache $configCache The configuration cache
+	 * @param string                                   $basePath    The determined basepath
 	 *
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */

src/Core/L10n.php

@@ -21,8 +21,8 @@
 
 namespace Friendica\Core;
 
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\Session\ISession;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Database\Database;
 use Friendica\Util\Strings;
 use Psr\Log\LoggerInterface;
@@ -62,7 +62,7 @@ class L10n
 	 */
 	private $logger;
 
-	public function __construct(IConfig $config, Database $dba, LoggerInterface $logger, ISession $session, array $server, array $get)
+	public function __construct(IManageConfigValues $config, Database $dba, LoggerInterface $logger, IHandleSessions $session, array $server, array $get)
 	{
 		$this->dba    = $dba;
 		$this->logger = $logger;
@@ -85,7 +85,7 @@ class L10n
 	/**
 	 * Sets the language session variable
 	 */
-	private function setSessionVariable(ISession $session)
+	private function setSessionVariable(IHandleSessions $session)
 	{
 		if ($session->get('authenticated') && !$session->get('language')) {
 			$session->set('language', $this->lang);
@@ -103,7 +103,7 @@ class L10n
 		}
 	}
 
-	private function setLangFromSession(ISession $session)
+	private function setLangFromSession(IHandleSessions $session)
 	{
 		if ($session->get('language') !== $this->lang) {
 			$this->loadTranslationTable($session->get('language'));

src/Core/Lock/CacheLock.php

@@ -1,162 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Core\Lock;
-
-use Friendica\Core\BaseLock;
-use Friendica\Core\Cache\Duration;
-use Friendica\Core\Cache\IMemoryCache;
-
-class CacheLock extends BaseLock
-{
-	/**
-	 * @var string The static prefix of all locks inside the cache
-	 */
-	const CACHE_PREFIX = 'lock:';
-
-	/**
-	 * @var \Friendica\Core\Cache\ICache;
-	 */
-	private $cache;
-
-	/**
-	 * CacheLock constructor.
-	 *
-	 * @param IMemoryCache $cache The CacheDriver for this type of lock
-	 */
-	public function __construct(IMemoryCache $cache)
-	{
-		$this->cache = $cache;
-	}
-
-	/**
-	 * (@inheritdoc)
-	 */
-	public function acquire($key, $timeout = 120, $ttl = Duration::FIVE_MINUTES)
-	{
-		$got_lock = false;
-		$start    = time();
-
-		$cachekey = self::getLockKey($key);
-
-		do {
-			$lock = $this->cache->get($cachekey);
-			// When we do want to lock something that was already locked by us.
-			if ((int)$lock == getmypid()) {
-				$got_lock = true;
-			}
-
-			// When we do want to lock something new
-			if (is_null($lock)) {
-				// At first initialize it with "0"
-				$this->cache->add($cachekey, 0);
-				// Now the value has to be "0" because otherwise the key was used by another process meanwhile
-				if ($this->cache->compareSet($cachekey, 0, getmypid(), $ttl)) {
-					$got_lock = true;
-					$this->markAcquire($key);
-				}
-			}
-
-			if (!$got_lock && ($timeout > 0)) {
-				usleep(rand(10000, 200000));
-			}
-		} while (!$got_lock && ((time() - $start) < $timeout));
-
-		return $got_lock;
-	}
-
-	/**
-	 * (@inheritdoc)
-	 */
-	public function release($key, $override = false)
-	{
-		$cachekey = self::getLockKey($key);
-
-		if ($override) {
-			$return = $this->cache->delete($cachekey);
-		} else {
-			$return = $this->cache->compareDelete($cachekey, getmypid());
-		}
-		$this->markRelease($key);
-
-		return $return;
-	}
-
-	/**
-	 * (@inheritdoc)
-	 */
-	public function isLocked($key)
-	{
-		$cachekey = self::getLockKey($key);
-		$lock     = $this->cache->get($cachekey);
-		return isset($lock) && ($lock !== false);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName()
-	{
-		return $this->cache->getName();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getLocks(string $prefix = '')
-	{
-		$locks = $this->cache->getAllKeys(self::CACHE_PREFIX . $prefix);
-
-		array_walk($locks, function (&$lock, $key) {
-			$lock = substr($lock, strlen(self::CACHE_PREFIX));
-		});
-
-		return $locks;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function releaseAll($override = false)
-	{
-		$success = parent::releaseAll($override);
-
-		$locks = $this->getLocks();
-
-		foreach ($locks as $lock) {
-			if (!$this->release($lock, $override)) {
-				$success = false;
-			}
-		}
-
-		return $success;
-	}
-
-	/**
-	 * @param string $key The original key
-	 *
-	 * @return string        The cache key used for the cache
-	 */
-	private static function getLockKey($key)
-	{
-		return self::CACHE_PREFIX . $key;
-	}
-}

src/Core/Lock/Capability/ICanLock.php

@@ -19,23 +19,22 @@
  *
  */
 
-namespace Friendica\Core\Lock;
+namespace Friendica\Core\Lock\Capability;
 
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Lock\Exception\LockPersistenceException;
 
 /**
  * Lock Interface
  */
-interface ILock
+interface ICanLock
 {
 	/**
 	 * Checks, if a key is currently locked to a or my process
 	 *
 	 * @param string $key The name of the lock
-	 *
-	 * @return bool
 	 */
-	public function isLocked($key);
+	public function isLocked(string $key): bool;
 
 	/**
 	 *
@@ -45,9 +44,9 @@ interface ILock
 	 * @param integer $timeout Seconds until we give up
 	 * @param integer $ttl     Seconds The lock lifespan, must be one of the Cache constants
 	 *
-	 * @return boolean Was the lock successful?
+	 * @throws LockPersistenceException In case the underlying persistence throws errors
 	 */
-	public function acquire($key, $timeout = 120, $ttl = Duration::FIVE_MINUTES);
+	public function acquire(string $key, int $timeout = 120, int $ttl = Duration::FIVE_MINUTES): bool;
 
 	/**
 	 * Releases a lock if it was set by us
@@ -55,32 +54,36 @@ interface ILock
 	 * @param string $key      The Name of the lock
 	 * @param bool   $override Overrides the lock to get released
 	 *
-	 * @return boolean Was the unlock successful?
+	 * @return bool Was the unlock successful?
+	 *
+	 * @throws LockPersistenceException In case the underlying persistence throws errors
 	 */
-	public function release($key, $override = false);
+	public function release(string $key, bool $override = false): bool;
 
 	/**
 	 * Releases all lock that were set by us
 	 *
 	 * @param bool $override Override to release all locks
 	 *
-	 * @return boolean Was the unlock of all locks successful?
+	 * @return bool Was the unlock of all locks successful?
+	 *
+	 * @throws LockPersistenceException In case the underlying persistence throws errors
 	 */
-	public function releaseAll($override = false);
+	public function releaseAll(bool $override = false): bool;
 
 	/**
 	 * Returns the name of the current lock
-	 *
-	 * @return string
 	 */
-	public function getName();
+	public function getName(): string;
 
 	/**
 	 * Lists all locks
 	 *
 	 * @param string prefix optional a prefix to search
 	 *
-	 * @return array Empty if it isn't supported by the cache driver
+	 * @return string[] Empty if it isn't supported by the cache driver
+	 *
+	 * @throws LockPersistenceException In case the underlying persistence throws errors
 	 */
-	public function getLocks(string $prefix = '');
+	public function getLocks(string $prefix = ''): array;
 }

src/Core/Lock/DatabaseLock.php

@@ -1,178 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Core\Lock;
-
-use Friendica\Core\BaseLock;
-use Friendica\Core\Cache\Duration;
-use Friendica\Database\Database;
-use Friendica\Util\DateTimeFormat;
-
-/**
- * Locking driver that stores the locks in the database
- */
-class DatabaseLock extends BaseLock
-{
-	/**
-	 * The current ID of the process
-	 *
-	 * @var int
-	 */
-	private $pid;
-
-	/**
-	 * @var Database The database connection of Friendica
-	 */
-	private $dba;
-
-	/**
-	 * @param null|int $pid The Id of the current process (null means determine automatically)
-	 */
-	public function __construct(Database $dba, $pid = null)
-	{
-		$this->dba = $dba;
-		$this->pid = isset($pid) ? $pid : getmypid();
-	}
-
-	/**
-	 * (@inheritdoc)
-	 */
-	public function acquire($key, $timeout = 120, $ttl = Duration::FIVE_MINUTES)
-	{
-		$got_lock = false;
-		$start    = time();
-
-		do {
-			$this->dba->lock('locks');
-			$lock = $this->dba->selectFirst('locks', ['locked', 'pid'], ['`name` = ? AND `expires` >= ?', $key, DateTimeFormat::utcNow()]);
-
-			if ($this->dba->isResult($lock)) {
-				if ($lock['locked']) {
-					// We want to lock something that was already locked by us? So we got the lock.
-					if ($lock['pid'] == $this->pid) {
-						$got_lock = true;
-					}
-				}
-				if (!$lock['locked']) {
-					$this->dba->update('locks', ['locked' => true, 'pid' => $this->pid, 'expires' => DateTimeFormat::utc('now + ' . $ttl . 'seconds')], ['name' => $key]);
-					$got_lock = true;
-				}
-			} else {
-				$this->dba->insert('locks', ['name' => $key, 'locked' => true, 'pid' => $this->pid, 'expires' => DateTimeFormat::utc('now + ' . $ttl . 'seconds')]);
-				$got_lock = true;
-				$this->markAcquire($key);
-			}
-
-			$this->dba->unlock();
-
-			if (!$got_lock && ($timeout > 0)) {
-				usleep(rand(100000, 2000000));
-			}
-		} while (!$got_lock && ((time() - $start) < $timeout));
-
-		return $got_lock;
-	}
-
-	/**
-	 * (@inheritdoc)
-	 */
-	public function release($key, $override = false)
-	{
-		if ($override) {
-			$where = ['name' => $key];
-		} else {
-			$where = ['name' => $key, 'pid' => $this->pid];
-		}
-
-		if ($this->dba->exists('locks', $where)) {
-			$return = $this->dba->delete('locks', $where);
-		} else {
-			$return = false;
-		}
-
-		$this->markRelease($key);
-
-		return $return;
-	}
-
-	/**
-	 * (@inheritdoc)
-	 */
-	public function releaseAll($override = false)
-	{
-		$success = parent::releaseAll($override);
-
-		if ($override) {
-			$where = ['1 = 1'];
-		} else {
-			$where = ['pid' => $this->pid];
-		}
-		$return = $this->dba->delete('locks', $where);
-
-		$this->acquiredLocks = [];
-
-		return $return && $success;
-	}
-
-	/**
-	 * (@inheritdoc)
-	 */
-	public function isLocked($key)
-	{
-		$lock = $this->dba->selectFirst('locks', ['locked'], ['`name` = ? AND `expires` >= ?', $key, DateTimeFormat::utcNow()]);
-
-		if ($this->dba->isResult($lock)) {
-			return $lock['locked'] !== false;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName()
-	{
-		return Type::DATABASE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getLocks(string $prefix = '')
-	{
-		if (empty($prefix)) {
-			$where = ['`expires` >= ?', DateTimeFormat::utcNow()];
-		} else {
-			$where = ['`expires` >= ? AND `name` LIKE CONCAT(?, \'%\')', DateTimeFormat::utcNow(), $prefix];
-		}
-
-		$stmt = $this->dba->select('locks', ['name'], $where);
-
-		$keys = [];
-		while ($key = $this->dba->fetch($stmt)) {
-			array_push($keys, $key['name']);
-		}
-		$this->dba->close($stmt);
-
-		return $keys;
-	}
-}

src/Core/Lock/Enum/Type.php

@@ -19,9 +19,9 @@
  *
  */
 
-namespace Friendica\Core\Lock;
+namespace Friendica\Core\Lock\Enum;
 
-use Friendica\Core\Cache\Type as CacheType;
+use Friendica\Core\Cache\Enum\Type as CacheType;
 
 /**
  * Enumeration for lock types

src/Core/Lock/Exception/InvalidLockDriverException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Friendica\Core\Lock\Exception;
+
+use Throwable;
+
+class InvalidLockDriverException extends \RuntimeException
+{
+	public function __construct($message = "", Throwable $previous = null)
+	{
+		parent::__construct($message, 500, $previous);
+	}
+}

src/Core/Lock/Exception/LockPersistenceException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Friendica\Core\Lock\Exception;
+
+use Throwable;
+
+class LockPersistenceException extends \RuntimeException
+{
+	public function __construct($message = "", Throwable $previous = null)
+	{
+		parent::__construct($message, 500, $previous);
+	}
+}

src/Core/Lock/Factory/Lock.php

@@ -19,12 +19,14 @@
  *
  */
 
-namespace Friendica\Factory;
+namespace Friendica\Core\Lock\Factory;
 
-use Friendica\Core\Cache\IMemoryCache;
-use Friendica\Core\Cache\Type;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\Lock;
+use Friendica\Core\Cache\Factory\Cache;
+use Friendica\Core\Cache\Capability\ICanCacheInMemory;
+use Friendica\Core\Cache\Enum;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\Lock\Capability\ICanLock;
+use Friendica\Core\Lock\Type;
 use Friendica\Database\Database;
 use Psr\Log\LoggerInterface;
 
@@ -35,7 +37,7 @@ use Psr\Log\LoggerInterface;
  *
  * A basic class to generate a LockDriver
  */
-class LockFactory
+class Lock
 {
 	/**
 	 * @var string The default driver for caching
@@ -43,7 +45,7 @@ class LockFactory
 	const DEFAULT_DRIVER = 'default';
 
 	/**
-	 * @var IConfig The configuration to read parameters out of the config
+	 * @var IManageConfigValues The configuration to read parameters out of the config
 	 */
 	private $config;
 
@@ -53,7 +55,7 @@ class LockFactory
 	private $dba;
 
 	/**
-	 * @var CacheFactory The memory cache driver in case we use it
+	 * @var Cache The memory cache driver in case we use it
 	 */
 	private $cacheFactory;
 
@@ -62,7 +64,7 @@ class LockFactory
 	 */
 	private $logger;
 
-	public function __construct(CacheFactory $cacheFactory, IConfig $config, Database $dba, LoggerInterface $logger)
+	public function __construct(Cache $cacheFactory, IManageConfigValues $config, Database $dba, LoggerInterface $logger)
 	{
 		$this->cacheFactory = $cacheFactory;
 		$this->config       = $config;
@@ -76,24 +78,24 @@ class LockFactory
 
 		try {
 			switch ($lock_type) {
-				case Type::MEMCACHE:
-				case Type::MEMCACHED:
-				case Type::REDIS:
-				case Type::APCU:
+				case Enum\Type::MEMCACHE:
+				case Enum\Type::MEMCACHED:
+				case Enum\Type::REDIS:
+				case Enum\Type::APCU:
 					$cache = $this->cacheFactory->create($lock_type);
-					if ($cache instanceof IMemoryCache) {
-						return new Lock\CacheLock($cache);
+					if ($cache instanceof ICanCacheInMemory) {
+						return new Type\CacheLock($cache);
 					} else {
 						throw new \Exception(sprintf('Incompatible cache driver \'%s\' for lock used', $lock_type));
 					}
 					break;
 
 				case 'database':
-					return new Lock\DatabaseLock($this->dba);
+					return new Type\DatabaseLock($this->dba);
 					break;
 
 				case 'semaphore':
-					return new Lock\SemaphoreLock();
+					return new Type\SemaphoreLock();
 					break;
 
 				default:
@@ -113,14 +115,14 @@ class LockFactory
 	 * 2. Cache Locking
 	 * 3. Database Locking
 	 *
-	 * @return Lock\ILock
+	 * @return ICanLock
 	 */
 	private function useAutoDriver()
 	{
 		// 1. Try to use Semaphores for - local - locking
 		if (function_exists('sem_get')) {
 			try {
-				return new Lock\SemaphoreLock();
+				return new Type\SemaphoreLock();
 			} catch (\Exception $exception) {
 				$this->logger->warning('Using Semaphore driver for locking failed.', ['exception' => $exception]);
 			}
@@ -128,11 +130,11 @@ class LockFactory
 
 		// 2. Try to use Cache Locking (don't use the DB-Cache Locking because it works different!)
 		$cache_type = $this->config->get('system', 'cache_driver', 'database');
-		if ($cache_type != Type::DATABASE) {
+		if ($cache_type != Enum\Type::DATABASE) {
 			try {
 				$cache = $this->cacheFactory->create($cache_type);
-				if ($cache instanceof IMemoryCache) {
-					return new Lock\CacheLock($cache);
+				if ($cache instanceof ICanCacheInMemory) {
+					return new Type\CacheLock($cache);
 				}
 			} catch (\Exception $exception) {
 				$this->logger->warning('Using Cache driver for locking failed.', ['exception' => $exception]);
@@ -140,6 +142,6 @@ class LockFactory
 		}
 
 		// 3. Use Database Locking as a Fallback
-		return new Lock\DatabaseLock($this->dba);
+		return new Type\DatabaseLock($this->dba);
 	}
 }

src/Core/Lock/Type/AbstractLock.php

@@ -19,14 +19,14 @@
  *
  */
 
-namespace Friendica\Core;
+namespace Friendica\Core\Lock\Type;
 
-use Friendica\Core\Lock\ILock;
+use Friendica\Core\Lock\Capability\ICanLock;
 
 /**
  * Basic class for Locking with common functions (local acquired locks, releaseAll, ..)
  */
-abstract class BaseLock implements ILock
+abstract class AbstractLock implements ICanLock
 {
 	/**
 	 * @var array The local acquired locks
@@ -40,7 +40,7 @@ abstract class BaseLock implements ILock
 	 *
 	 * @return bool      Returns true if the lock is set
 	 */
-	protected function hasAcquiredLock($key)
+	protected function hasAcquiredLock(string $key): bool
 	{
 		return isset($this->acquireLock[$key]) && $this->acquiredLocks[$key] === true;
 	}
@@ -50,7 +50,7 @@ abstract class BaseLock implements ILock
 	 *
 	 * @param string $key The Name of the lock
 	 */
-	protected function markAcquire($key)
+	protected function markAcquire(string $key)
 	{
 		$this->acquiredLocks[$key] = true;
 	}
@@ -60,7 +60,7 @@ abstract class BaseLock implements ILock
 	 *
 	 * @param string $key The Name of the lock
 	 */
-	protected function markRelease($key)
+	protected function markRelease(string $key)
 	{
 		unset($this->acquiredLocks[$key]);
 	}
@@ -68,7 +68,7 @@ abstract class BaseLock implements ILock
 	/**
 	 * {@inheritDoc}
 	 */
-	public function releaseAll($override = false)
+	public function releaseAll(bool $override = false): bool
 	{
 		$return = true;
 

src/Core/Lock/Type/CacheLock.php

@@ -0,0 +1,180 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Core\Lock\Type;
+
+use Friendica\Core\Cache\Capability\ICanCache;
+use Friendica\Core\Cache\Capability\ICanCacheInMemory;
+use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Cache\Exception\CachePersistenceException;
+use Friendica\Core\Lock\Exception\LockPersistenceException;
+
+class CacheLock extends AbstractLock
+{
+	/**
+	 * @var string The static prefix of all locks inside the cache
+	 */
+	const CACHE_PREFIX = 'lock:';
+
+	/**
+	 * @var ICanCache;
+	 */
+	private $cache;
+
+	/**
+	 * CacheLock constructor.
+	 *
+	 * @param ICanCacheInMemory $cache The CacheDriver for this type of lock
+	 */
+	public function __construct(ICanCacheInMemory $cache)
+	{
+		$this->cache = $cache;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function acquire(string $key, int $timeout = 120, int $ttl = Duration::FIVE_MINUTES): bool
+	{
+		$got_lock = false;
+		$start    = time();
+
+		$lockKey = self::getLockKey($key);
+
+		try {
+			do {
+				$lock = $this->cache->get($lockKey);
+				// When we do want to lock something that was already locked by us.
+				if ((int)$lock == getmypid()) {
+					$got_lock = true;
+				}
+
+				// When we do want to lock something new
+				if (is_null($lock)) {
+					// At first initialize it with "0"
+					$this->cache->add($lockKey, 0);
+					// Now the value has to be "0" because otherwise the key was used by another process meanwhile
+					if ($this->cache->compareSet($lockKey, 0, getmypid(), $ttl)) {
+						$got_lock = true;
+						$this->markAcquire($key);
+					}
+				}
+
+				if (!$got_lock && ($timeout > 0)) {
+					usleep(rand(10000, 200000));
+				}
+			} while (!$got_lock && ((time() - $start) < $timeout));
+		} catch (CachePersistenceException $exception) {
+			throw new LockPersistenceException(sprintf('Cannot acquire lock for key %s', $key), $exception);
+		}
+
+		return $got_lock;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function release(string $key, bool $override = false): bool
+	{
+		$lockKey = self::getLockKey($key);
+
+		try {
+			if ($override) {
+				$return = $this->cache->delete($lockKey);
+			} else {
+				$return = $this->cache->compareDelete($lockKey, getmypid());
+			}
+		} catch (CachePersistenceException $exception) {
+			throw new LockPersistenceException(sprintf('Cannot release lock for key %s (override %b)', $key, $override), $exception);
+		}
+		$this->markRelease($key);
+
+		return $return;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function isLocked(string $key): bool
+	{
+		$lockKey = self::getLockKey($key);
+		try {
+			$lock = $this->cache->get($lockKey);
+		} catch (CachePersistenceException $exception) {
+			throw new LockPersistenceException(sprintf('Cannot check lock state for key %s', $key), $exception);
+		}
+		return isset($lock) && ($lock !== false);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getName(): string
+	{
+		return $this->cache->getName();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getLocks(string $prefix = ''): array
+	{
+		try {
+			$locks = $this->cache->getAllKeys(self::CACHE_PREFIX . $prefix);
+		} catch (CachePersistenceException $exception) {
+			throw new LockPersistenceException(sprintf('Cannot get locks with prefix %s', $prefix), $exception);
+		}
+
+		array_walk($locks, function (&$lock) {
+			$lock = substr($lock, strlen(self::CACHE_PREFIX));
+		});
+
+		return $locks;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function releaseAll(bool $override = false): bool
+	{
+		$success = parent::releaseAll($override);
+
+		$locks = $this->getLocks();
+
+		foreach ($locks as $lock) {
+			if (!$this->release($lock, $override)) {
+				$success = false;
+			}
+		}
+
+		return $success;
+	}
+
+	/**
+	 * @param string $key The original key
+	 *
+	 * @return string        The cache key used for the cache
+	 */
+	private static function getLockKey(string $key): string
+	{
+		return self::CACHE_PREFIX . $key;
+	}
+}

src/Core/Lock/Type/DatabaseLock.php

@@ -0,0 +1,212 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Core\Lock\Type;
+
+use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Lock\Enum\Type;
+use Friendica\Core\Lock\Exception\LockPersistenceException;
+use Friendica\Database\Database;
+use Friendica\Util\DateTimeFormat;
+
+/**
+ * Locking driver that stores the locks in the database
+ */
+class DatabaseLock extends AbstractLock
+{
+	/**
+	 * The current ID of the process
+	 *
+	 * @var int
+	 */
+	private $pid;
+
+	/**
+	 * @var Database The database connection of Friendica
+	 */
+	private $dba;
+
+	/**
+	 * @param int|null $pid The id of the current process (null means determine automatically)
+	 */
+	public function __construct(Database $dba, ?int $pid = null)
+	{
+		$this->dba = $dba;
+		$this->pid = $pid ?? getmypid();
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function acquire(string $key, int $timeout = 120, int $ttl = Duration::FIVE_MINUTES): bool
+	{
+		$got_lock = false;
+		$start    = time();
+
+		try {
+			do {
+				$this->dba->lock('locks');
+				$lock = $this->dba->selectFirst('locks', ['locked', 'pid'], [
+					'`name` = ? AND `expires` >= ?', $key,DateTimeFormat::utcNow()
+				]);
+
+				if ($this->dba->isResult($lock)) {
+					if ($lock['locked']) {
+						// We want to lock something that was already locked by us? So we got the lock.
+						if ($lock['pid'] == $this->pid) {
+							$got_lock = true;
+						}
+					}
+					if (!$lock['locked']) {
+						$this->dba->update('locks', [
+							'locked'  => true,
+							'pid'     => $this->pid,
+							'expires' => DateTimeFormat::utc('now + ' . $ttl . 'seconds')
+						], ['name' => $key]);
+						$got_lock = true;
+					}
+				} else {
+					$this->dba->insert('locks', [
+						'name'    => $key,
+						'locked'  => true,
+						'pid'     => $this->pid,
+						'expires' => DateTimeFormat::utc('now + ' . $ttl . 'seconds')]);
+					$got_lock = true;
+					$this->markAcquire($key);
+				}
+
+				$this->dba->unlock();
+
+				if (!$got_lock && ($timeout > 0)) {
+					usleep(rand(100000, 2000000));
+				}
+			} while (!$got_lock && ((time() - $start) < $timeout));
+		} catch (\Exception $exception) {
+			throw new LockPersistenceException(sprintf('Cannot acquire lock for key %s', $key), $exception);
+		}
+
+		return $got_lock;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function release(string $key, bool $override = false): bool
+	{
+		if ($override) {
+			$where = ['name' => $key];
+		} else {
+			$where = ['name' => $key, 'pid' => $this->pid];
+		}
+
+		try {
+			if ($this->dba->exists('locks', $where)) {
+				$return = $this->dba->delete('locks', $where);
+			} else {
+				$return = false;
+			}
+		} catch (\Exception $exception) {
+			throw new LockPersistenceException(sprintf('Cannot release lock for key %s (override %b)', $key, $override), $exception);
+		}
+
+		$this->markRelease($key);
+
+		return $return;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function releaseAll(bool $override = false): bool
+	{
+		$success = parent::releaseAll($override);
+
+		if ($override) {
+			$where = ['1 = 1'];
+		} else {
+			$where = ['pid' => $this->pid];
+		}
+
+		try {
+			$return = $this->dba->delete('locks', $where);
+		} catch (\Exception $exception) {
+			throw new LockPersistenceException(sprintf('Cannot release all lock (override %b)', $override), $exception);
+		}
+
+		$this->acquiredLocks = [];
+
+		return $return && $success;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function isLocked(string $key): bool
+	{
+		try {
+			$lock = $this->dba->selectFirst('locks', ['locked'], [
+				'`name` = ? AND `expires` >= ?', $key, DateTimeFormat::utcNow()]);
+		} catch (\Exception $exception) {
+			throw new LockPersistenceException(sprintf('Cannot check lock state for key %s', $key), $exception);
+		}
+
+		if ($this->dba->isResult($lock)) {
+			return $lock['locked'] !== false;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getName(): string
+	{
+		return Type::DATABASE;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getLocks(string $prefix = ''): array
+	{
+		try {
+			if (empty($prefix)) {
+				$where = ['`expires` >= ?', DateTimeFormat::utcNow()];
+			} else {
+				$where = ['`expires` >= ? AND `name` LIKE CONCAT(?, \'%\')', DateTimeFormat::utcNow(), $prefix];
+			}
+
+			$stmt = $this->dba->select('locks', ['name'], $where);
+
+			$keys = [];
+			while ($key = $this->dba->fetch($stmt)) {
+				array_push($keys, $key['name']);
+			}
+		} catch (\Exception $exception) {
+			throw new LockPersistenceException(sprintf('Cannot get lock with prefix %s', $prefix), $exception);
+		} finally {
+			$this->dba->close($stmt);
+		}
+
+		return $keys;
+	}
+}

src/Core/Lock/Type/SemaphoreLock.php

@@ -19,19 +19,21 @@
  *
  */
 
-namespace Friendica\Core\Lock;
+namespace Friendica\Core\Lock\Type;
 
-use Friendica\Core\BaseLock;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Lock\Enum\Type;
+use Friendica\Core\Lock\Exception\InvalidLockDriverException;
+use function get_temppath;
 
-class SemaphoreLock extends BaseLock
+class SemaphoreLock extends AbstractLock
 {
 	private static $semaphore = [];
 
 	public function __construct()
 	{
 		if (!function_exists('sem_get')) {
-			throw new \Exception('Semaphore lock not supported');
+			throw new InvalidLockDriverException('Semaphore lock not supported');
 		}
 	}
 
@@ -56,11 +58,11 @@ class SemaphoreLock extends BaseLock
 	/**
 	 * (@inheritdoc)
 	 */
-	public function acquire($key, $timeout = 120, $ttl = Duration::FIVE_MINUTES)
+	public function acquire(string $key, int $timeout = 120, int $ttl = Duration::FIVE_MINUTES): bool
 	{
 		self::$semaphore[$key] = sem_get(self::semaphoreKey($key));
 		if (!empty(self::$semaphore[$key])) {
-			if ((bool)sem_acquire(self::$semaphore[$key], ($timeout === 0))) {
+			if (sem_acquire(self::$semaphore[$key], ($timeout === 0))) {
 				$this->markAcquire($key);
 				return true;
 			}
@@ -75,7 +77,7 @@ class SemaphoreLock extends BaseLock
 	 * @param bool $override not necessary parameter for semaphore locks since the lock lives as long as the execution
 	 *                       of the using function
 	 */
-	public function release($key, $override = false)
+	public function release(string $key, bool $override = false): bool
 	{
 		$success = false;
 
@@ -95,7 +97,7 @@ class SemaphoreLock extends BaseLock
 	/**
 	 * (@inheritdoc)
 	 */
-	public function isLocked($key)
+	public function isLocked(string $key): bool
 	{
 		return isset(self::$semaphore[$key]);
 	}
@@ -103,7 +105,7 @@ class SemaphoreLock extends BaseLock
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getName()
+	public function getName(): string
 	{
 		return Type::SEMAPHORE;
 	}
@@ -111,7 +113,7 @@ class SemaphoreLock extends BaseLock
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getLocks(string $prefix = '')
+	public function getLocks(string $prefix = ''): array
 	{
 		// We can just return our own semaphore keys, since we don't know
 		// the state of other semaphores, even if the .sem files exists
@@ -135,7 +137,7 @@ class SemaphoreLock extends BaseLock
 	/**
 	 * {@inheritDoc}
 	 */
-	public function releaseAll($override = false)
+	public function releaseAll(bool $override = false): bool
 	{
 		// Semaphores are just alive during a run, so there is no need to release
 		// You can just release your own locks

src/Core/Logger.php

@@ -22,7 +22,7 @@
 namespace Friendica\Core;
 
 use Friendica\DI;
-use Friendica\Util\Logger\WorkerLogger;
+use Friendica\Core\Logger\Type\WorkerLogger;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 

src/Core/Logger/Exception/LogLevelException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Friendica\Core\Logger\Exception;
+
+use Throwable;
+
+class LogLevelException extends \InvalidArgumentException
+{
+	public function __construct($message = "", Throwable $previous = null)
+	{
+		parent::__construct($message, 500, $previous);
+	}
+}

src/Core/Logger/Exception/LoggerArgumentException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Friendica\Core\Logger\Exception;
+
+use Throwable;
+
+class LoggerArgumentException extends \InvalidArgumentException
+{
+	public function __construct($message = "", Throwable $previous = null)
+	{
+		parent::__construct($message, 500, $previous);
+	}
+}

src/Core/Logger/Exception/LoggerException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Friendica\Core\Logger\Exception;
+
+use Throwable;
+
+class LoggerException extends \Exception
+{
+	public function __construct($message = "", Throwable $previous = null)
+	{
+		parent::__construct($message, 500, $previous);
+	}
+}

src/Core/Logger/Factory/Logger.php

@@ -19,45 +19,45 @@
  *
  */
 
-namespace Friendica\Factory;
+namespace Friendica\Core\Logger\Factory;
 
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\Logger;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\Logger\Exception\LoggerException;
+use Friendica\Core;
+use Friendica\Core\Logger\Exception\LogLevelException;
 use Friendica\Database\Database;
-use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\FileSystem;
-use Friendica\Util\Introspection;
-use Friendica\Util\Logger\Monolog\DevelopHandler;
-use Friendica\Util\Logger\Monolog\IntrospectionProcessor;
-use Friendica\Util\Logger\ProfilerLogger;
-use Friendica\Util\Logger\StreamLogger;
-use Friendica\Util\Logger\SyslogLogger;
-use Friendica\Util\Logger\VoidLogger;
+use Friendica\Core\Logger\Util\Introspection;
+use Friendica\Core\Logger\Type\Monolog\DevelopHandler;
+use Friendica\Core\Logger\Type\Monolog\IntrospectionProcessor;
+use Friendica\Core\Logger\Type\ProfilerLogger;
+use Friendica\Core\Logger\Type\StreamLogger;
+use Friendica\Core\Logger\Type\SyslogLogger;
 use Friendica\Util\Profiler;
 use Monolog;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
+use Psr\Log\NullLogger;
 
 /**
  * A logger factory
- *
- * Currently only Monolog is supported
  */
-class LoggerFactory
+class Logger
 {
 	const DEV_CHANNEL = 'dev';
 
 	/**
 	 * A list of classes, which shouldn't get logged
 	 *
-	 * @var array
+	 * @var string[]
 	 */
 	private static $ignoreClassList = [
-		Logger::class,
+		Core\Logger::class,
 		Profiler::class,
-		'Friendica\\Util\\Logger',
+		'Friendica\\Core\\Logger\\Type',
 	];
 
+	/** @var string The log-channel (app, worker, ...) */
 	private $channel;
 
 	public function __construct(string $channel)
@@ -68,24 +68,25 @@ class LoggerFactory
 	/**
 	 * Creates a new PSR-3 compliant logger instances
 	 *
-	 * @param Database   $database   The Friendica Database instance
-	 * @param IConfig    $config     The config
-	 * @param Profiler   $profiler   The profiler of the app
-	 * @param FileSystem $fileSystem FileSystem utils
+	 * @param Database            $database   The Friendica Database instance
+	 * @param IManageConfigValues $config     The config
+	 * @param Profiler            $profiler   The profiler of the app
+	 * @param FileSystem          $fileSystem FileSystem utils
+	 * @param string|null         $minLevel   (optional) Override minimum Loglevel to log
 	 *
 	 * @return LoggerInterface The PSR-3 compliant logger instance
 	 */
-	public function create(Database $database, IConfig $config, Profiler $profiler, FileSystem $fileSystem)
+	public function create(Database $database, IManageConfigValues $config, Profiler $profiler, FileSystem $fileSystem, ?string $minLevel = null): LoggerInterface
 	{
 		if (empty($config->get('system', 'debugging', false))) {
-			$logger = new VoidLogger();
+			$logger = new NullLogger();
 			$database->setLogger($logger);
 			return $logger;
 		}
 
 		$introspection = new Introspection(self::$ignoreClassList);
-		$level         = $config->get('system', 'loglevel');
-		$loglevel      = self::mapLegacyConfigDebugLevel((string)$level);
+		$minLevel      = $minLevel ?? $config->get('system', 'loglevel');
+		$loglevel      = self::mapLegacyConfigDebugLevel((string)$minLevel);
 
 		switch ($config->get('system', 'logger_config', 'stream')) {
 			case 'monolog':
@@ -106,7 +107,12 @@ class LoggerFactory
 						static::addStreamHandler($logger, $stream, $loglevel);
 					} catch (\Throwable $e) {
 						// No Logger ..
-						$logger = new VoidLogger();
+						try {
+							$logger = new SyslogLogger($this->channel, $introspection, $loglevel);
+						} catch (\Throwable $e) {
+							// No logger ...
+							$logger = new NullLogger();
+						}
 					}
 				}
 				break;
@@ -114,9 +120,13 @@ class LoggerFactory
 			case 'syslog':
 				try {
 					$logger = new SyslogLogger($this->channel, $introspection, $loglevel);
+				} catch (LogLevelException $exception) {
+					// If there's a wrong config value for loglevel, try again with standard
+					$logger = $this->create($database, $config, $profiler, $fileSystem, LogLevel::NOTICE);
+					$logger->warning('Invalid loglevel set in config.', ['loglevel' => $loglevel]);
 				} catch (\Throwable $e) {
 					// No logger ...
-					$logger = new VoidLogger();
+					$logger = new NullLogger();
 				}
 				break;
 
@@ -127,12 +137,25 @@ class LoggerFactory
 				if (!is_file($stream) || is_writable($stream)) {
 					try {
 						$logger = new StreamLogger($this->channel, $stream, $introspection, $fileSystem, $loglevel);
+					} catch (LogLevelException $exception) {
+						// If there's a wrong config value for loglevel, try again with standard
+						$logger = $this->create($database, $config, $profiler, $fileSystem, LogLevel::NOTICE);
+						$logger->warning('Invalid loglevel set in config.', ['loglevel' => $loglevel]);
 					} catch (\Throwable $t) {
 						// No logger ...
-						$logger = new VoidLogger();
+						$logger = new NullLogger();
 					}
 				} else {
-					$logger = new VoidLogger();
+					try {
+						$logger = new SyslogLogger($this->channel, $introspection, $loglevel);
+					} catch (LogLevelException $exception) {
+						// If there's a wrong config value for loglevel, try again with standard
+						$logger = $this->create($database, $config, $profiler, $fileSystem, LogLevel::NOTICE);
+						$logger->warning('Invalid loglevel set in config.', ['loglevel' => $loglevel]);
+					} catch (\Throwable $e) {
+						// No logger ...
+						$logger = new NullLogger();
+					}
 				}
 				break;
 		}
@@ -156,25 +179,22 @@ class LoggerFactory
 	 *
 	 * It should never get filled during normal usage of Friendica
 	 *
-	 * @param IConfig    $config     The config
-	 * @param Profiler   $profiler   The profiler of the app
-	 * @param FileSystem $fileSystem FileSystem utils
+	 * @param IManageConfigValues $config     The config
+	 * @param Profiler            $profiler   The profiler of the app
+	 * @param FileSystem          $fileSystem FileSystem utils
 	 *
 	 * @return LoggerInterface The PSR-3 compliant logger instance
-	 *
-	 * @throws InternalServerErrorException
 	 * @throws \Exception
 	 */
-	public static function createDev(IConfig $config, Profiler $profiler, FileSystem $fileSystem)
+	public static function createDev(IManageConfigValues $config, Profiler $profiler, FileSystem $fileSystem)
 	{
 		$debugging   = $config->get('system', 'debugging');
 		$stream      = $config->get('system', 'dlogfile');
 		$developerIp = $config->get('system', 'dlogip');
 
 		if ((!isset($developerIp) || !$debugging) &&
-		    (!is_file($stream) || is_writable($stream))) {
-			$logger = new VoidLogger();
-			return $logger;
+			(!is_file($stream) || is_writable($stream))) {
+			return new NullLogger();
 		}
 
 		$loggerTimeZone = new \DateTimeZone('UTC');
@@ -228,7 +248,7 @@ class LoggerFactory
 	 *
 	 * @return string the PSR-3 compliant level
 	 */
-	private static function mapLegacyConfigDebugLevel($level)
+	private static function mapLegacyConfigDebugLevel(string $level): string
 	{
 		switch ($level) {
 			// legacy WARNING
@@ -263,9 +283,9 @@ class LoggerFactory
 	 *
 	 * @return void
 	 *
-	 * @throws \Exception in case of general failures
+	 * @throws LoggerException
 	 */
-	public static function addStreamHandler($logger, $stream, $level = LogLevel::NOTICE)
+	public static function addStreamHandler(LoggerInterface $logger, $stream, string $level = LogLevel::NOTICE)
 	{
 		if ($logger instanceof Monolog\Logger) {
 			$loglevel = Monolog\Logger::toMonologLevel($level);
@@ -275,19 +295,16 @@ class LoggerFactory
 				$loglevel = LogLevel::NOTICE;
 			}
 
-			$fileHandler = new Monolog\Handler\StreamHandler($stream, $loglevel);
+			try {
+				$fileHandler = new Monolog\Handler\StreamHandler($stream, $loglevel);
 
-			$formatter = new Monolog\Formatter\LineFormatter("%datetime% %channel% [%level_name%]: %message% %context% %extra%\n");
-			$fileHandler->setFormatter($formatter);
+				$formatter = new Monolog\Formatter\LineFormatter("%datetime% %channel% [%level_name%]: %message% %context% %extra%\n");
+				$fileHandler->setFormatter($formatter);
 
-			$logger->pushHandler($fileHandler);
-		}
-	}
-
-	public static function addVoidHandler($logger)
-	{
-		if ($logger instanceof Monolog\Logger) {
-			$logger->pushHandler(new Monolog\Handler\NullHandler());
+				$logger->pushHandler($fileHandler);
+			} catch (\Exception $exception) {
+				throw new LoggerException('Cannot create Monolog Logger.', $exception);
+			}
 		}
 	}
 }

src/Core/Logger/Type/AbstractLogger.php

@@ -19,9 +19,10 @@
  *
  */
 
-namespace Friendica\Util\Logger;
+namespace Friendica\Core\Logger\Type;
 
-use Friendica\Util\Introspection;
+use Friendica\Core\Logger\Exception\LoggerException;
+use Friendica\Core\Logger\Util\Introspection;
 use Friendica\Util\Strings;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
@@ -58,29 +59,35 @@ abstract class AbstractLogger implements LoggerInterface
 	/**
 	 * Adds a new entry to the log
 	 *
-	 * @param int    $level
+	 * @param mixed  $level
 	 * @param string $message
 	 * @param array  $context
 	 *
 	 * @return void
 	 */
-	abstract protected function addEntry($level, $message, $context = []);
+	abstract protected function addEntry($level, string $message, array $context = []);
 
 	/**
 	 * @param string        $channel       The output channel
 	 * @param Introspection $introspection The introspection of the current call
 	 *
-	 * @throws \Exception
+	 * @throws LoggerException
 	 */
-	public function __construct($channel, Introspection $introspection)
+	public function __construct(string $channel, Introspection $introspection)
 	{
 		$this->channel       = $channel;
 		$this->introspection = $introspection;
-		$this->logUid        = Strings::getRandomHex(6);
+
+		try {
+			$this->logUid = Strings::getRandomHex(6);
+		} catch (\Exception $exception) {
+			throw new LoggerException('Cannot generate log Id', $exception);
+		}
 	}
 
 	/**
 	 * Simple interpolation of PSR-3 compliant replacements ( variables between '{' and '}' )
+	 *
 	 * @see https://www.php-fig.org/psr/psr-3/#12-message
 	 *
 	 * @param string $message
@@ -88,7 +95,7 @@ abstract class AbstractLogger implements LoggerInterface
 	 *
 	 * @return string the interpolated message
 	 */
-	protected function psrInterpolate($message, array $context = array())
+	protected function psrInterpolate(string $message, array $context = []): string
 	{
 		$replace = [];
 		foreach ($context as $key => $value) {
@@ -104,7 +111,7 @@ abstract class AbstractLogger implements LoggerInterface
 	}
 
 	/**
-	 * JSON Encodes an complete array including objects with "__toString()" methods
+	 * JSON Encodes a complete array including objects with "__toString()" methods
 	 *
 	 * @param array $input an Input Array to encode
 	 *
@@ -128,7 +135,7 @@ abstract class AbstractLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function emergency($message, array $context = array())
+	public function emergency($message, array $context = [])
 	{
 		$this->addEntry(LogLevel::EMERGENCY, (string) $message, $context);
 	}
@@ -136,7 +143,7 @@ abstract class AbstractLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function alert($message, array $context = array())
+	public function alert($message, array $context = [])
 	{
 		$this->addEntry(LogLevel::ALERT, (string) $message, $context);
 	}
@@ -144,7 +151,7 @@ abstract class AbstractLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function critical($message, array $context = array())
+	public function critical($message, array $context = [])
 	{
 		$this->addEntry(LogLevel::CRITICAL, (string) $message, $context);
 	}
@@ -152,7 +159,7 @@ abstract class AbstractLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function error($message, array $context = array())
+	public function error($message, array $context = [])
 	{
 		$this->addEntry(LogLevel::ERROR, (string) $message, $context);
 	}
@@ -160,7 +167,7 @@ abstract class AbstractLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function warning($message, array $context = array())
+	public function warning($message, array $context = [])
 	{
 		$this->addEntry(LogLevel::WARNING, (string) $message, $context);
 	}
@@ -168,7 +175,7 @@ abstract class AbstractLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function notice($message, array $context = array())
+	public function notice($message, array $context = [])
 	{
 		$this->addEntry(LogLevel::NOTICE, (string) $message, $context);
 	}
@@ -176,7 +183,7 @@ abstract class AbstractLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function info($message, array $context = array())
+	public function info($message, array $context = [])
 	{
 		$this->addEntry(LogLevel::INFO, (string) $message, $context);
 	}
@@ -184,7 +191,7 @@ abstract class AbstractLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function debug($message, array $context = array())
+	public function debug($message, array $context = [])
 	{
 		$this->addEntry(LogLevel::DEBUG, (string) $message, $context);
 	}
@@ -192,7 +199,7 @@ abstract class AbstractLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function log($level, $message, array $context = array())
+	public function log($level, $message, array $context = [])
 	{
 		$this->addEntry($level, (string) $message, $context);
 	}

src/Core/Logger/Type/Monolog/DevelopHandler.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Util\Logger\Monolog;
+namespace Friendica\Core\Logger\Type\Monolog;
 
 use Monolog\Handler;
 use Monolog\Logger;
@@ -42,7 +42,7 @@ class DevelopHandler extends Handler\AbstractHandler
 	 * @param int    $level        The minimum logging level at which this handler will be triggered
 	 * @param bool   $bubble       Whether the messages that are handled can bubble up the stack or not
 	 */
-	public function __construct($developerIp, $level = Logger::DEBUG, $bubble = true)
+	public function __construct($developerIp, $level = Logger::DEBUG, bool $bubble = true)
 	{
 		parent::__construct($level, $bubble);
 
@@ -52,15 +52,14 @@ class DevelopHandler extends Handler\AbstractHandler
 	/**
 	 * {@inheritdoc}
 	 */
-	public function handle(array $record)
+	public function handle(array $record): bool
 	{
 		if (!$this->isHandling($record)) {
 			return false;
 		}
 
 		/// Just in case the remote IP is the same as the developer IP log the output
-		if (!is_null($this->developerIp) && $_SERVER['REMOTE_ADDR'] != $this->developerIp)
-		{
+		if (!is_null($this->developerIp) && $_SERVER['REMOTE_ADDR'] != $this->developerIp) {
 			return false;
 		}
 

src/Core/Logger/Type/Monolog/IntrospectionProcessor.php

@@ -19,9 +19,9 @@
  *
  */
 
-namespace Friendica\Util\Logger\Monolog;
+namespace Friendica\Core\Logger\Type\Monolog;
 
-use Friendica\Util\Introspection;
+use Friendica\Core\Logger\Util\Introspection;
 use Monolog\Logger;
 use Monolog\Processor\ProcessorInterface;
 
@@ -41,11 +41,11 @@ class IntrospectionProcessor implements ProcessorInterface
 	public function __construct(Introspection $introspection, $level = Logger::DEBUG)
 	{
 		$this->level = Logger::toMonologLevel($level);
-		$introspection->addClasses(array('Monolog\\'));
+		$introspection->addClasses(['Monolog\\']);
 		$this->introspection = $introspection;
 	}
 
-	public function __invoke(array $record)
+	public function __invoke(array $record): array
 	{
 		// return if the level is not high enough
 		if ($record['level'] < $this->level) {

src/Core/Logger/Type/ProfilerLogger.php

@@ -19,9 +19,8 @@
  *
  */
 
-namespace Friendica\Util\Logger;
+namespace Friendica\Core\Logger\Type;
 
-use Friendica\Core\System;
 use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
 
@@ -50,14 +49,14 @@ class ProfilerLogger implements LoggerInterface
 	 */
 	public function __construct(LoggerInterface $logger, Profiler $profiler)
 	{
-		$this->logger = $logger;
+		$this->logger   = $logger;
 		$this->profiler = $profiler;
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function emergency($message, array $context = array())
+	public function emergency($message, array $context = [])
 	{
 		$this->profiler->startRecording('file');
 		$this->logger->emergency($message, $context);
@@ -67,7 +66,7 @@ class ProfilerLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function alert($message, array $context = array())
+	public function alert($message, array $context = [])
 	{
 		$this->profiler->startRecording('file');
 		$this->logger->alert($message, $context);
@@ -77,7 +76,7 @@ class ProfilerLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function critical($message, array $context = array())
+	public function critical($message, array $context = [])
 	{
 		$this->profiler->startRecording('file');
 		$this->logger->critical($message, $context);
@@ -87,7 +86,7 @@ class ProfilerLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function error($message, array $context = array())
+	public function error($message, array $context = [])
 	{
 		$this->profiler->startRecording('file');
 		$this->logger->error($message, $context);
@@ -97,7 +96,7 @@ class ProfilerLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function warning($message, array $context = array())
+	public function warning($message, array $context = [])
 	{
 		$this->profiler->startRecording('file');
 		$this->logger->warning($message, $context);
@@ -107,7 +106,7 @@ class ProfilerLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function notice($message, array $context = array())
+	public function notice($message, array $context = [])
 	{
 		$this->profiler->startRecording('file');
 		$this->logger->notice($message, $context);
@@ -117,7 +116,7 @@ class ProfilerLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function info($message, array $context = array())
+	public function info($message, array $context = [])
 	{
 		$this->profiler->startRecording('file');
 		$this->logger->info($message, $context);
@@ -127,7 +126,7 @@ class ProfilerLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function debug($message, array $context = array())
+	public function debug($message, array $context = [])
 	{
 		$this->profiler->startRecording('file');
 		$this->logger->debug($message, $context);
@@ -137,7 +136,7 @@ class ProfilerLogger implements LoggerInterface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function log($level, $message, array $context = array())
+	public function log($level, $message, array $context = [])
 	{
 		$this->profiler->startRecording('file');
 		$this->logger->log($level, $message, $context);

src/Core/Logger/Type/StreamLogger.php

@@ -19,11 +19,14 @@
  *
  */
 
-namespace Friendica\Util\Logger;
+namespace Friendica\Core\Logger\Type;
 
+use Friendica\Core\Logger\Exception\LoggerArgumentException;
+use Friendica\Core\Logger\Exception\LoggerException;
+use Friendica\Core\Logger\Exception\LogLevelException;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\FileSystem;
-use Friendica\Util\Introspection;
+use Friendica\Core\Logger\Util\Introspection;
 use Psr\Log\LogLevel;
 
 /**
@@ -80,9 +83,10 @@ class StreamLogger extends AbstractLogger
 	 * @param string|resource $stream The stream to write with this logger (either a file or a stream, i.e. stdout)
 	 * @param string          $level  The minimum loglevel at which this logger will be triggered
 	 *
-	 * @throws \Exception
+	 * @throws LoggerArgumentException
+	 * @throws LogLevelException
 	 */
-	public function __construct($channel, $stream, Introspection $introspection, FileSystem $fileSystem, $level = LogLevel::DEBUG)
+	public function __construct($channel, $stream, Introspection $introspection, FileSystem $fileSystem, string $level = LogLevel::DEBUG)
 	{
 		$this->fileSystem = $fileSystem;
 
@@ -93,14 +97,14 @@ class StreamLogger extends AbstractLogger
 		} elseif (is_string($stream)) {
 			$this->url = $stream;
 		} else {
-			throw new \InvalidArgumentException('A stream must either be a resource or a string.');
+			throw new LoggerArgumentException('A stream must either be a resource or a string.');
 		}
 
 		$this->pid = getmypid();
 		if (array_key_exists($level, $this->levelToInt)) {
 			$this->logLevel = $this->levelToInt[$level];
 		} else {
-			throw new \InvalidArgumentException(sprintf('The level "%s" is not valid.', $level));
+			throw new LogLevelException(sprintf('The level "%s" is not valid.', $level));
 		}
 
 		$this->checkStream();
@@ -118,16 +122,19 @@ class StreamLogger extends AbstractLogger
 	/**
 	 * Adds a new entry to the log
 	 *
-	 * @param int $level
+	 * @param mixed  $level
 	 * @param string $message
-	 * @param array $context
+	 * @param array  $context
 	 *
 	 * @return void
+	 *
+	 * @throws LoggerException
+	 * @throws LogLevelException
 	 */
-	protected function addEntry($level, $message, $context = [])
+	protected function addEntry($level, string $message, array $context = [])
 	{
 		if (!array_key_exists($level, $this->levelToInt)) {
-			throw new \InvalidArgumentException(sprintf('The level "%s" is not valid.', $level));
+			throw new LogLevelException(sprintf('The level "%s" is not valid.', $level));
 		}
 
 		$logLevel = $this->levelToInt[$level];
@@ -145,19 +152,24 @@ class StreamLogger extends AbstractLogger
 	/**
 	 * Formats a log record for the syslog output
 	 *
-	 * @param int    $level   The loglevel/priority
+	 * @param mixed  $level   The loglevel/priority
 	 * @param string $message The message
 	 * @param array  $context The context of this call
 	 *
 	 * @return string the formatted syslog output
+	 *
+	 * @throws LoggerException
 	 */
-	private function formatLog($level, $message, $context = [])
+	private function formatLog($level, string $message, array $context = []): string
 	{
 		$record = $this->introspection->getRecord();
 		$record = array_merge($record, ['uid' => $this->logUid, 'process_id' => $this->pid]);
-		$logMessage = '';
 
-		$logMessage .= DateTimeFormat::utcNow(DateTimeFormat::ATOM) . ' ';
+		try {
+			$logMessage = DateTimeFormat::utcNow(DateTimeFormat::ATOM) . ' ';
+		} catch (\Exception $exception) {
+			throw new LoggerException('Cannot get current datetime.', $exception);
+		}
 		$logMessage .= $this->channel . ' ';
 		$logMessage .= '[' . strtoupper($level) . ']: ';
 		$logMessage .= $this->psrInterpolate($message, $context) . ' ';
@@ -168,6 +180,12 @@ class StreamLogger extends AbstractLogger
 		return $logMessage;
 	}
 
+	/**
+	 * Checks the current stream
+	 *
+	 * @throws LoggerException
+	 * @throws LoggerArgumentException
+	 */
 	private function checkStream()
 	{
 		if (is_resource($this->stream)) {
@@ -175,9 +193,13 @@ class StreamLogger extends AbstractLogger
 		}
 
 		if (empty($this->url)) {
-			throw new \LogicException('Missing stream URL.');
+			throw new LoggerArgumentException('Missing stream URL.');
 		}
 
-		$this->stream = $this->fileSystem->createStream($this->url);
+		try {
+			$this->stream = $this->fileSystem->createStream($this->url);
+		} catch (\UnexpectedValueException $exception) {
+			throw new LoggerException('Cannot create stream.', $exception);
+		}
 	}
 }

src/Core/Logger/Type/SyslogLogger.php

@@ -19,10 +19,11 @@
  *
  */
 
-namespace Friendica\Util\Logger;
+namespace Friendica\Core\Logger\Type;
 
-use Friendica\Network\HTTPException\InternalServerErrorException;
-use Friendica\Util\Introspection;
+use Friendica\Core\Logger\Exception\LoggerException;
+use Friendica\Core\Logger\Exception\LogLevelException;
+use Friendica\Core\Logger\Util\Introspection;
 use Psr\Log\LogLevel;
 
 /**
@@ -97,27 +98,29 @@ class SyslogLogger extends AbstractLogger
 	 * @param int    $logOpts     Indicates what logging options will be used when generating a log message
 	 * @param int    $logFacility Used to specify what type of program is logging the message
 	 *
-	 * @throws \Exception
+	 * @throws LogLevelException
+	 * @throws LoggerException
 	 */
-	public function __construct($channel, Introspection $introspection, $level = LogLevel::NOTICE, $logOpts = LOG_PID, $logFacility = LOG_USER)
+	public function __construct($channel, Introspection $introspection, string $level = LogLevel::NOTICE, int $logOpts = LOG_PID, int $logFacility = LOG_USER)
 	{
 		parent::__construct($channel, $introspection);
-		$this->logOpts = $logOpts;
+		$this->logOpts     = $logOpts;
 		$this->logFacility = $logFacility;
-		$this->logLevel = $this->mapLevelToPriority($level);
-		$this->introspection->addClasses(array(self::class));
+		$this->logLevel    = $this->mapLevelToPriority($level);
+		$this->introspection->addClasses([self::class]);
 	}
 
 	/**
 	 * Adds a new entry to the syslog
 	 *
-	 * @param int    $level
+	 * @param mixed  $level
 	 * @param string $message
 	 * @param array  $context
 	 *
-	 * @throws InternalServerErrorException if the syslog isn't available
+	 * @throws LogLevelException in case the level isn't valid
+	 * @throws LoggerException In case the syslog cannot be opened for writing
 	 */
-	protected function addEntry($level, $message, $context = [])
+	protected function addEntry($level, string $message, array $context = [])
 	{
 		$logLevel = $this->mapLevelToPriority($level);
 
@@ -136,12 +139,12 @@ class SyslogLogger extends AbstractLogger
 	 *
 	 * @return int The SysLog priority
 	 *
-	 * @throws \Psr\Log\InvalidArgumentException If the loglevel isn't valid
+	 * @throws LogLevelException If the loglevel isn't valid
 	 */
-	public function mapLevelToPriority($level)
+	public function mapLevelToPriority(string $level): int
 	{
 		if (!array_key_exists($level, $this->logLevels)) {
-			throw new \InvalidArgumentException(sprintf('The level "%s" is not valid.', $level));
+			throw new LogLevelException(sprintf('The level "%s" is not valid.', $level));
 		}
 
 		return $this->logLevels[$level];
@@ -157,21 +160,22 @@ class SyslogLogger extends AbstractLogger
 
 	/**
 	 * Writes a message to the syslog
+	 *
 	 * @see http://php.net/manual/en/function.syslog.php#refsect1-function.syslog-parameters
 	 *
 	 * @param int    $priority The Priority
 	 * @param string $message  The message of the log
 	 *
-	 * @throws InternalServerErrorException if syslog cannot be used
+	 * @throws LoggerException In case the syslog cannot be opened/written
 	 */
-	private function write($priority, $message)
+	private function write(int $priority, string $message)
 	{
 		set_error_handler([$this, 'customErrorHandler']);
 		$opened = openlog(self::IDENT, $this->logOpts, $this->logFacility);
 		restore_error_handler();
 
 		if (!$opened) {
-			throw new \UnexpectedValueException(sprintf('Can\'t open syslog for ident "%s" and facility "%s": ' . $this->errorMessage, $this->channel, $this->logFacility));
+			throw new LoggerException(sprintf('Can\'t open syslog for ident "%s" and facility "%s": ' . $this->errorMessage, $this->channel, $this->logFacility));
 		}
 
 		$this->syslogWrapper($priority, $message);
@@ -186,13 +190,12 @@ class SyslogLogger extends AbstractLogger
 	 *
 	 * @return string the formatted syslog output
 	 */
-	private function formatLog($level, $message, $context = [])
+	private function formatLog(int $level, string $message, array $context = []): string
 	{
 		$record = $this->introspection->getRecord();
 		$record = array_merge($record, ['uid' => $this->logUid]);
-		$logMessage = '';
 
-		$logMessage .= $this->channel . ' ';
+		$logMessage = $this->channel . ' ';
 		$logMessage .= '[' . $this->logToString[$level] . ']: ';
 		$logMessage .= $this->psrInterpolate($message, $context) . ' ';
 		$logMessage .= $this->jsonEncodeArray($context) . ' - ';
@@ -211,15 +214,17 @@ class SyslogLogger extends AbstractLogger
 	 *
 	 * @param int    $level The syslog priority
 	 * @param string $entry The message to send to the syslog function
+	 *
+	 * @throws LoggerException
 	 */
-	protected function syslogWrapper($level, $entry)
+	protected function syslogWrapper(int $level, string $entry)
 	{
 		set_error_handler([$this, 'customErrorHandler']);
 		$written = syslog($level, $entry);
 		restore_error_handler();
 
 		if (!$written) {
-			throw new \UnexpectedValueException(sprintf('Can\'t write into syslog for ident "%s" and facility "%s": ' . $this->errorMessage, $this->channel, $this->logFacility));
+			throw new LoggerException(sprintf('Can\'t write into syslog for ident "%s" and facility "%s": ' . $this->errorMessage, $this->channel, $this->logFacility));
 		}
 	}
 }

src/Core/Logger/Type/WorkerLogger.php

@@ -19,13 +19,14 @@
  *
  */
 
-namespace Friendica\Util\Logger;
+namespace Friendica\Core\Logger\Type;
 
+use Friendica\Core\Logger\Exception\LoggerException;
 use Friendica\Util\Strings;
 use Psr\Log\LoggerInterface;
 
 /**
- * A Logger for specific worker tasks, which adds an additional woker-id to it.
+ * A Logger for specific worker tasks, which adds a worker id to it.
  * Uses the decorator pattern (https://en.wikipedia.org/wiki/Decorator_pattern)
  */
 class WorkerLogger implements LoggerInterface
@@ -46,15 +47,21 @@ class WorkerLogger implements LoggerInterface
 	private $functionName;
 
 	/**
-	 * @param LoggerInterface $logger The logger for worker entries
-	 * @param string $functionName The current function name of the worker
-	 * @param int $idLength The length of the generated worker ID
+	 * @param LoggerInterface $logger       The logger for worker entries
+	 * @param string          $functionName The current function name of the worker
+	 * @param int             $idLength     The length of the generated worker ID
+	 *
+	 * @throws LoggerException
 	 */
-	public function __construct(LoggerInterface $logger, $functionName = '', $idLength = 7)
+	public function __construct(LoggerInterface $logger, string $functionName = '', int $idLength = 7)
 	{
-		$this->logger = $logger;
+		$this->logger       = $logger;
 		$this->functionName = $functionName;
-		$this->workerId = Strings::getRandomHex($idLength);
+		try {
+			$this->workerId = Strings::getRandomHex($idLength);
+		} catch (\Exception $exception) {
+			throw new LoggerException('Cannot generate random Hex.', $exception);
+		}
 	}
 
 	/**
@@ -74,7 +81,7 @@ class WorkerLogger implements LoggerInterface
 	 */
 	private function addContext(array &$context)
 	{
-		$context['worker_id'] = $this->workerId;
+		$context['worker_id']  = $this->workerId;
 		$context['worker_cmd'] = $this->functionName;
 	}
 
@@ -83,7 +90,7 @@ class WorkerLogger implements LoggerInterface
 	 *
 	 * @return string
 	 */
-	public function getWorkerId()
+	public function getWorkerId(): string
 	{
 		return $this->workerId;
 	}

src/Core/Logger/Util/Introspection.php

@@ -19,15 +19,17 @@
  *
  */
 
-namespace Friendica\Util;
+namespace Friendica\Core\Logger\Util;
 
 /**
  * Get Introspection information about the current call
  */
 class Introspection
 {
+	/** @var int  */
 	private $skipStackFramesCount;
 
+	/** @var string[] */
 	private $skipClassesPartials;
 
 	private $skipFunctions = [
@@ -36,10 +38,10 @@ class Introspection
 	];
 
 	/**
-	 * @param array $skipClassesPartials  An array of classes to skip during logging
-	 * @param int   $skipStackFramesCount If the logger should use information from other hierarchy levels of the call
+	 * @param string[] $skipClassesPartials  An array of classes to skip during logging
+	 * @param int      $skipStackFramesCount If the logger should use information from other hierarchy levels of the call
 	 */
-	public function __construct($skipClassesPartials = array(), $skipStackFramesCount = 0)
+	public function __construct(array $skipClassesPartials = [], int $skipStackFramesCount = 0)
 	{
 		$this->skipClassesPartials  = $skipClassesPartials;
 		$this->skipStackFramesCount = $skipStackFramesCount;
@@ -47,6 +49,7 @@ class Introspection
 
 	/**
 	 * Adds new classes to get skipped
+	 *
 	 * @param array $classNames
 	 */
 	public function addClasses(array $classNames)
@@ -59,7 +62,7 @@ class Introspection
 	 *
 	 * @return array
 	 */
-	public function getRecord()
+	public function getRecord(): array
 	{
 		$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
@@ -73,8 +76,8 @@ class Introspection
 
 		return [
 			'file'     => isset($trace[$i - 1]['file']) ? basename($trace[$i - 1]['file']) : null,
-			'line'     => isset($trace[$i - 1]['line']) ? $trace[$i - 1]['line'] : null,
-			'function' => isset($trace[$i]['function']) ? $trace[$i]['function'] : null,
+			'line'     => $trace[$i - 1]['line'] ?? null,
+			'function' => $trace[$i]['function'] ?? null,
 		];
 	}
 
@@ -86,7 +89,7 @@ class Introspection
 	 *
 	 * @return bool True if the class or function should get skipped, otherwise false
 	 */
-	private function isTraceClassOrSkippedFunction(array $trace, $index)
+	private function isTraceClassOrSkippedFunction(array $trace, int $index): bool
 	{
 		if (!isset($trace[$index])) {
 			return false;

src/Core/PConfig/Capability/IManagePersonalConfigValues.php

@@ -19,35 +19,34 @@
  *
  */
 
-namespace Friendica\Core\PConfig;
+namespace Friendica\Core\PConfig\Capability;
+
+use Friendica\Core\PConfig\ValueObject;
 
 /**
  * Interface for accessing user specific configurations
  */
-interface IPConfig
+interface IManagePersonalConfigValues
 {
-
 	/**
 	 * Loads all configuration values of a user's config family into a cached storage.
 	 *
 	 * All configuration values of the given user are stored with the $uid in the cache
 	 *
-	 * @param int $uid The user_id
+	 * @param int    $uid The user_id
 	 * @param string $cat The category of the configuration value
 	 *
 	 * @return array The loaded config array
-	 * @see Cache
-	 *
 	 */
-	function load(int $uid, string $cat = 'config');
+	public function load(int $uid, string $cat = 'config'): array;
 
 	/**
 	 * Get a particular user's config variable given the category name
 	 * ($cat) and a key.
 	 *
 	 * Get a particular user's config value from the given category ($cat)
-	 * and the $key with the $uid from a cached storage either from the $this->configAdapter
-	 * (@see IConfigAdapter) or from the $this->configCache (@see PConfigCache).
+	 * and the $key with the $uid from a cached storage either from the database
+	 * or from the configCache
 	 *
 	 * @param int     $uid           The user_id
 	 * @param string  $cat           The category of the configuration value
@@ -56,8 +55,9 @@ interface IPConfig
 	 * @param boolean $refresh       optional, If true the config is loaded from the db and not from the cache (default: false)
 	 *
 	 * @return mixed Stored value or null if it does not exist
+	 *
 	 */
-	function get(int $uid, string $cat, string $key, $default_value = null, bool $refresh = false);
+	public function get(int $uid, string $cat, string $key, $default_value = null, bool $refresh = false);
 
 	/**
 	 * Sets a configuration value for a user
@@ -74,28 +74,26 @@ interface IPConfig
 	 *
 	 * @return bool Operation success
 	 */
-	function set(int $uid, string $cat, string $key, $value);
+	public function set(int $uid, string $cat, string $key, $value): bool;
 
 	/**
-	 * Deletes the given key from the users's configuration.
+	 * Deletes the given key from the users configuration.
 	 *
-	 * Removes the configured value from the stored cache in $this->configCache
-	 * (@see ConfigCache) and removes it from the database (@see IConfigAdapter)
-	 *  with the given $uid.
+	 * Removes the configured value from the stored cache and removes it from the database with the given $uid.
 	 *
-	 * @param int $uid The user_id
+	 * @param int    $uid The user_id
 	 * @param string $cat The category of the configuration value
 	 * @param string $key The configuration key to delete
 	 *
 	 * @return bool
 	 */
-	function delete(int $uid, string $cat, string $key);
+	public function delete(int $uid, string $cat, string $key): bool;
 
 
 	/**
 	 * Returns the Config Cache
 	 *
-	 * @return Cache
+	 * @return ValueObject\Cache
 	 */
-	function getCache();
+	public function getCache(): ValueObject\Cache;
 }

src/Core/PConfig/Exception/PConfigPersistenceException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Friendica\Core\PConfig\Exception;
+
+use Throwable;
+
+class PConfigPersistenceException extends \RuntimeException
+{
+	public function __construct($message = "", Throwable $previous = null)
+	{
+		parent::__construct($message, 500, $previous);
+	}
+}

src/Core/PConfig/Factory/PConfig.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Core\PConfig\Factory;
+
+use Friendica\Core\Config\ValueObject\Cache;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
+use Friendica\Core\PConfig\Repository;
+use Friendica\Core\PConfig\Type;
+use Friendica\Core\PConfig\ValueObject;
+
+class PConfig
+{
+	/**
+	 * @param Cache              $configCache  The config cache
+	 * @param ValueObject\Cache  $pConfigCache The personal config cache
+	 * @param Repository\PConfig $configRepo   The configuration model
+	 *
+	 * @return IManagePersonalConfigValues
+	 */
+	public function create(Cache $configCache, ValueObject\Cache $pConfigCache, Repository\PConfig $configRepo): IManagePersonalConfigValues
+	{
+		if ($configCache->get('system', 'config_adapter') === 'preload') {
+			$configuration = new Type\PreloadPConfig($pConfigCache, $configRepo);
+		} else {
+			$configuration = new Type\JitPConfig($pConfigCache, $configRepo);
+		}
+
+		return $configuration;
+	}
+}

src/Core/PConfig/Repository/PConfig.php

@@ -19,44 +19,72 @@
  *
  */
 
-namespace Friendica\Model\Config;
+namespace Friendica\Core\PConfig\Repository;
 
+use Friendica\Core\Config\Util\ValueConversion;
+use Friendica\Core\PConfig\Exception\PConfigPersistenceException;
+use Friendica\Database\Database;
 
 /**
  * The Config model backend for users, which is using the general DB-model backend for user-configs
  */
-class PConfig extends DbaConfig
+class PConfig
 {
+	protected static $table_name = 'pconfig';
+
+	/** @var Database */
+	protected $db;
+
+	public function __construct(Database $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Checks if the model is currently connected
+	 *
+	 * @return bool
+	 */
+	public function isConnected(): bool
+	{
+		return $this->db->isConnected();
+	}
+
 	/**
 	 * Loads all configuration values and returns the loaded category as an array.
 	 *
 	 * @param int         $uid The id of the user to load
 	 * @param string|null $cat The category of the configuration values to load
 	 *
-	 * @return array The config array
+	 * @return string[][] The config array
 	 *
-	 * @throws \Exception In case DB calls are invalid
+	 * @throws PConfigPersistenceException In case the persistence layer throws errors
 	 */
-	public function load(int $uid, string $cat = null)
+	public function load(int $uid, ?string $cat = null): array
 	{
 		$return = [];
 
-		if (empty($cat)) {
-			$configs = $this->dba->select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);
-		} else {
-			$configs = $this->dba->select('pconfig', ['cat', 'v', 'k'], ['cat' => $cat, 'uid' => $uid]);
-		}
-
-		while ($config = $this->dba->fetch($configs)) {
-			$key   = $config['k'];
-			$value = $this->toConfigValue($config['v']);
-
-			// just save it in case it is set
-			if (isset($value)) {
-				$return[$config['cat']][$key] = $value;
+		try {
+			if (empty($cat)) {
+				$configs = $this->db->select(static::$table_name, ['cat', 'v', 'k'], ['uid' => $uid]);
+			} else {
+				$configs = $this->db->select(static::$table_name, ['cat', 'v', 'k'], ['cat' => $cat, 'uid' => $uid]);
 			}
+
+			while ($config = $this->db->fetch($configs)) {
+				$key   = $config['k'];
+				$value = ValueConversion::toConfigValue($config['v']);
+
+				// just save it in case it is set
+				if (isset($value)) {
+					$return[$config['cat']][$key] = $value;
+				}
+			}
+		} catch (\Exception $exception) {
+			throw new PConfigPersistenceException(sprintf('Cannot load config category %s for user %d', $cat, $uid), $exception);
+		} finally {
+			$this->db->close($configs);
 		}
-		$this->dba->close($configs);
 
 		return $return;
 	}
@@ -73,7 +101,7 @@ class PConfig extends DbaConfig
 	 *
 	 * @return array|string|null Stored value or null if it does not exist
 	 *
-	 * @throws \Exception In case DB calls are invalid
+	 * @throws PConfigPersistenceException In case the persistence layer throws errors
 	 */
 	public function get(int $uid, string $cat, string $key)
 	{
@@ -81,14 +109,18 @@ class PConfig extends DbaConfig
 			return null;
 		}
 
-		$config = $this->dba->selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
-		if ($this->dba->isResult($config)) {
-			$value = $this->toConfigValue($config['v']);
+		try {
+			$config = $this->db->selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
+			if ($this->db->isResult($config)) {
+				$value = ValueConversion::toConfigValue($config['v']);
 
-			// just return it in case it is set
-			if (isset($value)) {
-				return $value;
+				// just return it in case it is set
+				if (isset($value)) {
+					return $value;
+				}
 			}
+		} catch (\Exception $exception) {
+			throw new PConfigPersistenceException(sprintf('Cannot get config value for category %s, key %s and user %d', $cat, $key, $uid), $exception);
 		}
 
 		return null;
@@ -107,9 +139,9 @@ class PConfig extends DbaConfig
 	 *
 	 * @return bool Operation success
 	 *
-	 * @throws \Exception In case DB calls are invalid
+	 * @throws PConfigPersistenceException In case the persistence layer throws errors
 	 */
-	public function set(int $uid, string $cat, string $key, $value)
+	public function set(int $uid, string $cat, string $key, $value): bool
 	{
 		if (!$this->isConnected()) {
 			return false;
@@ -125,11 +157,12 @@ class PConfig extends DbaConfig
 			return true;
 		}
 
-		$dbvalue = $this->toDbValue($value);
-
-		$result = $this->dba->update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $key], true);
-
-		return $result;
+		try {
+			$dbValue = ValueConversion::toDbValue($value);
+			return $this->db->update(static::$table_name, ['v' => $dbValue], ['uid' => $uid, 'cat' => $cat, 'k' => $key], true);
+		} catch (\Exception $exception) {
+			throw new PConfigPersistenceException(sprintf('Cannot set config value for category %s, key %s and user %d', $cat, $key, $uid), $exception);
+		}
 	}
 
 	/**
@@ -141,14 +174,18 @@ class PConfig extends DbaConfig
 	 *
 	 * @return bool Operation success
 	 *
-	 * @throws \Exception In case DB calls are invalid
+	 * @throws PConfigPersistenceException In case the persistence layer throws errors
 	 */
-	public function delete(int $uid, string $cat, string $key)
+	public function delete(int $uid, string $cat, string $key): bool
 	{
 		if (!$this->isConnected()) {
 			return false;
 		}
 
-		return $this->dba->delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
+		try {
+			return $this->db->delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
+		} catch (\Exception $exception) {
+			throw new PConfigPersistenceException(sprintf('Cannot delete config value for category %s, key %s and user %d', $cat, $key, $uid), $exception);
+		}
 	}
 }

src/Core/PConfig/Type/AbstractPConfigValues.php

@@ -19,20 +19,20 @@
  *
  */
 
-namespace Friendica\Core;
+namespace Friendica\Core\PConfig\Type;
 
-use Friendica\Core\PConfig\Cache;
-use Friendica\Core\PConfig\IPConfig;
-use Friendica\Model;
+use Friendica\Core\PConfig\Repository;
+use Friendica\Core\PConfig\ValueObject\Cache;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 
 /**
  * This class is responsible for the user-specific configuration values in Friendica
- * The values are set through the Config-DB-Table (per Config-DB-model @see Model\Config\PConfig)
+ * The values are set through the Config-DB-Table (per Config-DB-model @see Repository\PConfig)
  *
- * The configuration cache (@see Cache\PConfigCache) is used for temporary caching of database calls. This will
+ * The configuration cache (@see Cache) is used for temporary caching of database calls. This will
  * increase the performance.
  */
-abstract class BasePConfig implements IPConfig
+abstract class AbstractPConfigValues implements IManagePersonalConfigValues
 {
 	/**
 	 * @var Cache
@@ -40,18 +40,18 @@ abstract class BasePConfig implements IPConfig
 	protected $configCache;
 
 	/**
-	 * @var Model\Config\PConfig
+	 * @var Repository\PConfig
 	 */
 	protected $configModel;
 
 	/**
-	 * @param Cache $configCache The configuration cache
-	 * @param Model\Config\PConfig          $configModel The configuration model
+	 * @param Cache              $configCache The configuration cache
+	 * @param Repository\PConfig $configRepo  The configuration model
 	 */
-	public function __construct(Cache $configCache, Model\Config\PConfig $configModel)
+	public function __construct(Cache $configCache, Repository\PConfig $configRepo)
 	{
 		$this->configCache = $configCache;
-		$this->configModel = $configModel;
+		$this->configModel = $configRepo;
 	}
 
 	/**
@@ -59,7 +59,7 @@ abstract class BasePConfig implements IPConfig
 	 *
 	 * @return Cache
 	 */
-	public function getCache()
+	public function getCache(): Cache
 	{
 		return $this->configCache;
 	}

src/Core/PConfig/Type/JitPConfig.php

@@ -19,10 +19,10 @@
  *
  */
 
-namespace Friendica\Core\PConfig;
+namespace Friendica\Core\PConfig\Type;
 
-use Friendica\Core\BasePConfig;
-use Friendica\Model;
+use Friendica\Core\PConfig\Repository;
+use Friendica\Core\PConfig\ValueObject;
 
 /**
  * This class implements the Just-In-Time configuration, which will cache
@@ -31,7 +31,7 @@ use Friendica\Model;
  * Default Configuration type.
  * Provides the best performance for pages loading few configuration variables.
  */
-class JitPConfig extends BasePConfig
+class JitPConfig extends AbstractPConfigValues
 {
 	/**
 	 * @var array Array of already loaded db values (even if there was no value)
@@ -39,12 +39,12 @@ class JitPConfig extends BasePConfig
 	private $db_loaded;
 
 	/**
-	 * @param Cache                $configCache The configuration cache
-	 * @param Model\Config\PConfig $configModel The configuration model
+	 * @param ValueObject\Cache  $configCache The configuration cache
+	 * @param Repository\PConfig $configRepo  The configuration model
 	 */
-	public function __construct(Cache $configCache, Model\Config\PConfig $configModel)
+	public function __construct(ValueObject\Cache $configCache, Repository\PConfig $configRepo)
 	{
-		parent::__construct($configCache, $configModel);
+		parent::__construct($configCache, $configRepo);
 		$this->db_loaded = [];
 	}
 
@@ -52,11 +52,11 @@ class JitPConfig extends BasePConfig
 	 * {@inheritDoc}
 	 *
 	 */
-	public function load(int $uid, string $cat = 'config')
+	public function load(int $uid, string $cat = 'config'): array
 	{
 		// If not connected or no uid, do nothing
 		if (!$uid || !$this->configModel->isConnected()) {
-			return;
+			return [];
 		}
 
 		$config = $this->configModel->load($uid, $cat);
@@ -84,14 +84,12 @@ class JitPConfig extends BasePConfig
 
 		// if the value isn't loaded or refresh is needed, load it to the cache
 		if ($this->configModel->isConnected() &&
-		    (empty($this->db_loaded[$uid][$cat][$key]) ||
-		     $refresh)) {
+			(empty($this->db_loaded[$uid][$cat][$key]) || $refresh)) {
+			$dbValue = $this->configModel->get($uid, $cat, $key);
 
-			$dbvalue = $this->configModel->get($uid, $cat, $key);
-
-			if (isset($dbvalue)) {
-				$this->configCache->set($uid, $cat, $key, $dbvalue);
-				unset($dbvalue);
+			if (isset($dbValue)) {
+				$this->configCache->set($uid, $cat, $key, $dbValue);
+				unset($dbValue);
 			}
 
 			$this->db_loaded[$uid][$cat][$key] = true;
@@ -106,7 +104,7 @@ class JitPConfig extends BasePConfig
 	/**
 	 * {@inheritDoc}
 	 */
-	public function set(int $uid, string $cat, string $key, $value)
+	public function set(int $uid, string $cat, string $key, $value): bool
 	{
 		if (!$uid) {
 			return false;
@@ -130,7 +128,7 @@ class JitPConfig extends BasePConfig
 	/**
 	 * {@inheritDoc}
 	 */
-	public function delete(int $uid, string $cat, string $key)
+	public function delete(int $uid, string $cat, string $key): bool
 	{
 		if (!$uid) {
 			return false;

src/Core/PConfig/Type/PreloadPConfig.php

@@ -19,10 +19,10 @@
  *
  */
 
-namespace Friendica\Core\PConfig;
+namespace Friendica\Core\PConfig\Type;
 
-use Friendica\Core\BasePConfig;
-use Friendica\Model;
+use Friendica\Core\PConfig\Repository;
+use Friendica\Core\PConfig\ValueObject;
 
 /**
  * This class implements the preload configuration, which will cache
@@ -30,18 +30,18 @@ use Friendica\Model;
  *
  * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
  */
-class PreloadPConfig extends BasePConfig
+class PreloadPConfig extends AbstractPConfigValues
 {
 	/** @var array */
 	private $config_loaded;
 
 	/**
-	 * @param Cache                $configCache The configuration cache
-	 * @param Model\Config\PConfig $configModel The configuration model
+	 * @param ValueObject\Cache  $configCache The configuration cache
+	 * @param Repository\PConfig $configRepo  The configuration model
 	 */
-	public function __construct(Cache $configCache, Model\Config\PConfig $configModel)
+	public function __construct(ValueObject\Cache $configCache, Repository\PConfig $configRepo)
 	{
-		parent::__construct($configCache, $configModel);
+		parent::__construct($configCache, $configRepo);
 		$this->config_loaded = [];
 	}
 
@@ -51,16 +51,16 @@ class PreloadPConfig extends BasePConfig
 	 * This loads all config values everytime load is called
 	 *
 	 */
-	public function load(int $uid, string $cat = 'config')
+	public function load(int $uid, string $cat = 'config'): array
 	{
 		// Don't load the whole configuration twice or with invalid uid
 		if (!$uid || !empty($this->config_loaded[$uid])) {
-			return;
+			return [];
 		}
 
 		// If not connected, do nothing
 		if (!$this->configModel->isConnected()) {
-			return;
+			return [];
 		}
 
 		$config                    = $this->configModel->load($uid);
@@ -101,7 +101,7 @@ class PreloadPConfig extends BasePConfig
 	/**
 	 * {@inheritDoc}
 	 */
-	public function set(int $uid, string $cat, string $key, $value)
+	public function set(int $uid, string $cat, string $key, $value): bool
 	{
 		if (!$uid) {
 			return false;
@@ -127,7 +127,7 @@ class PreloadPConfig extends BasePConfig
 	/**
 	 * {@inheritDoc}
 	 */
-	public function delete(int $uid, string $cat, string $key)
+	public function delete(int $uid, string $cat, string $key): bool
 	{
 		if (!$uid) {
 			return false;

src/Core/PConfig/ValueObject/Cache.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Core\PConfig;
+namespace Friendica\Core\PConfig\ValueObject;
 
 use ParagonIE\HiddenString\HiddenString;
 
@@ -31,7 +31,7 @@ class Cache
 	/**
 	 * @var array
 	 */
-	private $config;
+	private $config = [];
 
 	/**
 	 * @var bool
@@ -53,7 +53,7 @@ class Cache
 	 * @param int   $uid
 	 * @param array $config
 	 */
-	public function load($uid, array $config)
+	public function load(int $uid, array $config)
 	{
 		if (!is_int($uid)) {
 			return;
@@ -63,7 +63,6 @@ class Cache
 
 		foreach ($categories as $category) {
 			if (isset($config[$category]) && is_array($config[$category])) {
-
 				$keys = array_keys($config[$category]);
 
 				foreach ($keys as $key) {
@@ -81,11 +80,11 @@ class Cache
 	 *
 	 * @param int    $uid User Id
 	 * @param string $cat Config category
-	 * @param string $key Config key
+	 * @param string|null $key Config key
 	 *
-	 * @return null|string The value of the config entry or null if not set
+	 * @return null|mixed The value of the config entry or null if not set
 	 */
-	public function get($uid, string $cat, string $key = null)
+	public function get(int $uid, string $cat, ?string $key = null)
 	{
 		if (!is_int($uid)) {
 			return null;
@@ -112,7 +111,7 @@ class Cache
 	 *
 	 * @return bool Set successful
 	 */
-	public function set($uid, string $cat, string $key, $value)
+	public function set(int $uid, string $cat, string $key, $value): bool
 	{
 		if (!is_int($uid)) {
 			return false;
@@ -127,8 +126,8 @@ class Cache
 		}
 
 		if ($this->hidePasswordOutput &&
-		    $key == 'password' &&
-		    !empty($value) && is_string($value)) {
+			$key == 'password' &&
+			!empty($value) && is_string($value)) {
 			$this->config[$uid][$cat][$key] = new HiddenString((string)$value);
 		} else {
 			$this->config[$uid][$cat][$key] = $value;
@@ -147,7 +146,7 @@ class Cache
 	 *
 	 * @return bool true, if deleted
 	 */
-	public function delete($uid, string $cat, string $key)
+	public function delete(int $uid, string $cat, string $key): bool
 	{
 		if (!is_int($uid)) {
 			return false;
@@ -171,9 +170,9 @@ class Cache
 	/**
 	 * Returns the whole configuration
 	 *
-	 * @return array The configuration
+	 * @return string[][] The configuration
 	 */
-	public function getAll()
+	public function getAll(): array
 	{
 		return $this->config;
 	}
@@ -181,11 +180,11 @@ class Cache
 	/**
 	 * Returns an array with missing categories/Keys
 	 *
-	 * @param array $config The array to check
+	 * @param string[][] $config The array to check
 	 *
-	 * @return array
+	 * @return string[][]
 	 */
-	public function keyDiff(array $config)
+	public function keyDiff(array $config): array
 	{
 		$return = [];
 

src/Core/Process.php

@@ -22,7 +22,7 @@
 namespace Friendica\Core;
 
 use Friendica\App;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Model;
 use Psr\Log\LoggerInterface;
 
@@ -48,7 +48,7 @@ class Process
 	private $mode;
 
 	/**
-	 * @var IConfig
+	 * @var IManageConfigValues
 	 */
 	private $config;
 
@@ -67,7 +67,7 @@ class Process
 	 */
 	private $pid;
 
-	public function __construct(LoggerInterface $logger, App\Mode $mode, IConfig $config, Model\Process $processModel, string $basepath, int $pid)
+	public function __construct(LoggerInterface $logger, App\Mode $mode, IManageConfigValues $config, Model\Process $processModel, string $basepath, int $pid)
 	{
 		$this->logger = $logger;
 		$this->mode = $mode;
@@ -176,7 +176,7 @@ class Process
 			if (count($data) != 2) {
 				continue;
 			}
-			list($key, $val) = $data;
+			[$key, $val] = $data;
 			$meminfo[$key] = (int)trim(str_replace('kB', '', $val));
 			$meminfo[$key] = (int)($meminfo[$key] / 1024);
 		}

src/Core/Search.php

@@ -24,7 +24,7 @@ namespace Friendica\Core;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Network\HTTPException;
-use Friendica\Network\HTTPClientOptions;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Object\Search\ContactResult;
 use Friendica\Object\Search\ResultList;
 use Friendica\Util\Network;
@@ -228,7 +228,7 @@ class Search
 			$return = Contact::searchByName($search, $mode);
 		} else {
 			$p = $page > 1 ? 'p=' . $page : '';
-			$curlResult = DI::httpClient()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), [HTTPClientOptions::ACCEPT_CONTENT => ['application/json']]);
+			$curlResult = DI::httpClient()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), [HttpClientOptions::ACCEPT_CONTENT => ['application/json']]);
 			if ($curlResult->isSuccess()) {
 				$searchResult = json_decode($curlResult->getBody(), true);
 				if (!empty($searchResult['profiles'])) {

src/Core/Session/Capability/IHandleSessions.php

@@ -19,19 +19,19 @@
  *
  */
 
-namespace Friendica\Core\Session;
+namespace Friendica\Core\Session\Capability;
 
 /**
  * Contains all global supported Session methods
  */
-interface ISession
+interface IHandleSessions
 {
 	/**
 	 * Start the current session
 	 *
 	 * @return self The own Session instance
 	 */
-	public function start();
+	public function start(): IHandleSessions;
 
 	/**
 	 * Checks if the key exists in this session
@@ -40,7 +40,7 @@ interface ISession
 	 *
 	 * @return boolean True, if it exists
 	 */
-	public function exists(string $name);
+	public function exists(string $name): bool;
 
 	/**
 	 * Retrieves a key from the session super global or the defaults if the key is missing or the value is falsy.

src/Core/Session/Factory/Session.php

@@ -19,14 +19,15 @@
  *
  */
 
-namespace Friendica\Factory;
+namespace Friendica\Core\Session\Factory;
 
 use Friendica\App;
-use Friendica\Core\Cache\ICache;
-use Friendica\Core\Cache\Type;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\Session;
-use Friendica\Core\System;
+use Friendica\Core\Cache\Capability\ICanCache;
+use Friendica\Core\Cache\Enum;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\Session\Capability\IHandleSessions;
+use Friendica\Core\Session\Type;
+use Friendica\Core\Session\Handler;
 use Friendica\Database\Database;
 use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
@@ -34,7 +35,7 @@ use Psr\Log\LoggerInterface;
 /**
  * Factory for creating a valid Session for this run
  */
-class SessionFactory
+class Session
 {
 	/** @var string The plain, PHP internal session management */
 	const HANDLER_NATIVE = 'native';
@@ -46,43 +47,44 @@ class SessionFactory
 	const HANDLER_DEFAULT = self::HANDLER_DATABASE;
 
 	/**
-	 * @param App\Mode        $mode
-	 * @param App\BaseURL     $baseURL
-	 * @param IConfig         $config
-	 * @param Database        $dba
-	 * @param ICache          $cache
-	 * @param LoggerInterface $logger
-	 * @param array           $server
+	 * @param App\Mode            $mode
+	 * @param App\BaseURL         $baseURL
+	 * @param IManageConfigValues $config
+	 * @param Database            $dba
+	 * @param ICanCache           $cache
+	 * @param LoggerInterface     $logger
+	 * @param Profiler            $profiler
+	 * @param array               $server
 	 *
-	 * @return Session\ISession
+	 * @return IHandleSessions
 	 */
-	public function createSession(App\Mode $mode, App\BaseURL $baseURL, IConfig $config, Database $dba, ICache $cache, LoggerInterface $logger, Profiler $profiler, array $server = [])
+	public function createSession(App\Mode $mode, App\BaseURL $baseURL, IManageConfigValues $config, Database $dba, ICanCache $cache, LoggerInterface $logger, Profiler $profiler, array $server = [])
 	{
 		$profiler->startRecording('session');
 		$session = null;
 
 		try {
 			if ($mode->isInstall() || $mode->isBackend()) {
-				$session = new Session\Memory();
+				$session = new Type\Memory();
 			} else {
 				$session_handler = $config->get('system', 'session_handler', self::HANDLER_DEFAULT);
-				$handler = null;
+				$handler         = null;
 
 				switch ($session_handler) {
 					case self::HANDLER_DATABASE:
-						$handler = new Session\Handler\Database($dba, $logger, $server);
+						$handler = new Handler\Database($dba, $logger, $server);
 						break;
 					case self::HANDLER_CACHE:
 						// In case we're using the db as cache driver, use the native db session, not the cache
-						if ($config->get('system', 'cache_driver') === Type::DATABASE) {
-							$handler = new Session\Handler\Database($dba, $logger, $server);
+						if ($config->get('system', 'cache_driver') === Enum\Type::DATABASE) {
+							$handler = new Handler\Database($dba, $logger, $server);
 						} else {
-							$handler = new Session\Handler\Cache($cache);
+							$handler = new Handler\Cache($cache, $logger);
 						}
 						break;
 				}
 
-				$session = new Session\Native($baseURL, $handler);
+				$session = new Type\Native($baseURL, $handler);
 			}
 		} finally {
 			$profiler->stopRecording();

src/Core/Session/Handler/Cache.php

@@ -21,8 +21,10 @@
 
 namespace Friendica\Core\Session\Handler;
 
-use Friendica\Core\Cache\ICache;
+use Friendica\Core\Cache\Capability\ICanCache;
+use Friendica\Core\Cache\Exception\CachePersistenceException;
 use Friendica\Core\Session;
+use Psr\Log\LoggerInterface;
 use SessionHandlerInterface;
 
 /**
@@ -30,29 +32,37 @@ use SessionHandlerInterface;
  */
 class Cache implements SessionHandlerInterface
 {
-	/** @var ICache */
+	/** @var ICanCache */
 	private $cache;
+	/** @var LoggerInterface */
+	private $logger;
 
-	public function __construct(ICache $cache)
+	public function __construct(ICanCache $cache, LoggerInterface $logger)
 	{
-		$this->cache = $cache;
+		$this->cache  = $cache;
+		$this->logger = $logger;
 	}
 
-	public function open($save_path, $session_name)
+	public function open($path, $name): bool
 	{
 		return true;
 	}
 
-	public function read($session_id)
+	public function read($id)
 	{
-		if (empty($session_id)) {
+		if (empty($id)) {
 			return '';
 		}
 
-		$data = $this->cache->get('session:' . $session_id);
-		if (!empty($data)) {
-			Session::$exists = true;
-			return $data;
+		try {
+			$data = $this->cache->get('session:' . $id);
+			if (!empty($data)) {
+				Session::$exists = true;
+				return $data;
+			}
+		} catch (CachePersistenceException $exception) {
+			$this->logger->warning('Cannot read session.'. ['id' => $id, 'exception' => $exception]);
+			return '';
 		}
 
 		return '';
@@ -65,36 +75,45 @@ class Cache implements SessionHandlerInterface
 	 * on the case. Uses the Session::expire for existing session, 5 minutes
 	 * for newly created session.
 	 *
-	 * @param string $session_id   Session ID with format: [a-z0-9]{26}
-	 * @param string $session_data Serialized session data
+	 * @param string $id   Session ID with format: [a-z0-9]{26}
+	 * @param string $data Serialized session data
 	 *
-	 * @return boolean Returns false if parameters are missing, true otherwise
-	 * @throws \Exception
+	 * @return bool Returns false if parameters are missing, true otherwise
 	 */
-	public function write($session_id, $session_data)
+	public function write($id, $data): bool
 	{
-		if (!$session_id) {
+		if (!$id) {
 			return false;
 		}
 
-		if (!$session_data) {
-			return $this->destroy($session_id);
+		if (!$data) {
+			return $this->destroy($id);
 		}
 
-		return $this->cache->set('session:' . $session_id, $session_data, Session::$expire);
+		try {
+			return $this->cache->set('session:' . $id, $data, Session::$expire);
+		} catch (CachePersistenceException $exception) {
+			$this->logger->warning('Cannot write session', ['id' => $id, 'exception' => $exception]);
+			return false;
+		}
 	}
 
-	public function close()
+	public function close(): bool
 	{
 		return true;
 	}
 
-	public function destroy($id)
+	public function destroy($id): bool
 	{
-		return $this->cache->delete('session:' . $id);
+		try {
+			return $this->cache->delete('session:' . $id);
+		} catch (CachePersistenceException $exception) {
+			$this->logger->warning('Cannot destroy session', ['id' => $id, 'exception' => $exception]);
+			return false;
+		}
 	}
 
-	public function gc($maxlifetime)
+	public function gc($max_lifetime): bool
 	{
 		return true;
 	}

src/Core/Session/Handler/Database.php

@@ -52,24 +52,29 @@ class Database implements SessionHandlerInterface
 		$this->server = $server;
 	}
 
-	public function open($save_path, $session_name)
+	public function open($path, $name): bool
 	{
 		return true;
 	}
 
-	public function read($session_id)
+	public function read($id)
 	{
-		if (empty($session_id)) {
+		if (empty($id)) {
 			return '';
 		}
 
-		$session = $this->dba->selectFirst('session', ['data'], ['sid' => $session_id]);
-		if ($this->dba->isResult($session)) {
-			Session::$exists = true;
-			return $session['data'];
+		try {
+			$session = $this->dba->selectFirst('session', ['data'], ['sid' => $id]);
+			if ($this->dba->isResult($session)) {
+				Session::$exists = true;
+				return $session['data'];
+			}
+		} catch (\Exception $exception) {
+			$this->logger->warning('Cannot read session.'. ['id' => $id, 'exception' => $exception]);
+			return '';
 		}
 
-		$this->logger->notice('no data for session', ['session_id' => $session_id, 'uri' => $this->server['REQUEST_URI'] ?? '']);
+		$this->logger->notice('no data for session', ['session_id' => $id, 'uri' => $this->server['REQUEST_URI'] ?? '']);
 
 		return '';
 	}
@@ -81,49 +86,63 @@ class Database implements SessionHandlerInterface
 	 * on the case. Uses the Session::expire global for existing session, 5 minutes
 	 * for newly created session.
 	 *
-	 * @param string $session_id   Session ID with format: [a-z0-9]{26}
-	 * @param string $session_data Serialized session data
+	 * @param string $id   Session ID with format: [a-z0-9]{26}
+	 * @param string $data Serialized session data
 	 *
-	 * @return boolean Returns false if parameters are missing, true otherwise
-	 * @throws \Exception
+	 * @return bool Returns false if parameters are missing, true otherwise
 	 */
-	public function write($session_id, $session_data)
+	public function write($id, $data): bool
 	{
-		if (!$session_id) {
+		if (!$id) {
 			return false;
 		}
 
-		if (!$session_data) {
-			return $this->destroy($session_id);
+		if (!$data) {
+			return $this->destroy($id);
 		}
 
 		$expire         = time() + Session::$expire;
 		$default_expire = time() + 300;
 
-		if (Session::$exists) {
-			$fields    = ['data' => $session_data, 'expire' => $expire];
-			$condition = ["`sid` = ? AND (`data` != ? OR `expire` != ?)", $session_id, $session_data, $expire];
-			$this->dba->update('session', $fields, $condition);
-		} else {
-			$fields = ['sid' => $session_id, 'expire' => $default_expire, 'data' => $session_data];
-			$this->dba->insert('session', $fields);
+		try {
+			if (Session::$exists) {
+				$fields    = ['data' => $data, 'expire' => $expire];
+				$condition = ["`sid` = ? AND (`data` != ? OR `expire` != ?)", $id, $data, $expire];
+				$this->dba->update('session', $fields, $condition);
+			} else {
+				$fields = ['sid' => $id, 'expire' => $default_expire, 'data' => $data];
+				$this->dba->insert('session', $fields);
+			}
+		} catch (\Exception $exception) {
+			$this->logger->warning('Cannot write session.'. ['id' => $id, 'exception' => $exception]);
+			return false;
 		}
 
 		return true;
 	}
 
-	public function close()
+	public function close(): bool
 	{
 		return true;
 	}
 
-	public function destroy($id)
+	public function destroy($id): bool
 	{
-		return $this->dba->delete('session', ['sid' => $id]);
+		try {
+			return $this->dba->delete('session', ['sid' => $id]);
+		} catch (\Exception $exception) {
+			$this->logger->warning('Cannot destroy session.'. ['id' => $id, 'exception' => $exception]);
+			return false;
+		}
 	}
 
-	public function gc($maxlifetime)
+	public function gc($max_lifetime): bool
 	{
-		return $this->dba->delete('session', ["`expire` < ?", time()]);
+		try {
+			return $this->dba->delete('session', ["`expire` < ?", time()]);
+		} catch (\Exception $exception) {
+			$this->logger->warning('Cannot use garbage collector.'. ['exception' => $exception]);
+			return false;
+		}
 	}
 }

src/Core/Session/Type/AbstractSession.php

@@ -19,17 +19,19 @@
  *
  */
 
-namespace Friendica\Core\Session;
+namespace Friendica\Core\Session\Type;
+
+use Friendica\Core\Session\Capability\IHandleSessions;
 
 /**
  * Contains the base methods for $_SESSION interaction
  */
-class AbstractSession
+class AbstractSession implements IHandleSessions
 {
 	/**
 	 * {@inheritDoc}
 	 */
-	public function start()
+	public function start(): IHandleSessions
 	{
 		return $this;
 	}
@@ -37,7 +39,7 @@ class AbstractSession
 	/**
 	 * {@inheritDoc}}
 	 */
-	public function exists(string $name)
+	public function exists(string $name): bool
 	{
 		return isset($_SESSION[$name]);
 	}

src/Core/Session/Type/Memory.php

@@ -19,14 +19,16 @@
  *
  */
 
-namespace Friendica\Core\Session;
+namespace Friendica\Core\Session\Type;
+
+use Friendica\Core\Session\Capability\IHandleSessions;
 
 /**
  * Usable for backend processes (daemon/worker) and testing
  *
  * @todo after replacing the last direct $_SESSION call, use a internal array instead of the global variable
  */
-class Memory extends AbstractSession implements ISession
+class Memory extends AbstractSession implements IHandleSessions
 {
 	public function __construct()
 	{

src/Core/Session/Type/Native.php

@@ -19,16 +19,17 @@
  *
  */
 
-namespace Friendica\Core\Session;
+namespace Friendica\Core\Session\Type;
 
 use Friendica\App;
+use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Model\User\Cookie;
 use SessionHandlerInterface;
 
 /**
  * The native Session class which uses the PHP internal Session functions
  */
-class Native extends AbstractSession implements ISession
+class Native extends AbstractSession implements IHandleSessions
 {
 	public function __construct(App\BaseURL $baseURL, SessionHandlerInterface $handler = null)
 	{
@@ -48,7 +49,7 @@ class Native extends AbstractSession implements ISession
 	/**
 	 * {@inheritDoc}
 	 */
-	public function start()
+	public function start(): IHandleSessions
 	{
 		session_start();
 		return $this;

src/Core/Storage/Capability/ICanConfigureStorage.php

@@ -19,12 +19,12 @@
  *
  */
 
-namespace Friendica\Model\Storage;
+namespace Friendica\Core\Storage\Capability;
 
 /**
  * The interface to use for configurable storage backends
  */
-interface IStorageConfiguration
+interface ICanConfigureStorage
 {
 	/**
 	 * Get info about storage options

src/Core/Storage/Capability/ICanReadFromStorage.php

@@ -19,12 +19,15 @@
  *
  */
 
-namespace Friendica\Model\Storage;
+namespace Friendica\Core\Storage\Capability;
+
+use Friendica\Core\Storage\Exception\ReferenceStorageException;
+use Friendica\Core\Storage\Exception\StorageException;
 
 /**
  * Interface for basic storage backends
  */
-interface IStorage
+interface ICanReadFromStorage
 {
 	/**
 	 * Get data from backend
@@ -43,7 +46,7 @@ interface IStorage
 	 *
 	 * @return string
 	 */
-	public function __toString();
+	public function __toString(): string;
 
 	/**
 	 * The name of the backend

src/Core/Storage/Capability/ICanWriteToStorage.php

@@ -19,7 +19,10 @@
  *
  */
 
-namespace Friendica\Model\Storage;
+namespace Friendica\Core\Storage\Capability;
+
+use Friendica\Core\Storage\Exception\ReferenceStorageException;
+use Friendica\Core\Storage\Exception\StorageException;
 
 /**
  * Interface for writable storage backends
@@ -27,7 +30,7 @@ namespace Friendica\Model\Storage;
  * Used for storages with CRUD functionality, mainly used for user data (e.g. photos, attachements).
  * There's only one active writable storage possible. This type of storage is selectable by the current administrator.
  */
-interface IWritableStorage extends IStorage
+interface ICanWriteToStorage extends ICanReadFromStorage
 {
 	/**
 	 * Put data in backend as $ref. If $ref is not defined a new reference is created.

src/Core/Storage/Exception/InvalidClassStorageException.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Model\Storage;
+namespace Friendica\Core\Storage\Exception;
 
 /**
  * Storage Exception in case of invalid storage class

src/Core/Storage/Exception/ReferenceStorageException.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Model\Storage;
+namespace Friendica\Core\Storage\Exception;
 
 /**
  * Storage Exception in case of invalid references

src/Core/Storage/Exception/StorageException.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Model\Storage;
+namespace Friendica\Core\Storage\Exception;
 
 use Exception;
 

src/Core/Storage/Repository/StorageManager.php

@@ -19,12 +19,20 @@
  *
  */
 
-namespace Friendica\Core;
+namespace Friendica\Core\Storage\Repository;
 
 use Exception;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Storage\Exception\InvalidClassStorageException;
+use Friendica\Core\Storage\Exception\ReferenceStorageException;
+use Friendica\Core\Storage\Exception\StorageException;
+use Friendica\Core\Storage\Capability\ICanReadFromStorage;
+use Friendica\Core\Storage\Capability\ICanConfigureStorage;
+use Friendica\Core\Storage\Capability\ICanWriteToStorage;
 use Friendica\Database\Database;
-use Friendica\Model\Storage;
+use Friendica\Core\Storage\Type;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Psr\Log\LoggerInterface;
 
@@ -42,40 +50,40 @@ class StorageManager
 	// Default storage backends
 	/** @var string[]  */
 	const DEFAULT_BACKENDS = [
-		Storage\Filesystem::NAME,
-		Storage\Database::NAME,
+		Type\Filesystem::NAME,
+		Type\Database::NAME,
 	];
 
 	/** @var string[] List of valid backend classes */
 	private $validBackends;
 
 	/**
-	 * @var Storage\IStorage[] A local cache for storage instances
+	 * @var ICanReadFromStorage[] A local cache for storage instances
 	 */
 	private $backendInstances = [];
 
 	/** @var Database */
 	private $dba;
-	/** @var IConfig */
+	/** @var IManageConfigValues */
 	private $config;
 	/** @var LoggerInterface */
 	private $logger;
 	/** @var L10n */
 	private $l10n;
 
-	/** @var Storage\IWritableStorage */
+	/** @var ICanWriteToStorage */
 	private $currentBackend;
 
 	/**
-	 * @param Database        $dba
-	 * @param IConfig         $config
-	 * @param LoggerInterface $logger
-	 * @param L10n            $l10n
+	 * @param Database            $dba
+	 * @param IManageConfigValues $config
+	 * @param LoggerInterface     $logger
+	 * @param L10n                $l10n
 	 *
-	 * @throws Storage\InvalidClassStorageException in case the active backend class is invalid
-	 * @throws Storage\StorageException in case of unexpected errors during the active backend class loading
+	 * @throws InvalidClassStorageException in case the active backend class is invalid
+	 * @throws StorageException in case of unexpected errors during the active backend class loading
 	 */
-	public function __construct(Database $dba, IConfig $config, LoggerInterface $logger, L10n $l10n)
+	public function __construct(Database $dba, IManageConfigValues $config, LoggerInterface $logger, L10n $l10n)
 	{
 		$this->dba           = $dba;
 		$this->config        = $config;
@@ -92,9 +100,9 @@ class StorageManager
 	/**
 	 * Return current storage backend class
 	 *
-	 * @return Storage\IWritableStorage
+	 * @return ICanWriteToStorage
 	 */
-	public function getBackend()
+	public function getBackend(): ICanWriteToStorage
 	{
 		return $this->currentBackend;
 	}
@@ -104,16 +112,16 @@ class StorageManager
 	 *
 	 * @param string $name Backend name
 	 *
-	 * @return Storage\IWritableStorage
+	 * @return ICanWriteToStorage
 	 *
-	 * @throws Storage\InvalidClassStorageException in case there's no backend class for the name
-	 * @throws Storage\StorageException in case of an unexpected failure during the hook call
+	 * @throws InvalidClassStorageException in case there's no backend class for the name
+	 * @throws StorageException in case of an unexpected failure during the hook call
 	 */
-	public function getWritableStorageByName(string $name): Storage\IWritableStorage
+	public function getWritableStorageByName(string $name): ICanWriteToStorage
 	{
 		$storage = $this->getByName($name, $this->validBackends);
-		if (!$storage instanceof Storage\IWritableStorage) {
-			throw new Storage\InvalidClassStorageException(sprintf('Backend %s is not writable', $name));
+		if (!$storage instanceof ICanWriteToStorage) {
+			throw new InvalidClassStorageException(sprintf('Backend %s is not writable', $name));
 		}
 
 		return $storage;
@@ -124,19 +132,19 @@ class StorageManager
 	 *
 	 * @param string     $name Backend name
 	 *
-	 * @return Storage\IStorageConfiguration|false
+	 * @return ICanConfigureStorage|false
 	 *
-	 * @throws Storage\InvalidClassStorageException in case there's no backend class for the name
-	 * @throws Storage\StorageException in case of an unexpected failure during the hook call
+	 * @throws InvalidClassStorageException in case there's no backend class for the name
+	 * @throws StorageException in case of an unexpected failure during the hook call
 	 */
 	public function getConfigurationByName(string $name)
 	{
 		switch ($name) {
 			// Try the filesystem backend
-			case Storage\Filesystem::getName():
-				return new Storage\FilesystemConfig($this->config, $this->l10n);
+			case Type\Filesystem::getName():
+				return new Type\FilesystemConfig($this->config, $this->l10n);
 			// try the database backend
-			case Storage\Database::getName():
+			case Type\Database::getName():
 				return false;
 			default:
 				$data = [
@@ -145,13 +153,13 @@ class StorageManager
 				];
 				try {
 					Hook::callAll('storage_config', $data);
-					if (!($data['storage_config'] ?? null) instanceof Storage\IStorageConfiguration) {
-						throw new Storage\InvalidClassStorageException(sprintf('Configuration for backend %s was not found', $name));
+					if (!($data['storage_config'] ?? null) instanceof ICanConfigureStorage) {
+						throw new InvalidClassStorageException(sprintf('Configuration for backend %s was not found', $name));
 					}
 
 					return $data['storage_config'];
 				} catch (InternalServerErrorException $exception) {
-					throw new Storage\StorageException(sprintf('Failed calling hook::storage_config for backend %s', $name), $exception);
+					throw new StorageException(sprintf('Failed calling hook::storage_config for backend %s', $name), $exception);
 				}
 		}
 	}
@@ -162,36 +170,36 @@ class StorageManager
 	 * @param string     $name Backend name
 	 * @param string[]|null $validBackends possible, manual override of the valid backends
 	 *
-	 * @return Storage\IStorage
+	 * @return ICanReadFromStorage
 	 *
-	 * @throws Storage\InvalidClassStorageException in case there's no backend class for the name
-	 * @throws Storage\StorageException in case of an unexpected failure during the hook call
+	 * @throws InvalidClassStorageException in case there's no backend class for the name
+	 * @throws StorageException in case of an unexpected failure during the hook call
 	 */
-	public function getByName(string $name, array $validBackends = null): Storage\IStorage
+	public function getByName(string $name, array $validBackends = null): ICanReadFromStorage
 	{
 		// If there's no cached instance create a new instance
 		if (!isset($this->backendInstances[$name])) {
 			// If the current name isn't a valid backend (or the SystemResource instance) create it
 			if (!$this->isValidBackend($name, $validBackends)) {
-				throw new Storage\InvalidClassStorageException(sprintf('Backend %s is not valid', $name));
+				throw new InvalidClassStorageException(sprintf('Backend %s is not valid', $name));
 			}
 
 			switch ($name) {
 				// Try the filesystem backend
-				case Storage\Filesystem::getName():
-					$storageConfig                 = new Storage\FilesystemConfig($this->config, $this->l10n);
-					$this->backendInstances[$name] = new Storage\Filesystem($storageConfig->getStoragePath());
+				case Type\Filesystem::getName():
+					$storageConfig                 = new Type\FilesystemConfig($this->config, $this->l10n);
+					$this->backendInstances[$name] = new Type\Filesystem($storageConfig->getStoragePath());
 					break;
 				// try the database backend
-				case Storage\Database::getName():
-					$this->backendInstances[$name] = new Storage\Database($this->dba);
+				case Type\Database::getName():
+					$this->backendInstances[$name] = new Type\Database($this->dba);
 					break;
 				// at least, try if there's an addon for the backend
-				case Storage\SystemResource::getName():
-					$this->backendInstances[$name] = new Storage\SystemResource();
+				case Type\SystemResource::getName():
+					$this->backendInstances[$name] = new Type\SystemResource();
 					break;
-				case Storage\ExternalResource::getName():
-					$this->backendInstances[$name] = new Storage\ExternalResource();
+				case Type\ExternalResource::getName():
+					$this->backendInstances[$name] = new Type\ExternalResource();
 					break;
 				default:
 					$data = [
@@ -200,13 +208,13 @@ class StorageManager
 					];
 					try {
 						Hook::callAll('storage_instance', $data);
-						if (!($data['storage'] ?? null) instanceof Storage\IStorage) {
-							throw new Storage\InvalidClassStorageException(sprintf('Backend %s was not found', $name));
+						if (!($data['storage'] ?? null) instanceof ICanReadFromStorage) {
+							throw new InvalidClassStorageException(sprintf('Backend %s was not found', $name));
 						}
 
 						$this->backendInstances[$data['name'] ?? $name] = $data['storage'];
 					} catch (InternalServerErrorException $exception) {
-						throw new Storage\StorageException(sprintf('Failed calling hook::storage_instance for backend %s', $name), $exception);
+						throw new StorageException(sprintf('Failed calling hook::storage_instance for backend %s', $name), $exception);
 					}
 					break;
 			}
@@ -227,8 +235,8 @@ class StorageManager
 	{
 		$validBackends = $validBackends ?? array_merge($this->validBackends,
 				[
-					Storage\SystemResource::getName(),
-					Storage\ExternalResource::getName(),
+					Type\SystemResource::getName(),
+					Type\ExternalResource::getName(),
 				]);
 		return in_array($name, $validBackends);
 	}
@@ -236,11 +244,11 @@ class StorageManager
 	/**
 	 * Set current storage backend class
 	 *
-	 * @param Storage\IWritableStorage $storage The storage class
+	 * @param ICanWriteToStorage $storage The storage class
 	 *
 	 * @return boolean True, if the set was successful
 	 */
-	public function setBackend(Storage\IWritableStorage $storage): bool
+	public function setBackend(ICanWriteToStorage $storage): bool
 	{
 		if ($this->config->set('storage', 'name', $storage::getName())) {
 			$this->currentBackend = $storage;
@@ -271,9 +279,8 @@ class StorageManager
 	 */
 	public function register(string $class): bool
 	{
-		if (is_subclass_of($class, Storage\IStorage::class)) {
-			/** @var Storage\IStorage $class */
-
+		if (is_subclass_of($class, ICanReadFromStorage::class)) {
+			/** @var ICanReadFromStorage $class */
 			if ($this->isValidBackend($class::getName(), $this->validBackends)) {
 				return true;
 			}
@@ -299,15 +306,14 @@ class StorageManager
 	 *
 	 * @return boolean True, if unregistering was successful
 	 *
-	 * @throws Storage\StorageException
+	 * @throws StorageException
 	 */
 	public function unregister(string $class): bool
 	{
-		if (is_subclass_of($class, Storage\IStorage::class)) {
-			/** @var Storage\IStorage $class */
-
+		if (is_subclass_of($class, ICanReadFromStorage::class)) {
+			/** @var ICanReadFromStorage $class */
 			if ($this->currentBackend::getName() == $class::getName()) {
-				throw new Storage\StorageException(sprintf('Cannot unregister %s, because it\'s currently active.', $class::getName()));
+				throw new StorageException(sprintf('Cannot unregister %s, because it\'s currently active.', $class::getName()));
 			}
 
 			$key = array_search($class::getName(), $this->validBackends);
@@ -336,18 +342,18 @@ class StorageManager
 	 * Copy existing data to destination storage and delete from source.
 	 * This method cannot move to legacy in-table `data` field.
 	 *
-	 * @param Storage\IWritableStorage $destination Destination storage class name
-	 * @param array                    $tables      Tables to look in for resources. Optional, defaults to ['photo', 'attach']
-	 * @param int                      $limit       Limit of the process batch size, defaults to 5000
+	 * @param ICanWriteToStorage $destination Destination storage class name
+	 * @param array              $tables      Tables to look in for resources. Optional, defaults to ['photo', 'attach']
+	 * @param int                $limit       Limit of the process batch size, defaults to 5000
 	 *
 	 * @return int Number of moved resources
-	 * @throws Storage\StorageException
+	 * @throws StorageException
 	 * @throws Exception
 	 */
-	public function move(Storage\IWritableStorage $destination, array $tables = self::TABLES, int $limit = 5000): int
+	public function move(ICanWriteToStorage $destination, array $tables = self::TABLES, int $limit = 5000): int
 	{
 		if (!$this->isValidBackend($destination, $this->validBackends)) {
-			throw new Storage\StorageException(sprintf("Can't move to storage backend '%s'", $destination::getName()));
+			throw new StorageException(sprintf("Can't move to storage backend '%s'", $destination::getName()));
 		}
 
 		$moved = 0;
@@ -369,10 +375,10 @@ class StorageManager
 					$source = $this->getWritableStorageByName($resource['backend-class'] ?? '');
 					$this->logger->info('Get data from old backend.', ['oldBackend' => $source, 'oldReference' => $sourceRef]);
 					$data = $source->get($sourceRef);
-				} catch (Storage\InvalidClassStorageException $exception) {
+				} catch (InvalidClassStorageException $exception) {
 					$this->logger->info('Get data from DB resource field.', ['oldReference' => $sourceRef]);
 					$data = $resource['data'];
-				} catch (Storage\ReferenceStorageException $exception) {
+				} catch (ReferenceStorageException $exception) {
 					$this->logger->info('Invalid source reference.', ['oldBackend' => $source, 'oldReference' => $sourceRef]);
 					continue;
 				}
@@ -385,7 +391,7 @@ class StorageManager
 					$this->logger->info('update row');
 					if ($this->dba->update($table, ['backend-class' => $destination::getName(), 'backend-ref' => $destinationRef, 'data' => ''], ['id' => $id])) {
 						if (!empty($source)) {
-							$this->logger->info('Delete data from old backend.', ['oldBackend' => $source, 'oldReference' => $sourceRef]);
+							$this->logger->info('Deleted data from old backend.', ['oldBackend' => $source, 'oldReference' => $sourceRef]);
 							$source->delete($sourceRef);
 						}
 						$moved++;

src/Core/Storage/Type/Database.php

@@ -19,9 +19,12 @@
  *
  */
 
-namespace Friendica\Model\Storage;
+namespace Friendica\Core\Storage\Type;
 
 use Exception;
+use Friendica\Core\Storage\Exception\ReferenceStorageException;
+use Friendica\Core\Storage\Exception\StorageException;
+use Friendica\Core\Storage\Capability\ICanWriteToStorage;
 use Friendica\Database\Database as DBA;
 
 /**
@@ -29,7 +32,7 @@ use Friendica\Database\Database as DBA;
  *
  * This class manage data stored in database table.
  */
-class Database implements IWritableStorage
+class Database implements ICanWriteToStorage
 {
 	const NAME = 'Database';
 
@@ -121,7 +124,7 @@ class Database implements IWritableStorage
 		return self::NAME;
 	}
 
-	public function __toString()
+	public function __toString(): string
 	{
 		return self::getName();
 	}

src/Core/Storage/Type/ExternalResource.php

@@ -19,9 +19,11 @@
  *
  */
 
-namespace Friendica\Model\Storage;
+namespace Friendica\Core\Storage\Type;
 
 use Exception;
+use Friendica\Core\Storage\Exception\ReferenceStorageException;
+use Friendica\Core\Storage\Capability\ICanReadFromStorage;
 use Friendica\Util\HTTPSignature;
 
 /**
@@ -30,7 +32,7 @@ use Friendica\Util\HTTPSignature;
  * This class is used to load external resources, like images.
  * Is not intended to be selectable by admins as default storage class.
  */
-class ExternalResource implements IStorage
+class ExternalResource implements ICanReadFromStorage
 {
 	const NAME = 'ExternalResource';
 
@@ -64,7 +66,7 @@ class ExternalResource implements IStorage
 	/**
 	 * @inheritDoc
 	 */
-	public function __toString()
+	public function __toString(): string
 	{
 		return self::NAME;
 	}

src/Core/Storage/Type/Filesystem.php

@@ -19,9 +19,12 @@
  *
  */
 
-namespace Friendica\Model\Storage;
+namespace Friendica\Core\Storage\Type;
 
 use Exception;
+use Friendica\Core\Storage\Exception\ReferenceStorageException;
+use Friendica\Core\Storage\Exception\StorageException;
+use Friendica\Core\Storage\Capability\ICanWriteToStorage;
 use Friendica\Util\Strings;
 
 /**
@@ -34,7 +37,7 @@ use Friendica\Util\Strings;
  * Each new resource gets a value as reference and is saved in a
  * folder tree stucture created from that value.
  */
-class Filesystem implements IWritableStorage
+class Filesystem implements ICanWriteToStorage
 {
 	const NAME = 'Filesystem';
 
@@ -175,7 +178,7 @@ class Filesystem implements IWritableStorage
 		return self::NAME;
 	}
 
-	public function __toString()
+	public function __toString(): string
 	{
 		return self::getName();
 	}

src/Core/Storage/Type/FilesystemConfig.php

@@ -19,20 +19,21 @@
  *
  */
 
-namespace Friendica\Model\Storage;
+namespace Friendica\Core\Storage\Type;
 
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
+use Friendica\Core\Storage\Capability\ICanConfigureStorage;
 
 /**
  * Filesystem based storage backend configuration
  */
-class FilesystemConfig implements IStorageConfiguration
+class FilesystemConfig implements ICanConfigureStorage
 {
 	// Default base folder
 	const DEFAULT_BASE_FOLDER = 'storage';
 
-	/** @var IConfig */
+	/** @var IManageConfigValues */
 	private $config;
 
 	/** @var string */
@@ -54,10 +55,10 @@ class FilesystemConfig implements IStorageConfiguration
 	/**
 	 * Filesystem constructor.
 	 *
-	 * @param IConfig         $config
-	 * @param L10n            $l10n
+	 * @param IManageConfigValues $config
+	 * @param L10n                $l10n
 	 */
-	public function __construct(IConfig $config, L10n $l10n)
+	public function __construct(IManageConfigValues $config, L10n $l10n)
 	{
 		$this->config = $config;
 		$this->l10n   = $l10n;

src/Core/Storage/Type/SystemResource.php

@@ -19,7 +19,11 @@
  *
  */
 
-namespace Friendica\Model\Storage;
+namespace Friendica\Core\Storage\Type;
+
+use Friendica\Core\Storage\Exception\ReferenceStorageException;
+use Friendica\Core\Storage\Exception\StorageException;
+use Friendica\Core\Storage\Capability\ICanReadFromStorage;
 
 /**
  * System resource storage class
@@ -27,7 +31,7 @@ namespace Friendica\Model\Storage;
  * This class is used to load system resources, like images.
  * Is not intended to be selectable by admins as default storage class.
  */
-class SystemResource implements IStorage
+class SystemResource implements ICanReadFromStorage
 {
 	const NAME = 'SystemResource';
 
@@ -58,7 +62,7 @@ class SystemResource implements IStorage
 	/**
 	 * @inheritDoc
 	 */
-	public function __toString()
+	public function __toString(): string
 	{
 		return self::NAME;
 	}

src/Core/Update.php

@@ -132,7 +132,7 @@ class Update
 
 				// Compare the current structure with the defined structure
 				// If the Lock is acquired, never release it automatically to avoid double updates
-				if (DI::lock()->acquire('dbupdate', 0, Cache\Duration::INFINITE)) {
+				if (DI::lock()->acquire('dbupdate', 0, Cache\Enum\Duration::INFINITE)) {
 
 					Logger::notice('Update starting.', ['from' => $stored, 'to' => $current]);
 
@@ -246,7 +246,7 @@ class Update
 			// If the update fails or times-out completely you may need to
 			// delete the config entry to try again.
 
-			if (DI::lock()->acquire('dbupdate_function', 120, Cache\Duration::INFINITE)) {
+			if (DI::lock()->acquire('dbupdate_function', 120, Cache\Enum\Duration::INFINITE)) {
 
 				// call the specific update
 				Logger::notice('Pre update function start.', ['function' => $funcname]);

src/DI.php

@@ -155,35 +155,35 @@ abstract class DI
 	//
 
 	/**
-	 * @return Core\Cache\ICache
+	 * @return Core\Cache\Capability\ICanCache
 	 */
 	public static function cache()
 	{
-		return self::$dice->create(Core\Cache\ICache::class);
+		return self::$dice->create(Core\Cache\Capability\ICanCache::class);
 	}
 
 	/**
-	 * @return Core\Config\IConfig
+	 * @return Core\Config\Capability\IManageConfigValues
 	 */
 	public static function config()
 	{
-		return self::$dice->create(Core\Config\IConfig::class);
+		return self::$dice->create(Core\Config\Capability\IManageConfigValues::class);
 	}
 
 	/**
-	 * @return Core\PConfig\IPConfig
+	 * @return Core\PConfig\Capability\IManagePersonalConfigValues
 	 */
 	public static function pConfig()
 	{
-		return self::$dice->create(Core\PConfig\IPConfig::class);
+		return self::$dice->create(Core\PConfig\Capability\IManagePersonalConfigValues::class);
 	}
 
 	/**
-	 * @return Core\Lock\ILock
+	 * @return Core\Lock\Capability\ICanLock
 	 */
 	public static function lock()
 	{
-		return self::$dice->create(Core\Lock\ILock::class);
+		return self::$dice->create(Core\Lock\Capability\ICanLock::class);
 	}
 
 	/**
@@ -203,19 +203,19 @@ abstract class DI
 	}
 
 	/**
-	 * @return Core\Session\ISession
+	 * @return Core\Session\Capability\IHandleSessions
 	 */
 	public static function session()
 	{
-		return self::$dice->create(Core\Session\ISession::class);
+		return self::$dice->create(Core\Session\Capability\IHandleSessions::class);
 	}
 
 	/**
-	 * @return Core\StorageManager
+	 * @return \Friendica\Core\Storage\Repository\StorageManager
 	 */
 	public static function storageManager()
 	{
-		return self::$dice->create(Core\StorageManager::class);
+		return self::$dice->create(Core\Storage\Repository\StorageManager::class);
 	}
 
 	//
@@ -243,7 +243,7 @@ abstract class DI
 	 */
 	public static function workerLogger()
 	{
-		return self::$dice->create(Util\Logger\WorkerLogger::class);
+		return self::$dice->create(Core\Logger\Type\WorkerLogger::class);
 	}
 
 	//
@@ -395,11 +395,11 @@ abstract class DI
 	}
 
 	/**
-	 * @return Model\Storage\IWritableStorage
+	 * @return Core\Storage\Capability\ICanWriteToStorage
 	 */
 	public static function storage()
 	{
-		return self::$dice->create(Model\Storage\IWritableStorage::class);
+		return self::$dice->create(Core\Storage\Capability\ICanWriteToStorage::class);
 	}
 
 	/**
@@ -415,11 +415,11 @@ abstract class DI
 	//
 
 	/**
-	 * @return Network\IHTTPClient
+	 * @return Network\HTTPClient\Capability\ICanSendHttpRequests
 	 */
 	public static function httpClient()
 	{
-		return self::$dice->create(Network\IHTTPClient::class);
+		return self::$dice->create(Network\HTTPClient\Capability\ICanSendHttpRequests::class);
 	}
 
 	//

src/Database/Database.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Database;
 
-use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\System;
 use Friendica\Network\HTTPException\ServiceUnavailableException;
 use Friendica\Util\DateTimeFormat;
@@ -49,7 +49,7 @@ class Database
 	protected $connected = false;
 
 	/**
-	 * @var Cache
+	 * @var \Friendica\Core\Config\ValueObject\Cache
 	 */
 	protected $configCache;
 	/**

src/Model/APContact.php

@@ -22,7 +22,7 @@
 namespace Friendica\Model;
 
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;

src/Model/Attach.php

@@ -25,8 +25,8 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
-use Friendica\Model\Storage\InvalidClassStorageException;
-use Friendica\Model\Storage\ReferenceStorageException;
+use Friendica\Core\Storage\Exception\InvalidClassStorageException;
+use Friendica\Core\Storage\Exception\ReferenceStorageException;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Mimetype;

src/Model/Config/Config.php

@@ -1,150 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Model\Config;
-
-
-/**
- * The Config model backend, which is using the general DB-model backend for configs
- */
-class Config extends DbaConfig
-{
-	/**
-	 * Loads all configuration values and returns the loaded category as an array.
-	 *
-	 * @param string|null $cat The category of the configuration values to load
-	 *
-	 * @return array The config array
-	 *
-	 * @throws \Exception In case DB calls are invalid
-	 */
-	public function load(string $cat = null)
-	{
-		$return = [];
-
-		if (empty($cat)) {
-			$configs = $this->dba->select('config', ['cat', 'v', 'k']);
-		} else {
-			$configs = $this->dba->select('config', ['cat', 'v', 'k'], ['cat' => $cat]);
-		}
-
-		while ($config = $this->dba->fetch($configs)) {
-
-			$key   = $config['k'];
-			$value = $this->toConfigValue($config['v']);
-
-			// just save it in case it is set
-			if (isset($value)) {
-				$return[$config['cat']][$key] = $value;
-			}
-		}
-		$this->dba->close($configs);
-
-		return $return;
-	}
-
-	/**
-	 * Get a particular, system-wide config variable out of the DB with the
-	 * given category name ($cat) and a key ($key).
-	 *
-	 * Note: Boolean variables are defined as 0/1 in the database
-	 *
-	 * @param string $cat The category of the configuration value
-	 * @param string $key The configuration key to query
-	 *
-	 * @return array|string|null Stored value or null if it does not exist
-	 *
-	 * @throws \Exception In case DB calls are invalid
-	 */
-	public function get(string $cat, string $key)
-	{
-		if (!$this->isConnected()) {
-			return null;
-		}
-
-		$config = $this->dba->selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
-		if ($this->dba->isResult($config)) {
-			$value = $this->toConfigValue($config['v']);
-
-			// just return it in case it is set
-			if (isset($value)) {
-				return $value;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Stores a config value ($value) in the category ($cat) under the key ($key).
-	 *
-	 * Note: Please do not store booleans - convert to 0/1 integer values!
-	 *
-	 * @param string $cat   The category of the configuration value
-	 * @param string $key   The configuration key to set
-	 * @param mixed  $value The value to store
-	 *
-	 * @return bool Operation success
-	 *
-	 * @throws \Exception In case DB calls are invalid
-	 */
-	public function set(string $cat, string $key, $value)
-	{
-		if (!$this->isConnected()) {
-			return false;
-		}
-
-		// We store our setting values in a string variable.
-		// So we have to do the conversion here so that the compare below works.
-		// The exception are array values.
-		$compare_value = (!is_array($value) ? (string)$value : $value);
-		$stored_value  = $this->get($cat, $key);
-
-		if (isset($stored_value) && ($stored_value === $compare_value)) {
-			return true;
-		}
-
-		$dbvalue = $this->toDbValue($value);
-
-		$result = $this->dba->update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $key], true);
-
-		return $result;
-	}
-
-	/**
-	 * Removes the configured value from the database.
-	 *
-	 * @param string $cat The category of the configuration value
-	 * @param string $key The configuration key to delete
-	 *
-	 * @return bool Operation success
-	 *
-	 * @throws \Exception In case DB calls are invalid
-	 */
-	public function delete(string $cat, string $key)
-	{
-		if (!$this->isConnected()) {
-			return false;
-		}
-
-		return $this->dba->delete('config', ['cat' => $cat, 'k' => $key]);
-	}
-}

src/Model/Config/DbaConfig.php

@@ -1,105 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Model\Config;
-
-use Friendica\Database\Database;
-
-/**
- * The DB-based model of (P-)Config values
- * Encapsulates db-calls in case of config queries
- */
-abstract class DbaConfig
-{
-	/** @var Database */
-	protected $dba;
-
-	/**
-	 * @param Database $dba The database connection of this model
-	 */
-	public function __construct(Database $dba)
-	{
-		$this->dba = $dba;
-	}
-
-	/**
-	 * Checks if the model is currently connected
-	 *
-	 * @return bool
-	 */
-	public function isConnected()
-	{
-		return $this->dba->isConnected();
-	}
-
-	/**
-	 * Formats a DB value to a config value
-	 * - null   = The db-value isn't set
-	 * - bool   = The db-value is either '0' or '1'
-	 * - array  = The db-value is a serialized array
-	 * - string = The db-value is a string
-	 *
-	 * Keep in mind that there aren't any numeric/integer config values in the database
-	 *
-	 * @param null|string $value
-	 *
-	 * @return null|array|string
-	 */
-	protected function toConfigValue($value)
-	{
-		if (!isset($value)) {
-			return null;
-		}
-
-		switch (true) {
-			// manage array value
-			case preg_match("|^a:[0-9]+:{.*}$|s", $value):
-				return unserialize($value);
-
-			default:
-				return $value;
-		}
-	}
-
-	/**
-	 * Formats a config value to a DB value (string)
-	 *
-	 * @param mixed $value
-	 *
-	 * @return string
-	 */
-	protected function toDbValue($value)
-	{
-		// if not set, save an empty string
-		if (!isset($value)) {
-			return '';
-		}
-
-		switch (true) {
-			// manage arrays
-			case is_array($value):
-				return serialize($value);
-
-			default:
-				return (string)$value;
-		}
-	}
-}

src/Model/GServer.php

@@ -32,8 +32,8 @@ use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\Register;
-use Friendica\Network\HTTPClientOptions;
-use Friendica\Network\IHTTPResult;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
+use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
 use Friendica\Protocol\Relay;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -315,7 +315,7 @@ class GServer
 
 		// When a nodeinfo is present, we don't need to dig further
 		$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-		$curlResult = DI::httpClient()->get($url . '/.well-known/nodeinfo', [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
+		$curlResult = DI::httpClient()->get($url . '/.well-known/nodeinfo', [HttpClientOptions::TIMEOUT => $xrd_timeout]);
 		if ($curlResult->isTimeout()) {
 			self::setFailure($url);
 			return false;
@@ -323,7 +323,7 @@ class GServer
 
 		// On a redirect follow the new host but mark the old one as failure
 		if ($curlResult->isSuccess() && (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
-			$curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
+			$curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
 			if (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST)) {
 				Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
 				self::setFailure($url);
@@ -359,7 +359,7 @@ class GServer
 					$basedata = ['detection-method' => self::DETECT_MANUAL];
 				}
 
-				$curlResult = DI::httpClient()->get($baseurl, [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
+				$curlResult = DI::httpClient()->get($baseurl, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
 				if ($curlResult->isSuccess()) {
 					if ((parse_url($baseurl, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
 						Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
@@ -383,7 +383,7 @@ class GServer
 					// When the base path doesn't seem to contain a social network we try the complete path.
 					// Most detectable system have to be installed in the root directory.
 					// We checked the base to avoid false positives.
-					$curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
+					$curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
 					if ($curlResult->isSuccess()) {
 						$urldata = self::analyseRootHeader($curlResult, $serverdata);
 						$urldata = self::analyseRootBody($curlResult, $urldata, $url);
@@ -672,13 +672,13 @@ class GServer
 	/**
 	 * Detect server type by using the nodeinfo data
 	 *
-	 * @param string      $url        address of the server
-	 * @param IHTTPResult $httpResult
+	 * @param string                  $url        address of the server
+	 * @param ICanHandleHttpResponses $httpResult
 	 *
 	 * @return array Server data
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function fetchNodeinfo(string $url, IHTTPResult $httpResult)
+	private static function fetchNodeinfo(string $url, ICanHandleHttpResponses $httpResult)
 	{
 		if (!$httpResult->isSuccess()) {
 			return [];
@@ -959,7 +959,7 @@ class GServer
 	private static function validHostMeta(string $url)
 	{
 		$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-		$curlResult = DI::httpClient()->get($url . '/.well-known/host-meta', [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
+		$curlResult = DI::httpClient()->get($url . '/.well-known/host-meta', [HttpClientOptions::TIMEOUT => $xrd_timeout]);
 		if (!$curlResult->isSuccess()) {
 			return false;
 		}
@@ -1725,7 +1725,7 @@ class GServer
 
 		if (!empty($accesstoken)) {
 			$api = 'https://instances.social/api/1.0/instances/list?count=0';
-			$curlResult = DI::httpClient()->get($api, [HTTPClientOptions::HEADERS => ['Authorization' => ['Bearer ' . $accesstoken]]]);
+			$curlResult = DI::httpClient()->get($api, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . $accesstoken]]]);
 
 			if ($curlResult->isSuccess()) {
 				$servers = json_decode($curlResult->getBody(), true);

src/Model/Photo.php

@@ -21,17 +21,17 @@
 
 namespace Friendica\Model;
 
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
-use Friendica\Model\Storage\ExternalResource;
-use Friendica\Model\Storage\InvalidClassStorageException;
-use Friendica\Model\Storage\ReferenceStorageException;
-use Friendica\Model\Storage\StorageException;
-use Friendica\Model\Storage\SystemResource;
+use Friendica\Core\Storage\Type\ExternalResource;
+use Friendica\Core\Storage\Exception\InvalidClassStorageException;
+use Friendica\Core\Storage\Exception\ReferenceStorageException;
+use Friendica\Core\Storage\Exception\StorageException;
+use Friendica\Core\Storage\Type\SystemResource;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;

src/Model/Post/Link.php

@@ -26,7 +26,7 @@ use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Network\HTTPClientOptions;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Util\Proxy;
 
 /**
@@ -100,7 +100,7 @@ class Link
 	{
 		$timeout = DI::config()->get('system', 'xrd_timeout');
 
-		$curlResult = DI::httpClient()->head($url, [HTTPClientOptions::TIMEOUT => $timeout]);
+		$curlResult = DI::httpClient()->head($url, [HttpClientOptions::TIMEOUT => $timeout]);
 		if ($curlResult->isSuccess()) {
 			if (empty($media['mimetype'])) {
 				return $curlResult->getHeader('Content-Type')[0] ?? '';

src/Model/Post/Media.php

@@ -30,7 +30,7 @@ use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
-use Friendica\Network\HTTPClientOptions;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Util\Images;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
@@ -168,7 +168,7 @@ class Media
 		// Fetch the mimetype or size if missing.
 		if (empty($media['mimetype']) || empty($media['size'])) {
 			$timeout = DI::config()->get('system', 'xrd_timeout');
-			$curlResult = DI::httpClient()->head($media['url'], [HTTPClientOptions::TIMEOUT => $timeout]);
+			$curlResult = DI::httpClient()->head($media['url'], [HttpClientOptions::TIMEOUT => $timeout]);
 			if ($curlResult->isSuccess()) {
 				if (empty($media['mimetype'])) {
 					$media['mimetype'] = $curlResult->getHeader('Content-Type')[0] ?? '';

src/Model/Profile.php

@@ -24,7 +24,7 @@ namespace Friendica\Model;
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget\ContactBlock;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;

src/Model/Tag.php

@@ -22,7 +22,7 @@
 namespace Friendica\Model;
 
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;

src/Model/User/Cookie.php

@@ -22,7 +22,7 @@
 namespace Friendica\Model\User;
 
 use Friendica\App;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 
 /**
  * Interacting with the Friendica Cookie of a user
@@ -52,12 +52,12 @@ class Cookie
 	private $data;
 
 	/**
-	 * @param IConfig     $config
-	 * @param App\BaseURL $baseURL
-	 * @param array       $SERVER The $_SERVER array
-	 * @param array       $COOKIE The $_COOKIE array
+	 * @param IManageConfigValues $config
+	 * @param App\BaseURL         $baseURL
+	 * @param array               $SERVER The $_SERVER array
+	 * @param array               $COOKIE The $_COOKIE array
 	 */
-	public function __construct(IConfig $config, App\BaseURL $baseURL, array $SERVER = [], array $COOKIE = [])
+	public function __construct(IManageConfigValues $config, App\BaseURL $baseURL, array $SERVER = [], array $COOKIE = [])
 	{
 		$this->sslEnabled     = $baseURL->getSSLPolicy() === App\BaseURL::SSL_POLICY_FULL;
 		$this->sitePrivateKey = $config->get('system', 'site_prvkey');

src/Module/Admin/Storage.php

@@ -23,9 +23,9 @@ namespace Friendica\Module\Admin;
 
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Model\Storage\InvalidClassStorageException;
-use Friendica\Model\Storage\IStorageConfiguration;
-use Friendica\Model\Storage\IWritableStorage;
+use Friendica\Core\Storage\Exception\InvalidClassStorageException;
+use Friendica\Core\Storage\Capability\ICanConfigureStorage;
+use Friendica\Core\Storage\Capability\ICanWriteToStorage;
 use Friendica\Module\BaseAdmin;
 use Friendica\Util\Strings;
 
@@ -40,7 +40,7 @@ class Storage extends BaseAdmin
 		$storagebackend = Strings::escapeTags(trim($parameters['name'] ?? ''));
 
 		try {
-			/** @var IStorageConfiguration|false $newStorageConfig */
+			/** @var ICanConfigureStorage|false $newStorageConfig */
 			$newStorageConfig = DI::storageManager()->getConfigurationByName($storagebackend);
 		} catch (InvalidClassStorageException $storageException) {
 			notice(DI::l10n()->t('Storage backend, %s is invalid.', $storagebackend));
@@ -78,7 +78,6 @@ class Storage extends BaseAdmin
 
 		if (!empty($_POST['submit_save_set'])) {
 			try {
-				/** @var IWritableStorage $newstorage */
 				$newstorage = DI::storageManager()->getWritableStorageByName($storagebackend);
 
 				if (!DI::storageManager()->setBackend($newstorage)) {
@@ -129,7 +128,7 @@ class Storage extends BaseAdmin
 				'name'   => $name,
 				'prefix' => $storage_form_prefix,
 				'form'   => $storage_form,
-				'active' => $current_storage_backend instanceof IWritableStorage && $name === $current_storage_backend::getName(),
+				'active' => $current_storage_backend instanceof ICanWriteToStorage && $name === $current_storage_backend::getName(),
 			];
 		}
 
@@ -147,7 +146,7 @@ class Storage extends BaseAdmin
 			'$noconfig'              => DI::l10n()->t('This backend doesn\'t have custom settings'),
 			'$baseurl'               => DI::baseUrl()->get(true),
 			'$form_security_token'   => self::getFormSecurityToken("admin_storage"),
-			'$storagebackend'        => $current_storage_backend instanceof IWritableStorage ? $current_storage_backend::getName() : DI::l10n()->t('Database (legacy)'),
+			'$storagebackend'        => $current_storage_backend instanceof ICanWriteToStorage ? $current_storage_backend::getName() : DI::l10n()->t('Database (legacy)'),
 			'$availablestorageforms' => $available_storage_forms,
 		]);
 	}

src/Module/Admin/Summary.php

@@ -22,14 +22,14 @@
 namespace Friendica\Module\Admin;
 
 use Friendica\Core\Addon;
-use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Update;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
-use Friendica\Factory\ConfigFactory;
+use Friendica\Core\Config\Factory\Config;
 use Friendica\Model\Register;
 use Friendica\Module\BaseAdmin;
 use Friendica\Network\HTTPException\ServiceUnavailableException;
@@ -151,7 +151,7 @@ class Summary extends BaseAdmin
 		}
 
 		// check legacy basepath settings
-		$configLoader = (new ConfigFactory())->createConfigFileLoader($a->getBasePath(), $_SERVER);
+		$configLoader = (new Config())->createConfigFileLoader($a->getBasePath(), $_SERVER);
 		$configCache = new Cache();
 		$configLoader->setupCache($configCache);
 		$confBasepath = $configCache->get('system', 'basepath');

src/Module/Install.php

@@ -24,7 +24,7 @@ namespace Friendica\Module;
 use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core;
-use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\Renderer;
 use Friendica\Core\Theme;
 use Friendica\DI;
@@ -371,11 +371,11 @@ class Install extends BaseModule
 	/**
 	 * Checks the $_POST settings and updates the config Cache for it
 	 *
-	 * @param Cache       $configCache The current config cache
-	 * @param array       $post        The $_POST data
-	 * @param string      $cat         The category of the setting
-	 * @param string      $key         The key of the setting
-	 * @param null|string $default     The default value
+	 * @param \Friendica\Core\Config\ValueObject\Cache $configCache The current config cache
+	 * @param array                                    $post        The $_POST data
+	 * @param string                                   $cat         The category of the setting
+	 * @param string                                   $key         The key of the setting
+	 * @param null|string                              $default     The default value
 	 */
 	private static function checkSetting(Cache $configCache, array $post, $cat, $key, $default = null)
 	{

src/Module/Magic.php

@@ -28,7 +28,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
-use Friendica\Network\HTTPClientOptions;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Strings;
 
@@ -102,7 +102,7 @@ class Magic extends BaseModule
 			);
 
 			// Try to get an authentication token from the other instance.
-			$curlResult = DI::httpClient()->get($basepath . '/owa', [HTTPClientOptions::HEADERS => $header]);
+			$curlResult = DI::httpClient()->get($basepath . '/owa', [HttpClientOptions::HEADERS => $header]);
 
 			if ($curlResult->isSuccess()) {
 				$j = json_decode($curlResult->getBody(), true);

src/Module/Photo.php

@@ -29,8 +29,8 @@ use Friendica\Model\Contact;
 use Friendica\Model\Photo as MPhoto;
 use Friendica\Model\Post;
 use Friendica\Model\Profile;
-use Friendica\Model\Storage\ExternalResource;
-use Friendica\Model\Storage\SystemResource;
+use Friendica\Core\Storage\Type\ExternalResource;
+use Friendica\Core\Storage\Type\SystemResource;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Network\HTTPException\NotModifiedException;

src/Module/Search/Index.php

@@ -25,7 +25,7 @@ use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Widget;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;

src/Navigation/Notifications/Factory/Introduction.php

@@ -27,9 +27,9 @@ use Friendica\App\BaseURL;
 use Friendica\BaseFactory;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Protocol;
-use Friendica\Core\Session\ISession;
+use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Database\Database;
 use Friendica\Model\Contact;
 use Friendica\Module\BaseNotifications;
@@ -51,14 +51,14 @@ class Introduction extends BaseFactory
 	private $baseUrl;
 	/** @var L10n */
 	private $l10n;
-	/** @var IPConfig */
+	/** @var IManagePersonalConfigValues */
 	private $pConfig;
-	/** @var ISession */
+	/** @var IHandleSessions */
 	private $session;
 	/** @var string */
 	private $nick;
 
-	public function __construct(LoggerInterface $logger, Database $dba, BaseURL $baseUrl, L10n $l10n, App $app, IPConfig $pConfig, ISession $session)
+	public function __construct(LoggerInterface $logger, Database $dba, BaseURL $baseUrl, L10n $l10n, App $app, IManagePersonalConfigValues $pConfig, IHandleSessions $session)
 	{
 		parent::__construct($logger);
 

src/Navigation/Notifications/Repository/Notify.php

@@ -5,7 +5,7 @@ namespace Friendica\Navigation\Notifications\Repository;
 use Friendica\App\BaseURL;
 use Friendica\BaseRepository;
 use Friendica\Content\Text\Plaintext;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
@@ -33,7 +33,7 @@ class Notify extends BaseRepository
 	/** @var BaseURL  */
 	protected $baseUrl;
 
-	/** @var IConfig */
+	/** @var IManageConfigValues */
 	protected $config;
 
 	/** @var Emailer */
@@ -44,7 +44,7 @@ class Notify extends BaseRepository
 
 	protected static $table_name = 'notify';
 
-	public function __construct(Database $database, LoggerInterface $logger, L10n $l10n, BaseURL $baseUrl, IConfig $config, Emailer $emailer, Factory\Notification $notification, Factory\Notify $factory = null)
+	public function __construct(Database $database, LoggerInterface $logger, L10n $l10n, BaseURL $baseUrl, IManageConfigValues $config, Emailer $emailer, Factory\Notification $notification, Factory\Notify $factory = null)
 	{
 		$this->l10n         = $l10n;
 		$this->baseUrl      = $baseUrl;

src/Network/HTTPClient/Capability/ICanHandleHttpResponses.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Friendica\Network;
+namespace Friendica\Network\HTTPClient\Capability;
 
 use Psr\Http\Message\MessageInterface;
 
 /**
  * Temporary class to map Friendica used variables based on PSR-7 HTTPResponse
  */
-interface IHTTPResult
+interface ICanHandleHttpResponses
 {
 	/**
 	 * Gets the Return Code
@@ -25,13 +25,14 @@ interface IHTTPResult
 
 	/**
 	 * Returns the headers
-	 * @see MessageInterface::getHeader()
 	 *
 	 * @param string $header optional header field. Return all fields if empty
 	 *
 	 * @return string[] the headers or the specified content of the header variable
+	 *@see MessageInterface::getHeader()
+	 *
 	 */
-	public function getHeader($header);
+	public function getHeader(string $header);
 
 	/**
 	 * Returns all headers

src/Network/HTTPClient/Capability/ICanSendHttpRequests.php

@@ -19,14 +19,14 @@
  *
  */
 
-namespace Friendica\Network;
+namespace Friendica\Network\HTTPClient\Capability;
 
 use GuzzleHttp\Exception\TransferException;
 
 /**
  * Interface for calling HTTP requests and returning their responses
  */
-interface IHTTPClient
+interface ICanSendHttpRequests
 {
 	/**
 	 * Fetches the content of an URL
@@ -41,7 +41,7 @@ interface IHTTPClient
 	 *
 	 * @return string The fetched content
 	 */
-	public function fetch(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '');
+	public function fetch(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = ''): string;
 
 	/**
 	 * Fetches the whole response of an URL.
@@ -54,12 +54,12 @@ interface IHTTPClient
 	 * @param string $accept_content  supply Accept: header with 'accept_content' as the value
 	 * @param string $cookiejar       Path to cookie jar file
 	 *
-	 * @return IHTTPResult With all relevant information, 'body' contains the actual fetched content.
+	 * @return ICanHandleHttpResponses With all relevant information, 'body' contains the actual fetched content.
 	 */
-	public function fetchFull(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '');
+	public function fetchFull(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = ''): ICanHandleHttpResponses;
 
 	/**
-	 * Send a HEAD to an URL.
+	 * Send a HEAD to a URL.
 	 *
 	 * @param string $url        URL to fetch
 	 * @param array  $opts       (optional parameters) associative array with:
@@ -68,9 +68,9 @@ interface IHTTPClient
 	 *                           'cookiejar' => path to cookie jar file
 	 *                           'header' => header array
 	 *
-	 * @return CurlResult
+	 * @return ICanHandleHttpResponses
 	 */
-	public function head(string $url, array $opts = []);
+	public function head(string $url, array $opts = []): ICanHandleHttpResponses;
 
 	/**
 	 * Send a GET to an URL.
@@ -83,9 +83,9 @@ interface IHTTPClient
 	 *                           'header' => header array
 	 *                           'content_length' => int maximum File content length
 	 *
-	 * @return IHTTPResult
+	 * @return ICanHandleHttpResponses
 	 */
-	public function get(string $url, array $opts = []);
+	public function get(string $url, array $opts = []): ICanHandleHttpResponses;
 
 	/**
 	 * Sends a HTTP request to a given url
@@ -101,9 +101,9 @@ interface IHTTPClient
 	 *                           'content_length' => int maximum File content length
 	 *                           'auth' => array authentication settings
 	 *
-	 * @return IHTTPResult
+	 * @return ICanHandleHttpResponses
 	 */
-	public function request(string $method, string $url, array $opts = []);
+	public function request(string $method, string $url, array $opts = []): ICanHandleHttpResponses;
 
 	/**
 	 * Send POST request to an URL
@@ -113,9 +113,9 @@ interface IHTTPClient
 	 * @param array  $headers HTTP headers
 	 * @param int    $timeout The timeout in seconds, default system config value or 60 seconds
 	 *
-	 * @return IHTTPResult The content
+	 * @return ICanHandleHttpResponses The content
 	 */
-	public function post(string $url, $params, array $headers = [], int $timeout = 0);
+	public function post(string $url, $params, array $headers = [], int $timeout = 0): ICanHandleHttpResponses;
 
 	/**
 	 * Returns the original URL of the provided URL
@@ -129,5 +129,5 @@ interface IHTTPClient
 	 *
 	 * @throws TransferException In case there's an error during the resolving
 	 */
-	public function finalUrl(string $url);
+	public function finalUrl(string $url): string;
 }

src/Network/HTTPClient/Client/HttpClient.php

@@ -19,9 +19,14 @@
  *
  */
 
-namespace Friendica\Network;
+namespace Friendica\Network\HTTPClient\Client;
 
 use Friendica\Core\System;
+use Friendica\Network\HTTPClient\Response\CurlResult;
+use Friendica\Network\HTTPClient\Response\GuzzleResponse;
+use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
+use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
+use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\Network;
 use Friendica\Util\Profiler;
 use GuzzleHttp\Client;
@@ -37,7 +42,7 @@ use Psr\Log\LoggerInterface;
 /**
  * Performs HTTP requests to a given URL
  */
-class HTTPClient implements IHTTPClient
+class HttpClient implements ICanSendHttpRequests
 {
 	/** @var LoggerInterface */
 	private $logger;
@@ -59,7 +64,7 @@ class HTTPClient implements IHTTPClient
 	/**
 	 * {@inheritDoc}
 	 */
-	public function request(string $method, string $url, array $opts = []): IHTTPResult
+	public function request(string $method, string $url, array $opts = []): ICanHandleHttpResponses
 	{
 		$this->profiler->startRecording('network');
 		$this->logger->debug('Request start.', ['url' => $url, 'method' => $method]);
@@ -95,43 +100,43 @@ class HTTPClient implements IHTTPClient
 
 		$conf = [];
 
-		if (!empty($opts[HTTPClientOptions::COOKIEJAR])) {
-			$jar                           = new FileCookieJar($opts[HTTPClientOptions::COOKIEJAR]);
+		if (!empty($opts[HttpClientOptions::COOKIEJAR])) {
+			$jar                           = new FileCookieJar($opts[HttpClientOptions::COOKIEJAR]);
 			$conf[RequestOptions::COOKIES] = $jar;
 		}
 
 		$headers = [];
 
-		if (!empty($opts[HTTPClientOptions::ACCEPT_CONTENT])) {
-			$headers['Accept'] = $opts[HTTPClientOptions::ACCEPT_CONTENT];
+		if (!empty($opts[HttpClientOptions::ACCEPT_CONTENT])) {
+			$headers['Accept'] = $opts[HttpClientOptions::ACCEPT_CONTENT];
 		}
 
-		if (!empty($opts[HTTPClientOptions::LEGACY_HEADER])) {
+		if (!empty($opts[HttpClientOptions::LEGACY_HEADER])) {
 			$this->logger->notice('Wrong option \'headers\' used.');
-			$headers = array_merge($opts[HTTPClientOptions::LEGACY_HEADER], $headers);
+			$headers = array_merge($opts[HttpClientOptions::LEGACY_HEADER], $headers);
 		}
 
-		if (!empty($opts[HTTPClientOptions::HEADERS])) {
-			$headers = array_merge($opts[HTTPClientOptions::HEADERS], $headers);
+		if (!empty($opts[HttpClientOptions::HEADERS])) {
+			$headers = array_merge($opts[HttpClientOptions::HEADERS], $headers);
 		}
 
 		$conf[RequestOptions::HEADERS] = array_merge($this->client->getConfig(RequestOptions::HEADERS), $headers);
 
-		if (!empty($opts[HTTPClientOptions::TIMEOUT])) {
-			$conf[RequestOptions::TIMEOUT] = $opts[HTTPClientOptions::TIMEOUT];
+		if (!empty($opts[HttpClientOptions::TIMEOUT])) {
+			$conf[RequestOptions::TIMEOUT] = $opts[HttpClientOptions::TIMEOUT];
 		}
 
-		if (!empty($opts[HTTPClientOptions::BODY])) {
-			$conf[RequestOptions::BODY] = $opts[HTTPClientOptions::BODY];
+		if (!empty($opts[HttpClientOptions::BODY])) {
+			$conf[RequestOptions::BODY] = $opts[HttpClientOptions::BODY];
 		}
 
-		if (!empty($opts[HTTPClientOptions::AUTH])) {
-			$conf[RequestOptions::AUTH] = $opts[HTTPClientOptions::AUTH];
+		if (!empty($opts[HttpClientOptions::AUTH])) {
+			$conf[RequestOptions::AUTH] = $opts[HttpClientOptions::AUTH];
 		}
 
 		$conf[RequestOptions::ON_HEADERS] = function (ResponseInterface $response) use ($opts) {
-			if (!empty($opts[HTTPClientOptions::CONTENT_LENGTH]) &&
-				(int)$response->getHeaderLine('Content-Length') > $opts[HTTPClientOptions::CONTENT_LENGTH]) {
+			if (!empty($opts[HttpClientOptions::CONTENT_LENGTH]) &&
+				(int)$response->getHeaderLine('Content-Length') > $opts[HttpClientOptions::CONTENT_LENGTH]) {
 				throw new TransferException('The file is too big!');
 			}
 		};
@@ -159,7 +164,7 @@ class HTTPClient implements IHTTPClient
 
 	/** {@inheritDoc}
 	 */
-	public function head(string $url, array $opts = []): IHTTPResult
+	public function head(string $url, array $opts = []): ICanHandleHttpResponses
 	{
 		return $this->request('head', $url, $opts);
 	}
@@ -167,7 +172,7 @@ class HTTPClient implements IHTTPClient
 	/**
 	 * {@inheritDoc}
 	 */
-	public function get(string $url, array $opts = []): IHTTPResult
+	public function get(string $url, array $opts = []): ICanHandleHttpResponses
 	{
 		return $this->request('get', $url, $opts);
 	}
@@ -175,18 +180,18 @@ class HTTPClient implements IHTTPClient
 	/**
 	 * {@inheritDoc}
 	 */
-	public function post(string $url, $params, array $headers = [], int $timeout = 0): IHTTPResult
+	public function post(string $url, $params, array $headers = [], int $timeout = 0): ICanHandleHttpResponses
 	{
 		$opts = [];
 
-		$opts[HTTPClientOptions::BODY] = $params;
+		$opts[HttpClientOptions::BODY] = $params;
 
 		if (!empty($headers)) {
-			$opts[HTTPClientOptions::HEADERS] = $headers;
+			$opts[HttpClientOptions::HEADERS] = $headers;
 		}
 
 		if (!empty($timeout)) {
-			$opts[HTTPClientOptions::TIMEOUT] = $timeout;
+			$opts[HttpClientOptions::TIMEOUT] = $timeout;
 		}
 
 		return $this->request('post', $url, $opts);
@@ -195,7 +200,7 @@ class HTTPClient implements IHTTPClient
 	/**
 	 * {@inheritDoc}
 	 */
-	public function finalUrl(string $url)
+	public function finalUrl(string $url): string
 	{
 		$this->profiler->startRecording('network');
 
@@ -229,7 +234,7 @@ class HTTPClient implements IHTTPClient
 	/**
 	 * {@inheritDoc}
 	 */
-	public function fetch(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '')
+	public function fetch(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = ''): string
 	{
 		$ret = $this->fetchFull($url, $timeout, $accept_content, $cookiejar);
 
@@ -239,7 +244,7 @@ class HTTPClient implements IHTTPClient
 	/**
 	 * {@inheritDoc}
 	 */
-	public function fetchFull(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '')
+	public function fetchFull(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = ''): ICanHandleHttpResponses
 	{
 		return $this->get(
 			$url,

src/Network/HTTPClient/Client/HttpClientOptions.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Friendica\Network;
+namespace Friendica\Network\HTTPClient\Client;
 
 use GuzzleHttp\RequestOptions;
 
 /**
  * This class contains a list of possible HTTPClient request options.
  */
-class HTTPClientOptions
+class HttpClientOptions
 {
 	/**
 	 * accept_content: (array) supply Accept: header with 'accept_content' as the value

src/Network/HTTPClient/Factory/HttpClient.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Friendica\Factory;
+namespace Friendica\Network\HTTPClient\Factory;
 
 use Friendica\App;
 use Friendica\BaseFactory;
-use Friendica\Core\Config\IConfig;
-use Friendica\Network\HTTPClient;
-use Friendica\Network\IHTTPClient;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Network\HTTPClient\Client;
+use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
 use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
-use GuzzleHttp\Client;
+use GuzzleHttp;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\RequestOptions;
 use mattwright\URLResolver;
@@ -18,18 +18,18 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
 use Psr\Log\LoggerInterface;
 
-require_once __DIR__ . '/../../static/dbstructure.config.php';
+require_once __DIR__ . '/../../../../static/dbstructure.config.php';
 
-class HTTPClientFactory extends BaseFactory
+class HttpClient extends BaseFactory
 {
-	/** @var IConfig */
+	/** @var IManageConfigValues */
 	private $config;
 	/** @var Profiler */
 	private $profiler;
 	/** @var App\BaseURL */
 	private $baseUrl;
 
-	public function __construct(LoggerInterface $logger, IConfig $config, Profiler $profiler, App\BaseURL $baseUrl)
+	public function __construct(LoggerInterface $logger, IManageConfigValues $config, Profiler $profiler, App\BaseURL $baseUrl)
 	{
 		parent::__construct($logger);
 		$this->config   = $config;
@@ -42,17 +42,17 @@ class HTTPClientFactory extends BaseFactory
 	 *
 	 * @param HandlerStack|null $handlerStack (optional) A handler replacement (just usefull at test environments)
 	 *
-	 * @return IHTTPClient
+	 * @return ICanSendHttpRequests
 	 */
-	public function createClient(HandlerStack $handlerStack = null): IHTTPClient
+	public function createClient(HandlerStack $handlerStack = null): ICanSendHttpRequests
 	{
 		$proxy = $this->config->get('system', 'proxy');
 
 		if (!empty($proxy)) {
-			$proxyuser = $this->config->get('system', 'proxyuser');
+			$proxyUser = $this->config->get('system', 'proxyuser');
 
-			if (!empty($proxyuser)) {
-				$proxy = $proxyuser . '@' . $proxy;
+			if (!empty($proxyUser)) {
+				$proxy = $proxyUser . '@' . $proxy;
 			}
 		}
 
@@ -72,7 +72,7 @@ class HTTPClientFactory extends BaseFactory
 					 DB_UPDATE_VERSION . '; ' .
 					 $this->baseUrl->get();
 
-		$guzzle = new Client([
+		$guzzle = new GuzzleHttp\Client([
 			RequestOptions::ALLOW_REDIRECTS => [
 				'max'            => 8,
 				'on_redirect'    => $onRedirect,
@@ -88,7 +88,7 @@ class HTTPClientFactory extends BaseFactory
 			RequestOptions::FORCE_IP_RESOLVE => ($this->config->get('system', 'ipv4_resolve') ? 'v4' : null),
 			RequestOptions::CONNECT_TIMEOUT  => 10,
 			RequestOptions::TIMEOUT          => $this->config->get('system', 'curl_timeout', 60),
-			// by default we will allow self-signed certs
+			// by default, we will allow self-signed certs,
 			// but it can be overridden
 			RequestOptions::VERIFY  => (bool)$this->config->get('system', 'verifyssl'),
 			RequestOptions::PROXY   => $proxy,
@@ -108,6 +108,6 @@ class HTTPClientFactory extends BaseFactory
 		// Some websites test the browser for cookie support, so this enhances results.
 		$resolver->setCookieJar(get_temppath() .'/resolver-cookie-' . Strings::getRandomName(10));
 
-		return new HTTPClient($logger, $this->profiler, $guzzle, $resolver);
+		return new Client\HttpClient($logger, $this->profiler, $guzzle, $resolver);
 	}
 }

src/Network/HTTPClient/Response/CurlResult.php

@@ -19,16 +19,17 @@
  *
  */
 
-namespace Friendica\Network;
+namespace Friendica\Network\HTTPClient\Response;
 
 use Friendica\Core\Logger;
+use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
 use Friendica\Network\HTTPException\UnprocessableEntityException;
 use Friendica\Util\Network;
 
 /**
  * A content class for Curl call results
  */
-class CurlResult implements IHTTPResult
+class CurlResult implements ICanHandleHttpResponses
 {
 	/**
 	 * @var int HTTP return code or 0 if timeout or failure
@@ -100,35 +101,36 @@ class CurlResult implements IHTTPResult
 	 *
 	 * @param string $url optional URL
 	 *
-	 * @return IHTTPResult a CURL with error response
+	 * @return ICanHandleHttpResponses a CURL with error response
 	 * @throws UnprocessableEntityException
 	 */
-	public static function createErrorCurl($url = '')
+	public static function createErrorCurl(string $url = '')
 	{
 		return new CurlResult($url, '', ['http_code' => 0]);
 	}
 
 	/**
 	 * Curl constructor.
-	 * @param string $url the URL which was called
-	 * @param string $result the result of the curl execution
-	 * @param array $info an additional info array
-	 * @param int $errorNumber the error number or 0 (zero) if no error
-	 * @param string $error the error message or '' (the empty string) if no
+	 *
+	 * @param string $url         the URL which was called
+	 * @param string $result      the result of the curl execution
+	 * @param array  $info        an additional info array
+	 * @param int    $errorNumber the error number or 0 (zero) if no error
+	 * @param string $error       the error message or '' (the empty string) if no
 	 *
 	 * @throws UnprocessableEntityException when HTTP code of the CURL response is missing
 	 */
-	public function __construct($url, $result, $info, $errorNumber = 0, $error = '')
+	public function __construct(string $url, string $result, array $info, int $errorNumber = 0, string $error = '')
 	{
 		if (!array_key_exists('http_code', $info)) {
 			throw new UnprocessableEntityException('CURL response doesn\'t contains a response HTTP code');
 		}
 
-		$this->returnCode = $info['http_code'];
-		$this->url = $url;
-		$this->info = $info;
+		$this->returnCode  = $info['http_code'];
+		$this->url         = $url;
+		$this->info        = $info;
 		$this->errorNumber = $errorNumber;
-		$this->error = $error;
+		$this->error       = $error;
 
 		Logger::debug('construct', ['url' => $url, 'returncode' => $this->returnCode, 'result' => $result]);
 
@@ -144,15 +146,15 @@ class CurlResult implements IHTTPResult
 		// allow for HTTP/2.x without fixing code
 
 		$header = '';
-		$base = $result;
+		$base   = $result;
 		while (preg_match('/^HTTP\/.+? \d+/', $base)) {
 			$chunk = substr($base, 0, strpos($base, "\r\n\r\n") + 4);
 			$header .= $chunk;
 			$base = substr($base, strlen($chunk));
 		}
 
-		$this->body = substr($result, strlen($header));
-		$this->header = $header;
+		$this->body          = substr($result, strlen($header));
+		$this->header        = $header;
 		$this->header_fields = []; // Is filled on demand
 	}
 
@@ -184,7 +186,7 @@ class CurlResult implements IHTTPResult
 			$this->redirectUrl = $this->info['url'];
 		}
 
-		if ($this->returnCode == 301 || $this->returnCode == 302 || $this->returnCode == 303 || $this->returnCode== 307) {
+		if ($this->returnCode == 301 || $this->returnCode == 302 || $this->returnCode == 303 || $this->returnCode == 307) {
 			$redirect_parts = parse_url($this->info['redirect_url'] ?? '');
 			if (empty($redirect_parts)) {
 				$redirect_parts = [];
@@ -228,19 +230,19 @@ class CurlResult implements IHTTPResult
 	}
 
 	/** {@inheritDoc} */
-	public function getReturnCode()
+	public function getReturnCode(): string
 	{
 		return $this->returnCode;
 	}
 
 	/** {@inheritDoc} */
-	public function getContentType()
+	public function getContentType(): string
 	{
 		return $this->contentType;
 	}
 
 	/** {@inheritDoc} */
-	public function getHeader($header)
+	public function getHeader(string $header): array
 	{
 		if (empty($header)) {
 			return [];
@@ -258,13 +260,13 @@ class CurlResult implements IHTTPResult
 	}
 
 	/** {@inheritDoc} */
-	public function getHeaders()
+	public function getHeaders(): array
 	{
 		return $this->getHeaderArray();
 	}
 
 	/** {@inheritDoc} */
-	public function inHeader(string $field)
+	public function inHeader(string $field): bool
 	{
 		$field = strtolower(trim($field));
 
@@ -274,7 +276,7 @@ class CurlResult implements IHTTPResult
 	}
 
 	/** {@inheritDoc} */
-	public function getHeaderArray()
+	public function getHeaderArray(): array
 	{
 		if (!empty($this->header_fields)) {
 			return $this->header_fields;
@@ -284,9 +286,9 @@ class CurlResult implements IHTTPResult
 
 		$lines = explode("\n", trim($this->header));
 		foreach ($lines as $line) {
-			$parts = explode(':', $line);
+			$parts       = explode(':', $line);
 			$headerfield = strtolower(trim(array_shift($parts)));
-			$headerdata = trim(implode(':', $parts));
+			$headerdata  = trim(implode(':', $parts));
 			if (empty($this->header_fields[$headerfield])) {
 				$this->header_fields[$headerfield] = [$headerdata];
 			} elseif (!in_array($headerdata, $this->header_fields[$headerfield])) {
@@ -298,49 +300,49 @@ class CurlResult implements IHTTPResult
 	}
 
 	/** {@inheritDoc} */
-	public function isSuccess()
+	public function isSuccess(): bool
 	{
 		return $this->isSuccess;
 	}
 
 	/** {@inheritDoc} */
-	public function getUrl()
+	public function getUrl(): string
 	{
 		return $this->url;
 	}
 
 	/** {@inheritDoc} */
-	public function getRedirectUrl()
+	public function getRedirectUrl(): string
 	{
 		return $this->redirectUrl;
 	}
 
 	/** {@inheritDoc} */
-	public function getBody()
+	public function getBody(): string
 	{
 		return $this->body;
 	}
 
 	/** {@inheritDoc} */
-	public function isRedirectUrl()
+	public function isRedirectUrl(): bool
 	{
 		return $this->isRedirectUrl;
 	}
 
 	/** {@inheritDoc} */
-	public function getErrorNumber()
+	public function getErrorNumber(): int
 	{
 		return $this->errorNumber;
 	}
 
 	/** {@inheritDoc} */
-	public function getError()
+	public function getError(): string
 	{
 		return $this->error;
 	}
 
 	/** {@inheritDoc} */
-	public function isTimeout()
+	public function isTimeout(): bool
 	{
 		return $this->isTimeout;
 	}

src/Network/HTTPClient/Response/GuzzleResponse.php

@@ -19,10 +19,10 @@
  *
  */
 
-namespace Friendica\Network;
+namespace Friendica\Network\HTTPClient\Response;
 
 use Friendica\Core\Logger;
-use Friendica\Core\System;
+use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
 use Friendica\Network\HTTPException\NotImplementedException;
 use GuzzleHttp\Psr7\Response;
 use Psr\Http\Message\ResponseInterface;
@@ -30,7 +30,7 @@ use Psr\Http\Message\ResponseInterface;
 /**
  * A content wrapper class for Guzzle call results
  */
-class GuzzleResponse extends Response implements IHTTPResult, ResponseInterface
+class GuzzleResponse extends Response implements ICanHandleHttpResponses, ResponseInterface
 {
 	/** @var string The URL */
 	private $url;
@@ -79,68 +79,72 @@ class GuzzleResponse extends Response implements IHTTPResult, ResponseInterface
 	}
 
 	/** {@inheritDoc} */
-	public function getReturnCode()
+	public function getReturnCode(): string
 	{
 		return $this->getStatusCode();
 	}
 
 	/** {@inheritDoc} */
-	public function getContentType()
+	public function getContentType(): string
 	{
 		$contentTypes = $this->getHeader('Content-Type') ?? [];
+
 		return array_pop($contentTypes) ?? '';
 	}
 
 	/** {@inheritDoc} */
-	public function inHeader(string $field)
+	public function inHeader(string $field): bool
 	{
 		return $this->hasHeader($field);
 	}
 
 	/** {@inheritDoc} */
-	public function getHeaderArray()
+	public function getHeaderArray(): array
 	{
 		return $this->getHeaders();
 	}
 
 	/** {@inheritDoc} */
-	public function isSuccess()
+	public function isSuccess(): bool
 	{
 		return $this->isSuccess;
 	}
 
 	/** {@inheritDoc} */
-	public function getUrl()
+	public function getUrl(): string
 	{
 		return $this->url;
 	}
 
 	/** {@inheritDoc} */
-	public function getRedirectUrl()
+	public function getRedirectUrl(): string
 	{
 		return $this->url;
 	}
 
-	/** {@inheritDoc} */
-	public function isRedirectUrl()
+	/** {@inheritDoc}
+	 *
+	 * @throws NotImplementedException
+	 */
+	public function isRedirectUrl(): bool
 	{
 		throw new NotImplementedException();
 	}
 
 	/** {@inheritDoc} */
-	public function getErrorNumber()
+	public function getErrorNumber(): int
 	{
 		return $this->errorNumber;
 	}
 
 	/** {@inheritDoc} */
-	public function getError()
+	public function getError(): string
 	{
 		return $this->error;
 	}
 
 	/** {@inheritDoc} */
-	public function isTimeout()
+	public function isTimeout(): bool
 	{
 		return $this->isTimeout;
 	}

src/Network/Probe.php

@@ -34,6 +34,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\GServer;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Email;
@@ -170,7 +171,7 @@ class Probe
 		Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]);
 		$xrd = null;
 
-		$curlResult = DI::httpClient()->get($ssl_url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
+		$curlResult = DI::httpClient()->get($ssl_url, [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
 		$ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
 		if ($curlResult->isSuccess()) {
 			$xml = $curlResult->getBody();
@@ -187,7 +188,7 @@ class Probe
 		}
 
 		if (!is_object($xrd) && !empty($url)) {
-			$curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
+			$curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
 			$connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
 			if ($curlResult->isTimeout()) {
 				Logger::info('Probing timeout', ['url' => $url]);
@@ -429,7 +430,7 @@ class Probe
 	 */
 	private static function getHideStatus($url)
 	{
-		$curlResult = DI::httpClient()->get($url, [HTTPClientOptions::CONTENT_LENGTH => 1000000]);
+		$curlResult = DI::httpClient()->get($url, [HttpClientOptions::CONTENT_LENGTH => 1000000]);
 		if (!$curlResult->isSuccess()) {
 			return false;
 		}
@@ -950,7 +951,7 @@ class Probe
 	{
 		$xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
 
-		$curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => [$type]]);
+		$curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::ACCEPT_CONTENT => [$type]]);
 		if ($curlResult->isTimeout()) {
 			self::$istimeout = true;
 			return [];

src/Protocol/ActivityPub/Transmitter.php

@@ -23,7 +23,7 @@ namespace Friendica\Protocol\ActivityPub;
 
 use Friendica\Content\Feature;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;

src/Protocol/Diaspora.php

@@ -24,7 +24,7 @@ namespace Friendica\Protocol;
 use Friendica\Content\Feature;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Markdown;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;

src/Protocol/Feed.php

@@ -26,7 +26,7 @@ use DOMXPath;
 use Friendica\Content\PageInfo;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;

src/Protocol/OStatus.php

@@ -25,7 +25,7 @@ use DOMDocument;
 use DOMXPath;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
@@ -38,7 +38,7 @@ use Friendica\Model\ItemURI;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
-use Friendica\Network\HTTPClientOptions;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
@@ -728,7 +728,7 @@ class OStatus
 
 		self::$conv_list[$conversation] = true;
 
-		$curlResult = DI::httpClient()->get($conversation, [HTTPClientOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
+		$curlResult = DI::httpClient()->get($conversation, [HttpClientOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
 
 		if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
 			return;
@@ -922,7 +922,7 @@ class OStatus
 		}
 
 		$stored = false;
-		$curlResult = DI::httpClient()->get($related, [HTTPClientOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
+		$curlResult = DI::httpClient()->get($related, [HttpClientOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
 
 		if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
 			return;

src/Security/Authentication.php

@@ -23,10 +23,11 @@ namespace Friendica\Security;
 
 use Exception;
 use Friendica\App;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Hook;
 use Friendica\Core\Session;
+use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
@@ -46,7 +47,7 @@ use Psr\Log\LoggerInterface;
  */
 class Authentication
 {
-	/** @var IConfig */
+	/** @var IManageConfigValues */
 	private $config;
 	/** @var App\Mode */
 	private $mode;
@@ -60,25 +61,25 @@ class Authentication
 	private $logger;
 	/** @var User\Cookie */
 	private $cookie;
-	/** @var Session\ISession */
+	/** @var IHandleSessions */
 	private $session;
-	/** @var IPConfig */
+	/** @var IManagePersonalConfigValues */
 	private $pConfig;
 
 	/**
 	 * Authentication constructor.
 	 *
-	 * @param IConfig          $config
-	 * @param App\Mode         $mode
-	 * @param App\BaseURL      $baseUrl
-	 * @param L10n             $l10n
-	 * @param Database         $dba
-	 * @param LoggerInterface  $logger
-	 * @param User\Cookie      $cookie
-	 * @param Session\ISession $session
-	 * @param IPConfig         $pConfig
+	 * @param IManageConfigValues                                $config
+	 * @param App\Mode                                           $mode
+	 * @param App\BaseURL                                        $baseUrl
+	 * @param L10n                                               $l10n
+	 * @param Database                                           $dba
+	 * @param LoggerInterface                                    $logger
+	 * @param User\Cookie                                        $cookie
+	 * @param IHandleSessions $session
+	 * @param IManagePersonalConfigValues                        $pConfig
 	 */
-	public function __construct(IConfig $config, App\Mode $mode, App\BaseURL $baseUrl, L10n $l10n, Database $dba, LoggerInterface $logger, User\Cookie $cookie, Session\ISession $session, IPConfig $pConfig)
+	public function __construct(IManageConfigValues $config, App\Mode $mode, App\BaseURL $baseUrl, L10n $l10n, Database $dba, LoggerInterface $logger, User\Cookie $cookie, IHandleSessions $session, IManagePersonalConfigValues $pConfig)
 	{
 		$this->config  = $config;
 		$this->mode    = $mode;

src/Security/ExAuth.php

@@ -36,8 +36,8 @@ namespace Friendica\Security;
 
 use Exception;
 use Friendica\App;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Database\Database;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -54,11 +54,11 @@ class ExAuth
 	 */
 	private $appMode;
 	/**
-	 * @var IConfig
+	 * @var IManageConfigValues
 	 */
 	private $config;
 	/**
-	 * @var IPConfig
+	 * @var IManagePersonalConfigValues
 	 */
 	private $pConfig;
 	/**
@@ -71,14 +71,15 @@ class ExAuth
 	private $baseURL;
 
 	/**
-	 * @param App\Mode    $appMode
-	 * @param IConfig      $config
-	 * @param IPConfig     $pConfig
-	 * @param Database    $dba
-	 * @param App\BaseURL $baseURL
+	 * @param App\Mode                    $appMode
+	 * @param IManageConfigValues         $config
+	 * @param IManagePersonalConfigValues $pConfig
+	 * @param Database                    $dba
+	 * @param App\BaseURL                 $baseURL
+	 *
 	 * @throws Exception
 	 */
-	public function __construct(App\Mode $appMode, IConfig $config, IPConfig $pConfig, Database $dba, App\BaseURL $baseURL)
+	public function __construct(App\Mode $appMode, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, Database $dba, App\BaseURL $baseURL)
 	{
 		$this->appMode = $appMode;
 		$this->config  = $config;

src/Util/EMailer/MailBuilder.php

@@ -23,7 +23,7 @@ namespace Friendica\Util\EMailer;
 
 use Exception;
 use Friendica\App\BaseURL;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Model\User;
@@ -42,7 +42,7 @@ abstract class MailBuilder
 
 	/** @var L10n */
 	protected $l10n;
-	/** @var IConfig */
+	/** @var IManageConfigValues */
 	protected $config;
 	/** @var BaseURL */
 	protected $baseUrl;
@@ -64,7 +64,7 @@ abstract class MailBuilder
 	/** @var int */
 	protected $recipientUid = null;
 
-	public function __construct(L10n $l10n, BaseURL $baseUrl, IConfig $config, LoggerInterface $logger)
+	public function __construct(L10n $l10n, BaseURL $baseUrl, IManageConfigValues $config, LoggerInterface $logger)
 	{
 		$this->l10n    = $l10n;
 		$this->baseUrl = $baseUrl;

src/Util/EMailer/NotifyMailBuilder.php

@@ -24,7 +24,7 @@ namespace Friendica\Util\EMailer;
 use Exception;
 use Friendica\App\BaseURL;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Network\HTTPException\InternalServerErrorException;
@@ -70,7 +70,7 @@ class NotifyMailBuilder extends MailBuilder
 	/** @var string The item link */
 	private $itemLink = '';
 
-	public function __construct(L10n $l10n, BaseURL $baseUrl, IConfig $config, LoggerInterface $logger, string $siteEmailAddress, string $siteName)
+	public function __construct(L10n $l10n, BaseURL $baseUrl, IManageConfigValues $config, LoggerInterface $logger, string $siteEmailAddress, string $siteName)
 	{
 		parent::__construct($l10n, $baseUrl, $config, $logger);
 

src/Util/EMailer/SystemMailBuilder.php

@@ -24,7 +24,7 @@ namespace Friendica\Util\EMailer;
 use Exception;
 use Friendica\App\BaseURL;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Network\HTTPException\InternalServerErrorException;
@@ -45,7 +45,7 @@ class SystemMailBuilder extends MailBuilder
 	/** @var string */
 	protected $siteAdmin;
 
-	public function __construct(L10n $l10n, BaseURL $baseUrl, IConfig $config, LoggerInterface $logger,
+	public function __construct(L10n $l10n, BaseURL $baseUrl, IManageConfigValues $config, LoggerInterface $logger,
 	                            string $siteEmailAddress, string $siteName)
 	{
 		parent::__construct($l10n, $baseUrl, $config, $logger);

src/Util/Emailer.php

@@ -22,10 +22,10 @@
 namespace Friendica\Util;
 
 use Friendica\App;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Object\EMail\IEmail;
 use Friendica\Protocol\Email;
@@ -38,9 +38,9 @@ use Psr\Log\LoggerInterface;
  */
 class Emailer
 {
-	/** @var IConfig */
+	/** @var IManageConfigValues */
 	private $config;
-	/** @var IPConfig */
+	/** @var IManagePersonalConfigValues */
 	private $pConfig;
 	/** @var LoggerInterface */
 	private $logger;
@@ -54,7 +54,7 @@ class Emailer
 	/** @var string */
 	private $siteEmailName;
 
-	public function __construct(IConfig $config, IPConfig $pConfig, App\BaseURL $baseURL, LoggerInterface $logger,
+	public function __construct(IManageConfigValues $config, IManagePersonalConfigValues $pConfig, App\BaseURL $baseURL, LoggerInterface $logger,
 	                            L10n $defaultLang)
 	{
 		$this->config      = $config;

src/Util/FileSystem.php

@@ -73,7 +73,9 @@ class FileSystem
 	 *
 	 * @param string $url The file/url
 	 *
-	 * @return false|resource the open stream ressource
+	 * @return resource the open stream rssource
+	 *
+	 * @throws \UnexpectedValueException
 	 */
 	public function createStream(string $url)
 	{

src/Util/HTTPSignature.php

@@ -28,9 +28,9 @@ use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
-use Friendica\Network\CurlResult;
-use Friendica\Network\HTTPClientOptions;
-use Friendica\Network\IHTTPResult;
+use Friendica\Network\HTTPClient\Response\CurlResult;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
+use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
 
 /**
  * Implements HTTP Signatures per draft-cavage-http-signatures-07.
@@ -414,7 +414,7 @@ class HTTPSignature
 	 *                         'nobody' => only return the header
 	 *                         'cookiejar' => path to cookie jar file
 	 *
-	 * @return IHTTPResult CurlResult
+	 * @return \Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses CurlResult
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function fetchRaw($request, $uid = 0, $opts = ['accept_content' => ['application/activity+json', 'application/ld+json']])
@@ -450,7 +450,7 @@ class HTTPSignature
 		}
 
 		$curl_opts                             = $opts;
-		$curl_opts[HTTPClientOptions::HEADERS] = $header;
+		$curl_opts[HttpClientOptions::HEADERS] = $header;
 
 		if (!empty($opts['nobody'])) {
 			$curlResult = DI::httpClient()->head($request, $curl_opts);

src/Util/JsonLD.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Util;
 
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Exception;
 use Friendica\DI;

src/Util/Logger/VoidLogger.php

@@ -1,159 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Util\Logger;
-
-use Psr\Log\LoggerInterface;
-
-/**
- * A Logger instance to not log
- */
-class VoidLogger implements LoggerInterface
-{
-	/**
-	 * System is unusable.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return void
-	 */
-	public function emergency($message, array $context = array())
-	{
-		return;
-	}
-
-	/**
-	 * Action must be taken immediately.
-	 *
-	 * Example: Entire website down, database unavailable, etc. This should
-	 * trigger the SMS alerts and wake you up.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return void
-	 */
-	public function alert($message, array $context = array())
-	{
-		return;
-	}
-
-	/**
-	 * Critical conditions.
-	 *
-	 * Example: Application component unavailable, unexpected exception.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return void
-	 */
-	public function critical($message, array $context = array())
-	{
-		return;
-	}
-
-	/**
-	 * Runtime errors that do not require immediate action but should typically
-	 * be logged and monitored.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return void
-	 */
-	public function error($message, array $context = array())
-	{
-		return;
-	}
-
-	/**
-	 * Exceptional occurrences that are not errors.
-	 *
-	 * Example: Use of deprecated APIs, poor use of an API, undesirable things
-	 * that are not necessarily wrong.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return void
-	 */
-	public function warning($message, array $context = array())
-	{
-		return;
-	}
-
-	/**
-	 * Normal but significant events.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return void
-	 */
-	public function notice($message, array $context = array())
-	{
-		return;
-	}
-
-	/**
-	 * Interesting events.
-	 *
-	 * Example: User logs in, SQL logs.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return void
-	 */
-	public function info($message, array $context = array())
-	{
-		return;
-	}
-
-	/**
-	 * Detailed debug information.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return void
-	 */
-	public function debug($message, array $context = array())
-	{
-		return;
-	}
-
-	/**
-	 * Logs with an arbitrary level.
-	 *
-	 * @param mixed $level
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return void
-	 */
-	public function log($level, $message, array $context = array())
-	{
-		return;
-	}
-}

src/Util/ParseUrl.php

@@ -30,7 +30,7 @@ use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Network\HTTPException;
-use Friendica\Network\HTTPClientOptions;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 
 /**
  * Get information about a given URL
@@ -214,7 +214,7 @@ class ParseUrl
 			return $siteinfo;
 		}
 
-		$curlResult = DI::httpClient()->get($url, [HTTPClientOptions::CONTENT_LENGTH => 1000000]);
+		$curlResult = DI::httpClient()->get($url, [HttpClientOptions::CONTENT_LENGTH => 1000000]);
 		if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
 			return $siteinfo;
 		}

src/Util/Profiler.php

@@ -21,8 +21,8 @@
 
 namespace Friendica\Util;
 
-use Friendica\Core\Config\Cache;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\ValueObject\Cache;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\System;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
@@ -69,16 +69,16 @@ class Profiler implements ContainerInterface
 	/**
 	 * Updates the enabling of the current profiler
 	 *
-	 * @param IConfig $config
+	 * @param IManageConfigValues $config
 	 */
-	public function update(IConfig $config)
+	public function update(IManageConfigValues $config)
 	{
 		$this->enabled = $config->get('system', 'profiler');
 		$this->rendertime = $config->get('rendertime', 'callstack');
 	}
 
 	/**
-	 * @param Cache $configCache The configuration cache
+	 * @param \Friendica\Core\Config\ValueObject\Cache $configCache The configuration cache
 	 */
 	public function __construct(Cache $configCache)
 	{

src/Worker/OnePoll.php

@@ -29,7 +29,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\User;
-use Friendica\Network\HTTPClientOptions;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Email;
@@ -153,7 +153,7 @@ class OnePoll
 		}
 
 		$cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
-		$curlResult = DI::httpClient()->get($contact['poll'], [HTTPClientOptions::COOKIEJAR => $cookiejar]);
+		$curlResult = DI::httpClient()->get($contact['poll'], [HttpClientOptions::COOKIEJAR => $cookiejar]);
 		unlink($cookiejar);
 
 		if ($curlResult->isTimeout()) {

src/Worker/SearchDirectory.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Worker;
 
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Search;
 use Friendica\DI;