Merge pull request #13298 from nupplaphil/feat/strategies

[Hook] Introduce some more strategies

.woodpecker/.code_standards_check.yml

@@ -1,4 +1,4 @@
-pipeline:
+steps:
   restore_cache:
     image: meltwater/drone-cache:dev
     settings:

.woodpecker/.continuous-deployment.yml

@@ -11,7 +11,7 @@ labels:
 
 skip_clone: true
 
-pipeline:
+steps:
   clone:
     image: alpine/git
     commands:

.woodpecker/.database_checks.yml

@@ -6,7 +6,11 @@ matrix:
 branches:
   exclude: [ stable ]
 
-pipeline:
+# This forces CI executions at the "opensocial" labeled location (because of much more power...)
+labels:
+  location: opensocial
+
+steps:
   db_version_match:
     image: friendicaci/transifex
     commands:

.woodpecker/.license_check.yml

@@ -1,4 +1,4 @@
-pipeline:
+steps:
   check:
     image: friendicaci/php-cs
     commands:

.woodpecker/.messages.po_check.yml

@@ -1,4 +1,4 @@
-pipeline:
+steps:
   build_xgettext:
     image: friendicaci/transifex
     commands:

.woodpecker/.phpunit.yml

@@ -15,12 +15,12 @@ matrix:
 labels:
   location: opensocial
 
-pipeline:
+steps:
   php-lint:
     image: php:${PHP_MAJOR_VERSION}
     group: lint
     commands:
-      - ./bin/composer.phar run lint
+      - find . -name \*.php -not -path './vendor/*' -not -path './view/asset/*' -print0 | xargs -0 -n1 php -l
   restore_cache:
     image: meltwater/drone-cache:dev
     settings:

.woodpecker/.releaser.yml

@@ -9,7 +9,7 @@ labels:
 
 skip_clone: true
 
-pipeline:
+steps:
   clone:
     image: alpine/git
     commands:

bin/auth_ejabberd.php

@@ -58,7 +58,7 @@ if (php_sapi_name() !== 'cli') {
 
 use Dice\Dice;
 use Friendica\App\Mode;
-use Friendica\Core\Logger\Capabilities\LogChannel;
+use Friendica\Core\Logger\Capability\LogChannel;
 use Friendica\Security\ExAuth;
 use Psr\Log\LoggerInterface;
 
@@ -79,8 +79,8 @@ chdir($directory);
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */
+/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
-$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class);
+$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
 $dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies'));
 $dice = $dice->addRule(LoggerInterface::class,['constructParams' => [LogChannel::AUTH_JABBERED]]);
 

bin/console.php

@@ -26,15 +26,15 @@ if (php_sapi_name() !== 'cli') {
 }
 
 use Dice\Dice;
-use Friendica\Core\Logger\Capabilities\LogChannel;
+use Friendica\Core\Logger\Capability\LogChannel;
 use Friendica\DI;
 use Psr\Log\LoggerInterface;
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */
+/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
-$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class);
+$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
 $dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies'));
 $dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [LogChannel::CONSOLE]]);
 

bin/daemon.php

@@ -60,10 +60,10 @@ if (!file_exists('index.php') && (sizeof($_SERVER['argv']) != 0)) {
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */
+/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
-$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class);
+$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
 $dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies'));
-$dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [Logger\Capabilities\LogChannel::DAEMON]]);
+$dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [Logger\Capability\LogChannel::DAEMON]]);
 
 DI::init($dice);
 \Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));

bin/worker.php

@@ -29,7 +29,7 @@ if (php_sapi_name() !== 'cli') {
 use Dice\Dice;
 use Friendica\App;
 use Friendica\App\Mode;
-use Friendica\Core\Logger\Capabilities\LogChannel;
+use Friendica\Core\Logger\Capability\LogChannel;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\DI;
@@ -55,8 +55,8 @@ if (!file_exists("index.php") && (sizeof($_SERVER["argv"]) != 0)) {
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */
+/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
-$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class);
+$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
 $dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies'));
 $dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [LogChannel::WORKER]]);
 

doc/StrategyHooks.md

@@ -10,9 +10,9 @@ This type of hook is based on the [Strategy Design Pattern](https://refactoring.
 A strategy class defines a possible implementation of a given interface based on a unique name.
 Every name is possible as long as it's unique and not `null`.
 Using an empty name (`''`) is possible as well and should be used as the "default" implementation.
-To register a strategy, use the [`ICanRegisterInstance`](../src/Core/Hooks/Capabilities/ICanRegisterInstances.php) interface.
+To register a strategy, use the [`ICanRegisterInstance`](../src/Core/Hooks/Capability/ICanRegisterInstances.php) interface.
 
-After registration, a caller can automatically create this instance with the [`ICanCreateInstances`](../src/Core/Hooks/Capabilities/ICanCreateInstances.php) interface and the chosen name.
+After registration, a caller can automatically create this instance with the [`ICanCreateInstances`](../src/Core/Hooks/Capability/ICanCreateInstances.php) interface and the chosen name.
 
 This is useful in case there are different, possible implementations for the same purpose, like for logging, locking, caching, ...
 
@@ -43,11 +43,11 @@ public class ConcreteClassB implements ExampleInterface
 	}
 }
 
-/** @var \Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies $instanceRegister */
+/** @var \Friendica\Core\Hooks\Capability\ICanRegisterStrategies $instanceRegister */
 $instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassA::class, 'A');
 $instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassB::class, 'B');
 
-/** @var \Friendica\Core\Hooks\Capabilities\ICanCreateInstances $instanceManager */
+/** @var \Friendica\Core\Hooks\Capability\ICanCreateInstances $instanceManager */
 /** @var ConcreteClassA $concreteClass */
 $concreteClass = $instanceManager->create(ExampleInterface::class, 'A');
 
@@ -62,14 +62,14 @@ To avoid registering all strategies manually inside the code, Friendica introduc
 
 There, you can register all kind of strategies  in one file.
 
-### [`HookType::STRATEGY`](../src/Core/Hooks/Capabilities/HookType.php)
+### [`HookType::STRATEGY`](../src/Core/Hooks/Capability/HookType.php)
 
 For each given interface, a list of key-value pairs can be set, where the key is the concrete implementation class and the value is an array of unique names.
 
 ### Example
 
 ```php
-use Friendica\Core\Hooks\Capabilities\BehavioralHookType as H;
+use Friendica\Core\Hooks\Capability\BehavioralHookType as H;
 
 return [
 	H::STRATEGY  => [

index.php

@@ -30,8 +30,8 @@ if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
 require __DIR__ . '/vendor/autoload.php';
 
 $dice = (new Dice())->addRules(include __DIR__ . '/static/dependencies.config.php');
-/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */
+/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
-$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class);
+$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
 $dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies'));
 $dice = $dice->addRule(Friendica\App\Mode::class, ['call' => [['determineRunMode', [false, $_SERVER], Dice::CHAIN_CALL]]]);
 

src/Console/PostUpdate.php

@@ -22,7 +22,7 @@
 namespace Friendica\Console;
 
 use Friendica\App;
-use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs;
+use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
 use Friendica\Core\L10n;
 use Friendica\Core\Update;
 

src/Core/Addon/Capability/ICanLoadAddons.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Core\Addon\Capabilities;
+namespace Friendica\Core\Addon\Capability;
 
 /**
  * Interface for loading Addons specific content

src/Core/Addon/Model/AddonLoader.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Core\Addon\Model;
 
-use Friendica\Core\Addon\Capabilities\ICanLoadAddons;
+use Friendica\Core\Addon\Capability\ICanLoadAddons;
 use Friendica\Core\Addon\Exception\AddonInvalidConfigFileException;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Util\Strings;

src/Core/Cache/Factory/Cache.php

@@ -21,16 +21,13 @@
 
 namespace Friendica\Core\Cache\Factory;
 
-use Friendica\App\BaseURL;
-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\Core\Hooks\Capability\ICanCreateInstances;
 use Friendica\Util\Profiler;
-use Psr\Log\LoggerInterface;
 
 /**
  * Class CacheFactory
@@ -44,59 +41,32 @@ class Cache
 	/**
 	 * @var string The default cache if nothing set
 	 */
-	const DEFAULT_TYPE = Enum\Type::DATABASE;
+	const DEFAULT_TYPE = Type\DatabaseCache::NAME;
+	/** @var ICanCreateInstances */
+	protected $instanceCreator;
+	/** @var IManageConfigValues */
+	protected $config;
+	/** @var Profiler */
+	protected $profiler;
 
-	/**
+	public function __construct(ICanCreateInstances $instanceCreator, IManageConfigValues $config, Profiler $profiler)
-	 * @var IManageConfigValues The IConfiguration to read parameters out of the config
-	 */
-	private $config;
-
-	/**
-	 * @var Database The database connection in case that the cache is used the dba connection
-	 */
-	private $dba;
-
-	/**
-	 * @var string The hostname, used as Prefix for Caching
-	 */
-	private $hostname;
-
-	/**
-	 * @var Profiler The optional profiler if the cached should be profiled
-	 */
-	private $profiler;
-
-	/**
-	 * @var LoggerInterface The Friendica Logger
-	 */
-	private $logger;
-
-	public function __construct(BaseURL $baseURL, IManageConfigValues $config, Database $dba, Profiler $profiler, LoggerInterface $logger)
 	{
-		$this->hostname = $baseURL->getHost();
 		$this->config          = $config;
-		$this->dba      = $dba;
+		$this->instanceCreator = $instanceCreator;
 		$this->profiler        = $profiler;
-		$this->logger   = $logger;
 	}
 
 	/**
-	 * This method creates a CacheDriver for distributed caching with the given cache driver name
+	 * This method creates a CacheDriver for distributed caching
-	 *
-	 * @param string|null $type The cache type to create (default is per config)
 	 *
 	 * @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 createDistributed(string $type = null): ICanCache
+	public function createDistributed(): ICanCache
 	{
-		if ($type === Enum\Type::APCU) {
+		return $this->create($this->config->get('system', 'distributed_cache_driver', self::DEFAULT_TYPE));
-			throw new InvalidCacheDriverException('apcu doesn\'t support distributed caching.');
-		}
-
-		return $this->create($type ?? $this->config->get('system', 'distributed_cache_driver', self::DEFAULT_TYPE));
 	}
 
 	/**
@@ -117,31 +87,17 @@ class Cache
 	/**
 	 * Creates a new Cache instance
 	 *
-	 * @param string $type The type of cache
+	 * @param string $strategy The strategy, which cache instance should be used
 	 *
 	 * @return ICanCache
 	 *
 	 * @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
 	 */
-	protected function create(string $type): ICanCache
+	protected function create(string $strategy): ICanCache
 	{
-		switch ($type) {
+		/** @var ICanCache $cache */
-			case Enum\Type::MEMCACHE:
+		$cache = $this->instanceCreator->create(ICanCache::class, $strategy);
-				$cache = new Type\MemcacheCache($this->hostname, $this->config);
-				break;
-			case Enum\Type::MEMCACHED:
-				$cache = new Type\MemcachedCache($this->hostname, $this->config, $this->logger);
-				break;
-			case Enum\Type::REDIS:
-				$cache = new Type\RedisCache($this->hostname, $this->config);
-				break;
-			case Enum\Type::APCU:
-				$cache = new Type\APCuCache($this->hostname);
-				break;
-			default:
-				$cache = new Type\DatabaseCache($this->hostname, $this->dba);
-		}
 
 		$profiling = $this->config->get('system', 'profiling', false);
 

src/Core/Cache/Type/APCuCache.php

@@ -23,7 +23,6 @@ namespace Friendica\Core\Cache\Type;
 
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Cache\Capability\ICanCacheInMemory;
-use Friendica\Core\Cache\Enum\Type;
 use Friendica\Core\Cache\Exception\InvalidCacheDriverException;
 
 /**
@@ -31,12 +30,12 @@ use Friendica\Core\Cache\Exception\InvalidCacheDriverException;
  */
 class APCuCache extends AbstractCache implements ICanCacheInMemory
 {
+	const NAME = 'apcu';
+
 	use CompareSetTrait;
 	use CompareDeleteTrait;
 
 	/**
-	 * @param string $hostname
-	 *
 	 * @throws InvalidCacheDriverException
 	 */
 	public function __construct(string $hostname)
@@ -173,12 +172,4 @@ class APCuCache extends AbstractCache implements ICanCacheInMemory
 
 		return true;
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName(): string
-	{
-		return Type::APCU;
-	}
 }

src/Core/Cache/Type/AbstractCache.php

@@ -28,6 +28,8 @@ use Friendica\Core\Cache\Capability\ICanCache;
  */
 abstract class AbstractCache implements ICanCache
 {
+	const NAME = '';
+
 	/**
 	 * @var string The hostname
 	 */
@@ -105,4 +107,10 @@ abstract class AbstractCache implements ICanCache
 			return $result;
 		}
 	}
+
+	/** {@inheritDoc} */
+	public function getName(): string
+	{
+		return static::NAME;
+	}
 }

src/Core/Cache/Type/ArrayCache.php

@@ -29,6 +29,8 @@ use Friendica\Core\Cache\Enum;
  */
 class ArrayCache extends AbstractCache implements ICanCacheInMemory
 {
+	const NAME = 'array';
+
 	use CompareDeleteTrait;
 
 	/** @var array Array with the cached data */
@@ -108,12 +110,4 @@ class ArrayCache extends AbstractCache implements ICanCacheInMemory
 			return false;
 		}
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName(): string
-	{
-		return Enum\Type::ARRAY;
-	}
 }

src/Core/Cache/Type/DatabaseCache.php

@@ -32,6 +32,8 @@ use Friendica\Util\DateTimeFormat;
  */
 class DatabaseCache extends AbstractCache implements ICanCache
 {
+	const NAME = 'database';
+
 	/**
 	 * @var Database
 	 */
@@ -154,12 +156,4 @@ class DatabaseCache extends AbstractCache implements ICanCache
 			throw new CachePersistenceException('Cannot clear cache', $exception);
 		}
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName(): string
-	{
-		return Enum\Type::DATABASE;
-	}
 }

src/Core/Cache/Type/MemcacheCache.php

@@ -23,7 +23,6 @@ namespace Friendica\Core\Cache\Type;
 
 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;
@@ -34,6 +33,8 @@ use Memcache;
  */
 class MemcacheCache extends AbstractCache implements ICanCacheInMemory
 {
+	const NAME = 'memcache';
+
 	use CompareSetTrait;
 	use CompareDeleteTrait;
 	use MemcacheCommandTrait;
@@ -169,12 +170,4 @@ class MemcacheCache extends AbstractCache implements ICanCacheInMemory
 		$cacheKey = $this->getCacheKey($key);
 		return $this->memcache->add($cacheKey, serialize($value), MEMCACHE_COMPRESSED, $ttl);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName(): string
-	{
-		return Type::MEMCACHE;
-	}
 }

src/Core/Cache/Type/MemcachedCache.php

@@ -23,7 +23,6 @@ namespace Friendica\Core\Cache\Type;
 
 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;
@@ -35,6 +34,8 @@ use Psr\Log\LoggerInterface;
  */
 class MemcachedCache extends AbstractCache implements ICanCacheInMemory
 {
+	const NAME = 'memcached';
+
 	use CompareSetTrait;
 	use CompareDeleteTrait;
 	use MemcacheCommandTrait;
@@ -185,12 +186,4 @@ class MemcachedCache extends AbstractCache implements ICanCacheInMemory
 		$cacheKey = $this->getCacheKey($key);
 		return $this->memcached->add($cacheKey, $value, $ttl);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName(): string
-	{
-		return Type::MEMCACHED;
-	}
 }

src/Core/Cache/Type/RedisCache.php

@@ -21,10 +21,8 @@
 
 namespace Friendica\Core\Cache\Type;
 
-use Exception;
 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;
@@ -35,6 +33,8 @@ use Redis;
  */
 class RedisCache extends AbstractCache implements ICanCacheInMemory
 {
+	const NAME = 'redis';
+
 	/**
 	 * @var Redis
 	 */
@@ -59,6 +59,8 @@ class RedisCache extends AbstractCache implements ICanCacheInMemory
 		$redis_pw   = $config->get('system', 'redis_password');
 		$redis_db   = $config->get('system', 'redis_db', 0);
 
+		try {
+
 			if (!empty($redis_port) && !@$this->redis->connect($redis_host, $redis_port)) {
 				throw new CachePersistenceException('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available');
 			} else if (!@$this->redis->connect($redis_host)) {
@@ -72,6 +74,9 @@ class RedisCache extends AbstractCache implements ICanCacheInMemory
 			if ($redis_db !== 0 && !$this->redis->select($redis_db)) {
 				throw new CachePersistenceException('Cannot switch to redis db ' . $redis_db . ' at ' . $redis_host . ':' . $redis_port);
 			}
+		} catch (\RedisException $exception) {
+			throw new CachePersistenceException('Redis connection fails unexpectedly', $exception);
+		}
 	}
 
 	/**
@@ -211,12 +216,4 @@ class RedisCache extends AbstractCache implements ICanCacheInMemory
 		$this->redis->unwatch();
 		return false;
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName(): string
-	{
-		return Type::REDIS;
-	}
 }

src/Core/Hooks/Capability/BehavioralHookType.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Core\Hooks\Capabilities;
+namespace Friendica\Core\Hooks\Capability;
 
 /**
  * An enum of hook types, based on behavioral design patterns

src/Core/Hooks/Capability/ICanCreateInstances.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Core\Hooks\Capabilities;
+namespace Friendica\Core\Hooks\Capability;
 
 /**
  * creates special instances for given classes

src/Core/Hooks/Capability/ICanRegisterStrategies.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Core\Hooks\Capabilities;
+namespace Friendica\Core\Hooks\Capability;
 
 use Friendica\Core\Hooks\Exceptions\HookRegisterArgumentException;
 

src/Core/Hooks/Model/DiceInstanceManager.php

@@ -22,8 +22,8 @@
 namespace Friendica\Core\Hooks\Model;
 
 use Dice\Dice;
-use Friendica\Core\Hooks\Capabilities\ICanCreateInstances;
+use Friendica\Core\Hooks\Capability\ICanCreateInstances;
-use Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies;
+use Friendica\Core\Hooks\Capability\ICanRegisterStrategies;
 use Friendica\Core\Hooks\Exceptions\HookInstanceException;
 use Friendica\Core\Hooks\Exceptions\HookRegisterArgumentException;
 use Friendica\Core\Hooks\Util\StrategiesFileManager;

src/Core/Hooks/Util/StrategiesFileManager.php

@@ -21,8 +21,8 @@
 
 namespace Friendica\Core\Hooks\Util;
 
-use Friendica\Core\Addon\Capabilities\ICanLoadAddons;
+use Friendica\Core\Addon\Capability\ICanLoadAddons;
-use Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies;
+use Friendica\Core\Hooks\Capability\ICanRegisterStrategies;
 use Friendica\Core\Hooks\Exceptions\HookConfigException;
 
 /**
@@ -30,6 +30,11 @@ use Friendica\Core\Hooks\Exceptions\HookConfigException;
  */
 class StrategiesFileManager
 {
+	/**
+	 * The default hook-file-key of strategies
+	 * -> it's an empty string to cover empty/missing config values
+	 */
+	const STRATEGY_DEFAULT_KEY = '';
 	const STATIC_DIR  = 'static';
 	const CONFIG_NAME = 'strategies';
 

src/Core/KeyValueStorage/Capability/IManageKeyValuePairs.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Core\KeyValueStorage\Capabilities;
+namespace Friendica\Core\KeyValueStorage\Capability;
 
 use Friendica\Core\KeyValueStorage\Exceptions\KeyValueStoragePersistenceException;
 

src/Core/KeyValueStorage/Factory/KeyValueStorage.php

@@ -19,17 +19,17 @@
  *
  */
 
-namespace Friendica\Core\Cache\Enum;
+namespace Friendica\Core\KeyValueStorage\Factory;
 
-/**
+use Friendica\Core\Hooks\Capability\ICanCreateInstances;
- * Enumeration for cache types
+use Friendica\Core\Hooks\Util\StrategiesFileManager;
- */
+use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
-abstract class Type
+
+class KeyValueStorage
 {
-	const APCU      = 'apcu';
+	public function create(ICanCreateInstances $instanceCreator): IManageKeyValuePairs
-	const REDIS     = 'redis';
+	{
-	const ARRAY     = 'array';
+		/** @var IManageKeyValuePairs */
-	const MEMCACHE  = 'memcache';
+		return $instanceCreator->create(IManageKeyValuePairs::class, StrategiesFileManager::STRATEGY_DEFAULT_KEY);
-	const DATABASE  = 'database';
+	}
-	const MEMCACHED = 'memcached';
 }

src/Core/KeyValueStorage/Type/AbstractKeyValueStorage.php

@@ -21,13 +21,15 @@
 
 namespace Friendica\Core\KeyValueStorage\Type;
 
-use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs;
+use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
 
 /**
  * An abstract helper class for Key-Value storage classes
  */
 abstract class AbstractKeyValueStorage implements IManageKeyValuePairs
 {
+	const NAME = '';
+
 	/** {@inheritDoc} */
 	public function get(string $key)
 	{

src/Core/KeyValueStorage/Type/DBKeyValueStorage.php

@@ -30,6 +30,7 @@ use Friendica\Database\Database;
  */
 class DBKeyValueStorage extends AbstractKeyValueStorage
 {
+	const NAME = 'database';
 	const DB_KEY_VALUE_TABLE = 'key-value';
 
 	/** @var Database */

src/Core/Lock/Enum/Type.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Core\Lock\Enum;
 
-use Friendica\Core\Cache\Enum\Type as CacheType;
+use Friendica\Core\Cache\Type\DatabaseCache;
 
 /**
  * Enumeration for lock types
@@ -30,6 +30,6 @@ use Friendica\Core\Cache\Enum\Type as CacheType;
  */
 abstract class Type
 {
-	const DATABASE  = CacheType::DATABASE;
+	const DATABASE  = DatabaseCache::NAME;
 	const SEMAPHORE = 'semaphore';
 }

src/Core/Lock/Factory/Lock.php

@@ -23,10 +23,10 @@ namespace Friendica\Core\Lock\Factory;
 
 use Friendica\Core\Cache\Factory\Cache;
 use Friendica\Core\Cache\Capability\ICanCacheInMemory;
-use Friendica\Core\Cache\Enum;
+use Friendica\Core\Cache\Type as CacheType;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Lock\Capability\ICanLock;
-use Friendica\Core\Lock\Type;
+use Friendica\Core\Lock\Type as LockType;
 use Friendica\Database\Database;
 use Psr\Log\LoggerInterface;
 
@@ -78,20 +78,20 @@ class Lock
 
 		try {
 			switch ($lock_type) {
-				case Enum\Type::MEMCACHE:
+				case CacheType\MemcacheCache::NAME:
-				case Enum\Type::MEMCACHED:
+				case CacheType\MemcachedCache::NAME:
-				case Enum\Type::REDIS:
+				case CacheType\RedisCache::NAME:
-				case Enum\Type::APCU:
+				case CacheType\APCuCache::NAME:
 					$cache = $this->cacheFactory->createLocal($lock_type);
 					if ($cache instanceof ICanCacheInMemory) {
-						return new Type\CacheLock($cache);
+						return new LockType\CacheLock($cache);
 					} else {
 						throw new \Exception(sprintf('Incompatible cache driver \'%s\' for lock used', $lock_type));
 					}
 				case 'database':
-					return new Type\DatabaseLock($this->dba);
+					return new LockType\DatabaseLock($this->dba);
 				case 'semaphore':
-					return new Type\SemaphoreLock();
+					return new LockType\SemaphoreLock();
 				default:
 					return self::useAutoDriver();
 			}
@@ -116,7 +116,7 @@ class Lock
 		// 1. Try to use Semaphores for - local - locking
 		if (function_exists('sem_get')) {
 			try {
-				return new Type\SemaphoreLock();
+				return new LockType\SemaphoreLock();
 			} catch (\Exception $exception) {
 				$this->logger->warning('Using Semaphore driver for locking failed.', ['exception' => $exception]);
 			}
@@ -124,11 +124,11 @@ class Lock
 
 		// 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 != Enum\Type::DATABASE) {
+		if ($cache_type != CacheType\DatabaseCache::NAME) {
 			try {
 				$cache = $this->cacheFactory->createLocal($cache_type);
 				if ($cache instanceof ICanCacheInMemory) {
-					return new Type\CacheLock($cache);
+					return new LockType\CacheLock($cache);
 				}
 			} catch (\Exception $exception) {
 				$this->logger->warning('Using Cache driver for locking failed.', ['exception' => $exception]);
@@ -136,6 +136,6 @@ class Lock
 		}
 
 		// 3. Use Database Locking as a Fallback
-		return new Type\DatabaseLock($this->dba);
+		return new LockType\DatabaseLock($this->dba);
 	}
 }

src/Core/Lock/Type/AbstractLock.php

@@ -36,7 +36,7 @@ abstract class AbstractLock implements ICanLock
 	/**
 	 * Check if we've locally acquired a lock
 	 *
-	 * @param string key The Name of the lock
+	 * @param string $key The Name of the lock
 	 *
 	 * @return bool      Returns true if the lock is set
 	 */

src/Core/Logger/Capability/ICheckLoggerSettings.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Core\Logger\Capabilities;
+namespace Friendica\Core\Logger\Capability;
 
 /**
  * Whenever a logging specific check is necessary, use this interface to encapsulate and centralize this logic

src/Core/Logger/Capability/IHaveCallIntrospections.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Core\Logger\Capabilities;
+namespace Friendica\Core\Logger\Capability;
 
 interface IHaveCallIntrospections
 {

src/Core/Logger/Capability/LogChannel.php

@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Core\Logger\Capabilities;
+namespace Friendica\Core\Logger\Capability;
 
 /**
  * An enum class for the Log channels

src/Core/Logger/Factory/AbstractLoggerTypeFactory.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Core\Logger\Factory;
 
-use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections;
+use Friendica\Core\Logger\Capability\IHaveCallIntrospections;
 use Psr\Log\LogLevel;
 
 /**

src/Core/Logger/Factory/Logger.php

@@ -22,8 +22,8 @@
 namespace Friendica\Core\Logger\Factory;
 
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Hooks\Capabilities\ICanCreateInstances;
+use Friendica\Core\Hooks\Capability\ICanCreateInstances;
-use Friendica\Core\Logger\Capabilities\LogChannel;
+use Friendica\Core\Logger\Capability\LogChannel;
 use Friendica\Core\Logger\Type\ProfilerLogger as ProfilerLoggerClass;
 use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;

src/Core/Logger/Factory/StreamLogger.php

@@ -22,7 +22,7 @@
 namespace Friendica\Core\Logger\Factory;
 
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Logger\Capabilities\LogChannel;
+use Friendica\Core\Logger\Capability\LogChannel;
 use Friendica\Core\Logger\Exception\LoggerArgumentException;
 use Friendica\Core\Logger\Exception\LoggerException;
 use Friendica\Core\Logger\Exception\LogLevelException;

src/Core/Logger/Type/AbstractLogger.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Core\Logger\Type;
 
-use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections;
+use Friendica\Core\Logger\Capability\IHaveCallIntrospections;
 use Friendica\Core\Logger\Exception\LoggerException;
 use Friendica\Util\Strings;
 use Psr\Log\LoggerInterface;
@@ -38,6 +38,8 @@ use Psr\Log\LogLevel;
  */
 abstract class AbstractLogger implements LoggerInterface
 {
+	const NAME = '';
+
 	/**
 	 * The output channel of this logger
 	 * @var string

src/Core/Logger/Type/StreamLogger.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Core\Logger\Type;
 
-use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections;
+use Friendica\Core\Logger\Capability\IHaveCallIntrospections;
 use Friendica\Core\Logger\Exception\LoggerException;
 use Friendica\Core\Logger\Exception\LogLevelException;
 use Friendica\Util\DateTimeFormat;
@@ -32,6 +32,8 @@ use Psr\Log\LogLevel;
  */
 class StreamLogger extends AbstractLogger
 {
+	const NAME = 'stream';
+
 	/**
 	 * The minimum loglevel at which this logger will be triggered
 	 * @var string

src/Core/Logger/Type/SyslogLogger.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Core\Logger\Type;
 
-use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections;
+use Friendica\Core\Logger\Capability\IHaveCallIntrospections;
 use Friendica\Core\Logger\Exception\LoggerException;
 use Friendica\Core\Logger\Exception\LogLevelException;
 use Psr\Log\LogLevel;
@@ -32,6 +32,8 @@ use Psr\Log\LogLevel;
  */
 class SyslogLogger extends AbstractLogger
 {
+	const NAME = 'syslog';
+
 	const IDENT = 'Friendica';
 
 	/** @var int The default syslog flags */

src/Core/Logger/Util/Introspection.php

@@ -22,7 +22,7 @@
 namespace Friendica\Core\Logger\Util;
 
 use Friendica\App\Request;
-use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections;
+use Friendica\Core\Logger\Capability\IHaveCallIntrospections;
 
 /**
  * Get Introspection information about the current call

src/Core/Logger/Util/LoggerSettingsCheck.php

@@ -23,7 +23,7 @@ namespace Friendica\Core\Logger\Util;
 
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
-use Friendica\Core\Logger\Capabilities\ICheckLoggerSettings;
+use Friendica\Core\Logger\Capability\ICheckLoggerSettings;
 use Friendica\Core\Logger\Exception\LoggerUnusableException;
 
 /** {@inheritDoc} */

src/Core/PConfig/Factory/PConfig.php

@@ -22,28 +22,16 @@
 namespace Friendica\Core\PConfig\Factory;
 
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\Hooks\Capability\ICanCreateInstances;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
-use Friendica\Core\PConfig\Repository;
-use Friendica\Core\PConfig\Type;
-use Friendica\Core\PConfig\ValueObject;
 
 class PConfig
 {
-	/**
+	public function create(ICanCreateInstances $instanceCreator, IManageConfigValues $config): IManagePersonalConfigValues
-	 * @param IManageConfigValues $config       The config
-	 * @param ValueObject\Cache   $pConfigCache The personal config cache
-	 * @param Repository\PConfig  $configRepo   The configuration model
-	 *
-	 * @return IManagePersonalConfigValues
-	 */
-	public function create(IManageConfigValues $config, ValueObject\Cache $pConfigCache, Repository\PConfig $configRepo): IManagePersonalConfigValues
 	{
-		if ($config->get('system', 'config_adapter') === 'preload') {
+		$strategy = $config->get('system', 'config_adapter');
-			$configuration = new Type\PreloadPConfig($pConfigCache, $configRepo);
-		} else {
-			$configuration = new Type\JitPConfig($pConfigCache, $configRepo);
-		}
 
-		return $configuration;
+		/** @var IManagePersonalConfigValues */
+		return $instanceCreator->create(IManagePersonalConfigValues::class, $strategy);
 	}
 }

src/Core/PConfig/Type/AbstractPConfigValues.php

@@ -34,6 +34,8 @@ use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
  */
 abstract class AbstractPConfigValues implements IManagePersonalConfigValues
 {
+	const NAME = '';
+
 	/**
 	 * @var Cache
 	 */

src/Core/PConfig/Type/JitPConfig.php

@@ -33,6 +33,8 @@ use Friendica\Core\PConfig\ValueObject;
  */
 class JitPConfig extends AbstractPConfigValues
 {
+	const NAME = 'jit';
+
 	/**
 	 * @var array Array of already loaded db values (even if there was no value)
 	 */

src/Core/PConfig/Type/PreloadPConfig.php

@@ -32,6 +32,8 @@ use Friendica\Core\PConfig\ValueObject;
  */
 class PreloadPConfig extends AbstractPConfigValues
 {
+	const NAME = 'preload';
+
 	/** @var array */
 	private $config_loaded;
 

src/Core/Session/Factory/Session.php

@@ -22,8 +22,8 @@
 namespace Friendica\Core\Session\Factory;
 
 use Friendica\App;
-use Friendica\Core\Cache\Enum;
 use Friendica\Core\Cache\Factory\Cache;
+use Friendica\Core\Cache\Type\DatabaseCache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Core\Session\Type;
@@ -74,7 +74,7 @@ class Session
 						$cache = $cacheFactory->createDistributed();
 
 						// In case we're using the db as cache driver, use the native db session, not the cache
-						if ($config->get('system', 'cache_driver') === Enum\Type::DATABASE) {
+						if ($config->get('system', 'cache_driver') === DatabaseCache::NAME) {
 							$handler = new Handler\Database($dba, $logger, $server);
 						} else {
 							$handler = new Handler\Cache($cache, $logger);

src/DI.php

@@ -22,7 +22,7 @@
 namespace Friendica;
 
 use Dice\Dice;
-use Friendica\Core\Logger\Capabilities\ICheckLoggerSettings;
+use Friendica\Core\Logger\Capability\ICheckLoggerSettings;
 use Friendica\Core\Logger\Util\LoggerSettingsCheck;
 use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
@@ -210,9 +210,9 @@ abstract class DI
 		return self::$dice->create(Core\Config\Util\ConfigFileManager::class);
 	}
 
-	public static function keyValue(): Core\KeyValueStorage\Capabilities\IManageKeyValuePairs
+	public static function keyValue(): Core\KeyValueStorage\Capability\IManageKeyValuePairs
 	{
-		return self::$dice->create(Core\KeyValueStorage\Capabilities\IManageKeyValuePairs::class);
+		return self::$dice->create(Core\KeyValueStorage\Capability\IManageKeyValuePairs::class);
 	}
 
 	/**

src/Module/Friendica.php

@@ -26,7 +26,7 @@ use Friendica\BaseModule;
 use Friendica\Core\Addon;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Hook;
-use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs;
+use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;

src/Module/Statistics.php

@@ -25,7 +25,7 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Addon;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs;
+use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Network\HTTPException\NotFoundException;

static/dependencies.config.php

@@ -37,8 +37,8 @@ use Dice\Dice;
 use Friendica\App;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
-use Friendica\Core\Hooks\Capabilities\ICanCreateInstances;
+use Friendica\Core\Hooks\Capability\ICanCreateInstances;
-use Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies;
+use Friendica\Core\Hooks\Capability\ICanRegisterStrategies;
 use Friendica\Core\Hooks\Model\DiceInstanceManager;
 use Friendica\Core\PConfig;
 use Friendica\Core\L10n;
@@ -63,7 +63,7 @@ return [
 		// one instance for the whole execution
 		'shared' => true,
 	],
-	\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class => [
+	\Friendica\Core\Addon\Capability\ICanLoadAddons::class => [
 		'instanceOf' => \Friendica\Core\Addon\Model\AddonLoader::class,
 		'constructParams' => [
 			[Dice::INSTANCE => '$basepath'],
@@ -178,6 +178,20 @@ return [
 			$_SERVER,
 		],
 	],
+	'$hostname'                    => [
+		'instanceOf' => App\BaseURL::class,
+		'constructParams' => [
+			$_SERVER,
+		],
+		'call' => [
+			['getHost', [], Dice::CHAIN_CALL],
+		],
+	],
+	Cache\Type\AbstractCache::class => [
+		'constructParams' => [
+			[Dice::INSTANCE => '$hostname'],
+		],
+	],
 	App\Page::class => [
 		'constructParams' => [
 			[Dice::INSTANCE => '$basepath'],
@@ -201,10 +215,10 @@ return [
 			['create', [], Dice::CHAIN_CALL],
 		],
 	],
-	\Friendica\Core\Logger\Capabilities\IHaveCallIntrospections::class => [
+	\Friendica\Core\Logger\Capability\IHaveCallIntrospections::class => [
 		'instanceOf'      => \Friendica\Core\Logger\Util\Introspection::class,
 		'constructParams' => [
-			\Friendica\Core\Logger\Capabilities\IHaveCallIntrospections::IGNORE_CLASS_LIST,
+			\Friendica\Core\Logger\Capability\IHaveCallIntrospections::IGNORE_CLASS_LIST,
 		],
 	],
 	'$devLogger'                                                       => [
@@ -276,8 +290,11 @@ return [
 			['getBackend', [], Dice::CHAIN_CALL],
 		],
 	],
-	\Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs::class => [
+	\Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs::class => [
-		'instanceOf' => \Friendica\Core\KeyValueStorage\Type\DBKeyValueStorage::class,
+		'instanceOf' => \Friendica\Core\KeyValueStorage\Factory\KeyValueStorage::class,
+		'call' => [
+			['create', [], Dice::CHAIN_CALL],
+		],
 	],
 	Network\HTTPClient\Capability\ICanSendHttpRequests::class => [
 		'instanceOf' => Network\HTTPClient\Factory\HttpClient::class,

static/strategies.config.php

@@ -19,14 +19,31 @@
  *
  */
 
-use Friendica\Core\Hooks\Capabilities\BehavioralHookType as H;
+use Friendica\Core\Cache;
+use Friendica\Core\Hooks\Util\StrategiesFileManager;
 use Friendica\Core\Logger\Type;
+use Friendica\Core\KeyValueStorage;
+use Friendica\Core\PConfig;
 use Psr\Log;
 
 return [
 	Log\LoggerInterface::class => [
-		Log\NullLogger::class    => [''],
+		Log\NullLogger::class    => [StrategiesFileManager::STRATEGY_DEFAULT_KEY],
-		Type\SyslogLogger::class => ['syslog'],
+		Type\SyslogLogger::class => [Type\SyslogLogger::NAME],
-		Type\StreamLogger::class => ['stream'],
+		Type\StreamLogger::class => [Type\StreamLogger::NAME],
+	],
+	Cache\Capability\ICanCache::class => [
+		Cache\Type\DatabaseCache::class  => [Cache\Type\DatabaseCache::NAME, StrategiesFileManager::STRATEGY_DEFAULT_KEY],
+		Cache\Type\APCuCache::class      => [Cache\Type\APCuCache::NAME],
+		Cache\Type\MemcacheCache::class  => [Cache\Type\MemcacheCache::NAME],
+		Cache\Type\MemcachedCache::class => [Cache\Type\MemcachedCache::NAME],
+		Cache\Type\RedisCache::class     => [Cache\Type\RedisCache::NAME],
+	],
+	KeyValueStorage\Capability\IManageKeyValuePairs::class => [
+		KeyValueStorage\Type\DBKeyValueStorage::class => [KeyValueStorage\Type\DBKeyValueStorage::NAME, StrategiesFileManager::STRATEGY_DEFAULT_KEY],
+	],
+	PConfig\Capability\IManagePersonalConfigValues::class => [
+		PConfig\Type\JitPConfig::class     => [PConfig\Type\JitPConfig::NAME],
+		PConfig\Type\PreloadPConfig::class => [PConfig\Type\PreloadPConfig::NAME, StrategiesFileManager::STRATEGY_DEFAULT_KEY],
 	],
 ];

tests/phpunit-addons.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		bootstrap="bootstrap.php"
+		verbose="true"
+		timeoutForSmallTests="900"
+		timeoutForMediumTests="900"
+		timeoutForLargeTests="900"
+		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+	<testsuite name="friendica-addons">
+		<directory suffix=".php">../addon/*/tests/</directory>
+	</testsuite>
+	<!-- Filters for Code Coverage -->
+	<coverage>
+		<include>
+			<directory suffix=".php">../addon/</directory>
+		</include>
+		<exclude>
+			<directory suffix=".php">../addon/*/tests/</directory>
+			<directory suffix=".php">../addon/*/view/</directory>
+			<directory suffix=".php">../addon/*/vendor/</directory>
+		</exclude>
+	</coverage>
+</phpunit>

tests/src/Core/Addon/Model/AddonLoaderTest.php

@@ -54,7 +54,7 @@ class AddonLoaderTest extends MockedTest
 <?php
 
 return [
-	\Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [
+	\Friendica\Core\Hooks\Capability\BehavioralHookType::STRATEGY => [
 		\Psr\Log\LoggerInterface::class => [
 			\Psr\Log\NullLogger::class => [''],
 		],
@@ -79,7 +79,7 @@ EOF;
 					'addon/testaddon1/static/hooks.config.php' => $this->content,
 				],
 				'assertion' => [
-					\Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [
+					\Friendica\Core\Hooks\Capability\BehavioralHookType::STRATEGY => [
 						\Psr\Log\LoggerInterface::class => [
 							\Psr\Log\NullLogger::class => [''],
 						],
@@ -94,7 +94,7 @@ EOF;
 					'addon/testaddon2/static/hooks.config.php' => $this->content,
 				],
 				'assertion' => [
-					\Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [
+					\Friendica\Core\Hooks\Capability\BehavioralHookType::STRATEGY => [
 						\Psr\Log\LoggerInterface::class => [
 							\Psr\Log\NullLogger::class => ['', ''],
 						],
@@ -118,7 +118,7 @@ EOF;
 					'addon/testaddon2/static/hooks.config.php' => $this->content,
 				],
 				'assertion' => [
-					\Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [
+					\Friendica\Core\Hooks\Capability\BehavioralHookType::STRATEGY => [
 						\Psr\Log\LoggerInterface::class => [
 							\Psr\Log\NullLogger::class => [''],
 						],

tests/src/Core/Cache/CacheTest.php

@@ -23,6 +23,7 @@ namespace Friendica\Test\src\Core\Cache;
 
 use Friendica\Core\Cache\Capability\ICanCache;
 use Friendica\Core\Cache\Capability\ICanCacheInMemory;
+use Friendica\Core\Cache\Type\AbstractCache;
 use Friendica\Test\MockedTest;
 use Friendica\Util\PidFile;
 
@@ -246,4 +247,13 @@ abstract class CacheTest extends MockedTest
 		self::assertTrue($this->instance->set('key space', 'value'));
 		self::assertEquals('value', $this->instance->get('key space'));
 	}
+
+	public function testGetName()
+	{
+		if (defined(get_class($this->instance) . '::NAME')) {
+			self::assertEquals($this->instance::NAME, $this->instance->getName());
+		} else {
+			self::expectNotToPerformAssertions();
+		}
+	}
 }

tests/src/Core/Cache/DatabaseCacheTest.php

@@ -21,6 +21,7 @@
 
 namespace Friendica\Test\src\Core\Cache;
 
+use Friendica\App\BaseURL;
 use Friendica\Core\Cache;
 use Friendica\Test\DatabaseTestTrait;
 use Friendica\Test\Util\CreateDatabaseTrait;

tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php

@@ -21,8 +21,8 @@
 
 namespace Friendica\Test\src\Core\Hooks\Util;
 
-use Friendica\Core\Addon\Capabilities\ICanLoadAddons;
+use Friendica\Core\Addon\Capability\ICanLoadAddons;
-use Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies;
+use Friendica\Core\Hooks\Capability\ICanRegisterStrategies;
 use Friendica\Core\Hooks\Exceptions\HookConfigException;
 use Friendica\Core\Hooks\Util\StrategiesFileManager;
 use Friendica\Test\MockedTest;

tests/src/Core/KeyValueStorage/DBKeyValueStorageTest.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Test\src\Core\KeyValueStorage;
 
-use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs;
+use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
 use Friendica\Core\KeyValueStorage\Type\DBKeyValueStorage;
 use Friendica\Database\Database;
 use Friendica\Test\Util\CreateDatabaseTrait;

tests/src/Core/KeyValueStorage/KeyValueStorageTest.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Test\src\Core\KeyValueStorage;
 
-use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs;
+use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
 use Friendica\Test\MockedTest;
 
 abstract class KeyValueStorageTest extends MockedTest

tests/src/Core/Logger/SyslogLoggerWrapper.php

@@ -21,7 +21,7 @@
 
 namespace Friendica\Test\src\Core\Logger;
 
-use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections;
+use Friendica\Core\Logger\Capability\IHaveCallIntrospections;
 use Friendica\Core\Logger\Type\SyslogLogger;
 
 /**