From 68046573a4171dcbd5db75a991487bafa4b4370f Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 23 Oct 2021 10:49:27 +0200 Subject: [PATCH] Restructure Cache to follow new paradigm --- mod/ping.php | 2 +- src/App/Router.php | 2 +- src/Console/Cache.php | 2 +- src/Content/OEmbed.php | 2 +- src/Content/Widget.php | 2 +- src/Core/Cache/{ => Enum}/Duration.php | 2 +- src/Core/Cache/{ => Enum}/Type.php | 2 +- src/{ => Core/Cache}/Factory/CacheFactory.php | 24 +++++++++---------- src/Core/Cache/ICache.php | 2 ++ src/Core/Cache/IMemoryCache.php | 2 ++ src/Core/Cache/{ => Type}/APCuCache.php | 8 +++++-- src/Core/Cache/{ => Type}/ArrayCache.php | 7 ++++-- src/Core/{ => Cache/Type}/BaseCache.php | 2 +- src/Core/Cache/{ => Type}/DatabaseCache.php | 6 +++-- src/Core/Cache/{ => Type}/MemcacheCache.php | 9 +++++-- src/Core/Cache/{ => Type}/MemcachedCache.php | 9 +++++-- src/Core/Cache/{ => Type}/ProfilerCache.php | 6 +++-- src/Core/Cache/{ => Type}/RedisCache.php | 6 +++-- .../Cache/{ => Type}/TraitCompareDelete.php | 4 +++- src/Core/Cache/{ => Type}/TraitCompareSet.php | 4 +++- .../Cache/{ => Type}/TraitMemcacheCommand.php | 2 +- src/Core/Lock/CacheLock.php | 2 +- src/Core/Lock/DatabaseLock.php | 2 +- src/Core/Lock/ILock.php | 2 +- src/Core/Lock/SemaphoreLock.php | 2 +- src/Core/Lock/Type.php | 2 +- src/Core/Update.php | 4 ++-- src/Factory/LockFactory.php | 3 ++- src/Factory/SessionFactory.php | 2 +- src/Model/APContact.php | 2 +- src/Model/Photo.php | 2 +- src/Model/Profile.php | 2 +- src/Model/Tag.php | 2 +- src/Module/Search/Index.php | 2 +- src/Protocol/ActivityPub/Transmitter.php | 2 +- src/Protocol/Diaspora.php | 2 +- src/Protocol/Feed.php | 2 +- src/Protocol/OStatus.php | 2 +- src/Util/JsonLD.php | 2 +- src/Worker/SearchDirectory.php | 2 +- static/dependencies.config.php | 4 ++-- tests/src/Core/Cache/APCuCacheTest.php | 2 +- tests/src/Core/Cache/ArrayCacheTest.php | 2 +- tests/src/Core/Cache/DatabaseCacheTest.php | 2 +- tests/src/Core/Cache/MemcacheCacheTest.php | 2 +- tests/src/Core/Cache/MemcachedCacheTest.php | 2 +- tests/src/Core/Cache/RedisCacheTest.php | 4 ++-- tests/src/Core/Lock/APCuCacheLockTest.php | 2 +- tests/src/Core/Lock/ArrayCacheLockTest.php | 2 +- tests/src/Core/Lock/MemcacheCacheLockTest.php | 2 +- .../src/Core/Lock/MemcachedCacheLockTest.php | 2 +- tests/src/Core/Lock/RedisCacheLockTest.php | 2 +- 52 files changed, 103 insertions(+), 71 deletions(-) rename src/Core/Cache/{ => Enum}/Duration.php (96%) rename src/Core/Cache/{ => Enum}/Type.php (96%) rename src/{ => Core/Cache}/Factory/CacheFactory.php (80%) rename src/Core/Cache/{ => Type}/APCuCache.php (93%) rename src/Core/Cache/{ => Type}/ArrayCache.php (92%) rename src/Core/{ => Cache/Type}/BaseCache.php (98%) rename src/Core/Cache/{ => Type}/DatabaseCache.php (95%) rename src/Core/Cache/{ => Type}/MemcacheCache.php (92%) rename src/Core/Cache/{ => Type}/MemcachedCache.php (92%) rename src/Core/Cache/{ => Type}/ProfilerCache.php (95%) rename src/Core/Cache/{ => Type}/RedisCache.php (97%) rename src/Core/Cache/{ => Type}/TraitCompareDelete.php (95%) rename src/Core/Cache/{ => Type}/TraitCompareSet.php (96%) rename src/Core/Cache/{ => Type}/TraitMemcacheCommand.php (98%) diff --git a/mod/ping.php b/mod/ping.php index 2143f73af2..c12594902a 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -22,7 +22,7 @@ use Friendica\App; use Friendica\Content\ForumManager; use Friendica\Content\Text\BBCode; -use Friendica\Core\Cache\Duration; +use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Hook; use Friendica\Database\DBA; use Friendica\DI; diff --git a/src/App/Router.php b/src/App/Router.php index ad4b33d084..5076839530 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -26,7 +26,7 @@ use FastRoute\DataGenerator\GroupCountBased; use FastRoute\Dispatcher; use FastRoute\RouteCollector; use FastRoute\RouteParser\Std; -use Friendica\Core\Cache\Duration; +use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Cache\ICache; use Friendica\Core\Hook; use Friendica\Core\L10n; diff --git a/src/Console/Cache.php b/src/Console/Cache.php index 049ffd0ffb..a9452435eb 100644 --- a/src/Console/Cache.php +++ b/src/Console/Cache.php @@ -23,7 +23,7 @@ namespace Friendica\Console; use Asika\SimpleConsole\CommandArgsException; use Friendica\App; -use Friendica\Core\Cache\Duration; +use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Cache\ICache; use RuntimeException; diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php index 313a2628db..14e910ebab 100644 --- a/src/Content/OEmbed.php +++ b/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; diff --git a/src/Content/Widget.php b/src/Content/Widget.php index daa34a8b00..4a3e918674 100644 --- a/src/Content/Widget.php +++ b/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; diff --git a/src/Core/Cache/Duration.php b/src/Core/Cache/Enum/Duration.php similarity index 96% rename from src/Core/Cache/Duration.php rename to src/Core/Cache/Enum/Duration.php index fcbaadda7a..c5771c7803 100644 --- a/src/Core/Cache/Duration.php +++ b/src/Core/Cache/Enum/Duration.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Core\Cache; +namespace Friendica\Core\Cache\Enum; /** * Enumeration for cache durations diff --git a/src/Core/Cache/Type.php b/src/Core/Cache/Enum/Type.php similarity index 96% rename from src/Core/Cache/Type.php rename to src/Core/Cache/Enum/Type.php index 5153acaf8d..9bdfed5953 100644 --- a/src/Core/Cache/Type.php +++ b/src/Core/Cache/Enum/Type.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Core\Cache; +namespace Friendica\Core\Cache\Enum; /** * Enumeration for cache types diff --git a/src/Factory/CacheFactory.php b/src/Core/Cache/Factory/CacheFactory.php similarity index 80% rename from src/Factory/CacheFactory.php rename to src/Core/Cache/Factory/CacheFactory.php index 1e93b5ee07..2e99180ecc 100644 --- a/src/Factory/CacheFactory.php +++ b/src/Core/Cache/Factory/CacheFactory.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Factory; +namespace Friendica\Core\Cache\Factory; use Friendica\App\BaseURL; use Friendica\Core\Cache; @@ -41,7 +41,7 @@ class CacheFactory /** * @var string The default cache if nothing set */ - const DEFAULT_TYPE = Cache\Type::DATABASE; + const DEFAULT_TYPE = Cache\Enum\Type::DATABASE; /** * @var IConfig The IConfiguration to read parameters out of the config @@ -92,27 +92,27 @@ class CacheFactory } switch ($type) { - case Cache\Type::MEMCACHE: - $cache = new Cache\MemcacheCache($this->hostname, $this->config); + case Cache\Enum\Type::MEMCACHE: + $cache = new Cache\Type\MemcacheCache($this->hostname, $this->config); break; - case Cache\Type::MEMCACHED: - $cache = new Cache\MemcachedCache($this->hostname, $this->config, $this->logger); + case Cache\Enum\Type::MEMCACHED: + $cache = new Cache\Type\MemcachedCache($this->hostname, $this->config, $this->logger); break; - case Cache\Type::REDIS: - $cache = new Cache\RedisCache($this->hostname, $this->config); + case Cache\Enum\Type::REDIS: + $cache = new Cache\Type\RedisCache($this->hostname, $this->config); break; - case Cache\Type::APCU: - $cache = new Cache\APCuCache($this->hostname); + case Cache\Enum\Type::APCU: + $cache = new Cache\Type\APCuCache($this->hostname); break; default: - $cache = new Cache\DatabaseCache($this->hostname, $this->dba); + $cache = new Cache\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 Cache\Type\ProfilerCache($cache, $this->profiler); } else { return $cache; } diff --git a/src/Core/Cache/ICache.php b/src/Core/Cache/ICache.php index 0589f4506b..3918b00893 100644 --- a/src/Core/Cache/ICache.php +++ b/src/Core/Cache/ICache.php @@ -21,6 +21,8 @@ namespace Friendica\Core\Cache; +use Friendica\Core\Cache\Enum\Duration; + /** * Cache Interface */ diff --git a/src/Core/Cache/IMemoryCache.php b/src/Core/Cache/IMemoryCache.php index 248908d801..a46db0b011 100644 --- a/src/Core/Cache/IMemoryCache.php +++ b/src/Core/Cache/IMemoryCache.php @@ -21,6 +21,8 @@ namespace Friendica\Core\Cache; +use Friendica\Core\Cache\Enum\Duration; + /** * This interface defines methods for Memory-Caches only */ diff --git a/src/Core/Cache/APCuCache.php b/src/Core/Cache/Type/APCuCache.php similarity index 93% rename from src/Core/Cache/APCuCache.php rename to src/Core/Cache/Type/APCuCache.php index 7d819b4e8d..b473f68030 100644 --- a/src/Core/Cache/APCuCache.php +++ b/src/Core/Cache/Type/APCuCache.php @@ -19,10 +19,14 @@ * */ -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\IMemoryCache; +use Friendica\Core\Cache\Type\TraitCompareDelete; +use Friendica\Core\Cache\Type\TraitCompareSet; +use Friendica\Core\Cache\Enum\Type; /** * APCu Cache. diff --git a/src/Core/Cache/ArrayCache.php b/src/Core/Cache/Type/ArrayCache.php similarity index 92% rename from src/Core/Cache/ArrayCache.php rename to src/Core/Cache/Type/ArrayCache.php index 5970500896..dd0985a978 100644 --- a/src/Core/Cache/ArrayCache.php +++ b/src/Core/Cache/Type/ArrayCache.php @@ -19,9 +19,12 @@ * */ -namespace Friendica\Core\Cache; +namespace Friendica\Core\Cache\Type; -use Friendica\Core\BaseCache; +use Friendica\Core\Cache\Enum\Duration; +use Friendica\Core\Cache\IMemoryCache; +use Friendica\Core\Cache\Type\TraitCompareDelete; +use Friendica\Core\Cache\Enum\Type; /** * Implementation of the IMemoryCache mainly for testing purpose diff --git a/src/Core/BaseCache.php b/src/Core/Cache/Type/BaseCache.php similarity index 98% rename from src/Core/BaseCache.php rename to src/Core/Cache/Type/BaseCache.php index c6c6b60a64..a52f1e9cef 100644 --- a/src/Core/BaseCache.php +++ b/src/Core/Cache/Type/BaseCache.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Core; +namespace Friendica\Core\Cache\Type; use Friendica\Core\Cache\ICache; diff --git a/src/Core/Cache/DatabaseCache.php b/src/Core/Cache/Type/DatabaseCache.php similarity index 95% rename from src/Core/Cache/DatabaseCache.php rename to src/Core/Cache/Type/DatabaseCache.php index 8dcfae8aff..a3c83c8dfe 100644 --- a/src/Core/Cache/DatabaseCache.php +++ b/src/Core/Cache/Type/DatabaseCache.php @@ -19,11 +19,13 @@ * */ -namespace Friendica\Core\Cache; +namespace Friendica\Core\Cache\Type; +use Friendica\Core\Cache\Enum\Duration; +use Friendica\Core\Cache\ICache; +use Friendica\Core\Cache\Enum\Type; use Friendica\Database\Database; use Friendica\Util\DateTimeFormat; -use Friendica\Core\BaseCache; /** * Database Cache diff --git a/src/Core/Cache/MemcacheCache.php b/src/Core/Cache/Type/MemcacheCache.php similarity index 92% rename from src/Core/Cache/MemcacheCache.php rename to src/Core/Cache/Type/MemcacheCache.php index ac826eaa26..f991517fcc 100644 --- a/src/Core/Cache/MemcacheCache.php +++ b/src/Core/Cache/Type/MemcacheCache.php @@ -19,10 +19,15 @@ * */ -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\IMemoryCache; +use Friendica\Core\Cache\Type\TraitCompareDelete; +use Friendica\Core\Cache\Type\TraitCompareSet; +use Friendica\Core\Cache\Type\TraitMemcacheCommand; +use Friendica\Core\Cache\Enum\Type; use Friendica\Core\Config\IConfig; use Memcache; diff --git a/src/Core/Cache/MemcachedCache.php b/src/Core/Cache/Type/MemcachedCache.php similarity index 92% rename from src/Core/Cache/MemcachedCache.php rename to src/Core/Cache/Type/MemcachedCache.php index 5ce64e9995..ded53ee977 100644 --- a/src/Core/Cache/MemcachedCache.php +++ b/src/Core/Cache/Type/MemcachedCache.php @@ -19,10 +19,15 @@ * */ -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\IMemoryCache; +use Friendica\Core\Cache\Type\TraitCompareDelete; +use Friendica\Core\Cache\Type\TraitCompareSet; +use Friendica\Core\Cache\Type\TraitMemcacheCommand; +use Friendica\Core\Cache\Enum\Type; use Friendica\Core\Config\IConfig; use Memcached; use Psr\Log\LoggerInterface; diff --git a/src/Core/Cache/ProfilerCache.php b/src/Core/Cache/Type/ProfilerCache.php similarity index 95% rename from src/Core/Cache/ProfilerCache.php rename to src/Core/Cache/Type/ProfilerCache.php index a8c9f15113..fd003857cd 100644 --- a/src/Core/Cache/ProfilerCache.php +++ b/src/Core/Cache/Type/ProfilerCache.php @@ -19,9 +19,11 @@ * */ -namespace Friendica\Core\Cache; +namespace Friendica\Core\Cache\Type; -use Friendica\Core\System; +use Friendica\Core\Cache\Enum\Duration; +use Friendica\Core\Cache\ICache; +use Friendica\Core\Cache\IMemoryCache; use Friendica\Util\Profiler; /** diff --git a/src/Core/Cache/RedisCache.php b/src/Core/Cache/Type/RedisCache.php similarity index 97% rename from src/Core/Cache/RedisCache.php rename to src/Core/Cache/Type/RedisCache.php index ce081d7ef7..a4cc419727 100644 --- a/src/Core/Cache/RedisCache.php +++ b/src/Core/Cache/Type/RedisCache.php @@ -19,10 +19,12 @@ * */ -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\IMemoryCache; +use Friendica\Core\Cache\Enum\Type; use Friendica\Core\Config\IConfig; use Redis; diff --git a/src/Core/Cache/TraitCompareDelete.php b/src/Core/Cache/Type/TraitCompareDelete.php similarity index 95% rename from src/Core/Cache/TraitCompareDelete.php rename to src/Core/Cache/Type/TraitCompareDelete.php index 31c3e7cf08..4873638927 100644 --- a/src/Core/Cache/TraitCompareDelete.php +++ b/src/Core/Cache/Type/TraitCompareDelete.php @@ -19,7 +19,9 @@ * */ -namespace Friendica\Core\Cache; +namespace Friendica\Core\Cache\Type; + +use Friendica\Core\Cache\Enum\Duration; /** * Trait TraitCompareSetDelete diff --git a/src/Core/Cache/TraitCompareSet.php b/src/Core/Cache/Type/TraitCompareSet.php similarity index 96% rename from src/Core/Cache/TraitCompareSet.php rename to src/Core/Cache/Type/TraitCompareSet.php index fa20bd9e58..86aef92903 100644 --- a/src/Core/Cache/TraitCompareSet.php +++ b/src/Core/Cache/Type/TraitCompareSet.php @@ -19,7 +19,9 @@ * */ -namespace Friendica\Core\Cache; +namespace Friendica\Core\Cache\Type; + +use Friendica\Core\Cache\Enum\Duration; /** * Trait TraitCompareSetDelete diff --git a/src/Core/Cache/TraitMemcacheCommand.php b/src/Core/Cache/Type/TraitMemcacheCommand.php similarity index 98% rename from src/Core/Cache/TraitMemcacheCommand.php rename to src/Core/Cache/Type/TraitMemcacheCommand.php index abc41ceeae..73495e2de6 100644 --- a/src/Core/Cache/TraitMemcacheCommand.php +++ b/src/Core/Cache/Type/TraitMemcacheCommand.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Core\Cache; +namespace Friendica\Core\Cache\Type; use Friendica\Network\HTTPException\InternalServerErrorException; diff --git a/src/Core/Lock/CacheLock.php b/src/Core/Lock/CacheLock.php index 31c7d1ee12..20705e06e9 100644 --- a/src/Core/Lock/CacheLock.php +++ b/src/Core/Lock/CacheLock.php @@ -22,7 +22,7 @@ namespace Friendica\Core\Lock; use Friendica\Core\BaseLock; -use Friendica\Core\Cache\Duration; +use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Cache\IMemoryCache; class CacheLock extends BaseLock diff --git a/src/Core/Lock/DatabaseLock.php b/src/Core/Lock/DatabaseLock.php index 688a00dac7..14e78f625a 100644 --- a/src/Core/Lock/DatabaseLock.php +++ b/src/Core/Lock/DatabaseLock.php @@ -22,7 +22,7 @@ namespace Friendica\Core\Lock; use Friendica\Core\BaseLock; -use Friendica\Core\Cache\Duration; +use Friendica\Core\Cache\Enum\Duration; use Friendica\Database\Database; use Friendica\Util\DateTimeFormat; diff --git a/src/Core/Lock/ILock.php b/src/Core/Lock/ILock.php index 7369e5b5aa..35e21305ee 100644 --- a/src/Core/Lock/ILock.php +++ b/src/Core/Lock/ILock.php @@ -21,7 +21,7 @@ namespace Friendica\Core\Lock; -use Friendica\Core\Cache\Duration; +use Friendica\Core\Cache\Enum\Duration; /** * Lock Interface diff --git a/src/Core/Lock/SemaphoreLock.php b/src/Core/Lock/SemaphoreLock.php index 219a4d738b..fa5cf5e876 100644 --- a/src/Core/Lock/SemaphoreLock.php +++ b/src/Core/Lock/SemaphoreLock.php @@ -22,7 +22,7 @@ namespace Friendica\Core\Lock; use Friendica\Core\BaseLock; -use Friendica\Core\Cache\Duration; +use Friendica\Core\Cache\Enum\Duration; class SemaphoreLock extends BaseLock { diff --git a/src/Core/Lock/Type.php b/src/Core/Lock/Type.php index 259b7d0ce2..769bad12eb 100644 --- a/src/Core/Lock/Type.php +++ b/src/Core/Lock/Type.php @@ -21,7 +21,7 @@ namespace Friendica\Core\Lock; -use Friendica\Core\Cache\Type as CacheType; +use Friendica\Core\Cache\Enum\Type as CacheType; /** * Enumeration for lock types diff --git a/src/Core/Update.php b/src/Core/Update.php index fa3c6b62d0..f3ea743117 100644 --- a/src/Core/Update.php +++ b/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]); diff --git a/src/Factory/LockFactory.php b/src/Factory/LockFactory.php index 0ac7525035..2a54910d45 100644 --- a/src/Factory/LockFactory.php +++ b/src/Factory/LockFactory.php @@ -21,8 +21,9 @@ namespace Friendica\Factory; +use Friendica\Core\Cache\Factory\CacheFactory; use Friendica\Core\Cache\IMemoryCache; -use Friendica\Core\Cache\Type; +use Friendica\Core\Cache\Enum\Type; use Friendica\Core\Config\IConfig; use Friendica\Core\Lock; use Friendica\Database\Database; diff --git a/src/Factory/SessionFactory.php b/src/Factory/SessionFactory.php index 491573033b..82161fb554 100644 --- a/src/Factory/SessionFactory.php +++ b/src/Factory/SessionFactory.php @@ -23,7 +23,7 @@ namespace Friendica\Factory; use Friendica\App; use Friendica\Core\Cache\ICache; -use Friendica\Core\Cache\Type; +use Friendica\Core\Cache\Enum\Type; use Friendica\Core\Config\IConfig; use Friendica\Core\Session; use Friendica\Core\System; diff --git a/src/Model/APContact.php b/src/Model/APContact.php index a919a67f30..5e992075e8 100644 --- a/src/Model/APContact.php +++ b/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; diff --git a/src/Model/Photo.php b/src/Model/Photo.php index e72004029f..ebd278753b 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -21,7 +21,7 @@ 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; diff --git a/src/Model/Profile.php b/src/Model/Profile.php index d089ada3cd..bcd7d54973 100644 --- a/src/Model/Profile.php +++ b/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; diff --git a/src/Model/Tag.php b/src/Model/Tag.php index ab7845c2c6..fb301d1436 100644 --- a/src/Model/Tag.php +++ b/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; diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php index 7be5058c2b..39bf940972 100644 --- a/src/Module/Search/Index.php +++ b/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; diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index 5e6f772472..238aa3c16f 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/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; diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 84f0c6de82..02d6d270a6 100644 --- a/src/Protocol/Diaspora.php +++ b/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; diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php index cdecbcf1b0..a9e50d532c 100644 --- a/src/Protocol/Feed.php +++ b/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; diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index c40193e1b0..46f68086b1 100644 --- a/src/Protocol/OStatus.php +++ b/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; diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php index 6ffe9a0a0f..e8c4751c43 100644 --- a/src/Util/JsonLD.php +++ b/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; diff --git a/src/Worker/SearchDirectory.php b/src/Worker/SearchDirectory.php index bb69969b9e..5e1b1590fd 100644 --- a/src/Worker/SearchDirectory.php +++ b/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; diff --git a/static/dependencies.config.php b/static/dependencies.config.php index bf7b412c2f..39aae97fd1 100644 --- a/static/dependencies.config.php +++ b/static/dependencies.config.php @@ -158,13 +158,13 @@ return [ ] ], Cache\ICache::class => [ - 'instanceOf' => Factory\CacheFactory::class, + 'instanceOf' => Cache\Factory\CacheFactory::class, 'call' => [ ['create', [], Dice::CHAIN_CALL], ], ], Cache\IMemoryCache::class => [ - 'instanceOf' => Factory\CacheFactory::class, + 'instanceOf' => Cache\Factory\CacheFactory::class, 'call' => [ ['create', [], Dice::CHAIN_CALL], ], diff --git a/tests/src/Core/Cache/APCuCacheTest.php b/tests/src/Core/Cache/APCuCacheTest.php index d8fe59da03..2f957a5d5b 100644 --- a/tests/src/Core/Cache/APCuCacheTest.php +++ b/tests/src/Core/Cache/APCuCacheTest.php @@ -21,7 +21,7 @@ namespace Friendica\Test\src\Core\Cache; -use Friendica\Core\Cache\APCuCache; +use Friendica\Core\Cache\Type\APCuCache; /** * @group APCU diff --git a/tests/src/Core/Cache/ArrayCacheTest.php b/tests/src/Core/Cache/ArrayCacheTest.php index c2e92806ce..3623fe0c18 100644 --- a/tests/src/Core/Cache/ArrayCacheTest.php +++ b/tests/src/Core/Cache/ArrayCacheTest.php @@ -21,7 +21,7 @@ namespace Friendica\Test\src\Core\Cache; -use Friendica\Core\Cache\ArrayCache; +use Friendica\Core\Cache\Type\ArrayCache; class ArrayCacheTest extends MemoryCacheTest { diff --git a/tests/src/Core/Cache/DatabaseCacheTest.php b/tests/src/Core/Cache/DatabaseCacheTest.php index 37859ef785..8d404b3552 100644 --- a/tests/src/Core/Cache/DatabaseCacheTest.php +++ b/tests/src/Core/Cache/DatabaseCacheTest.php @@ -60,7 +60,7 @@ class DatabaseCacheTest extends CacheTest $dba = new StaticDatabase($configCache, $profiler, $logger); - $this->cache = new Cache\DatabaseCache('database', $dba); + $this->cache = new Cache\Type\DatabaseCache('database', $dba); return $this->cache; } diff --git a/tests/src/Core/Cache/MemcacheCacheTest.php b/tests/src/Core/Cache/MemcacheCacheTest.php index 4947186ccb..6916f51695 100644 --- a/tests/src/Core/Cache/MemcacheCacheTest.php +++ b/tests/src/Core/Cache/MemcacheCacheTest.php @@ -22,7 +22,7 @@ namespace Friendica\Test\src\Core\Cache; use Exception; -use Friendica\Core\Cache\MemcacheCache; +use Friendica\Core\Cache\Type\MemcacheCache; use Friendica\Core\Config\IConfig; use Mockery; diff --git a/tests/src/Core/Cache/MemcachedCacheTest.php b/tests/src/Core/Cache/MemcachedCacheTest.php index 842e33d082..cc912e364d 100644 --- a/tests/src/Core/Cache/MemcachedCacheTest.php +++ b/tests/src/Core/Cache/MemcachedCacheTest.php @@ -22,7 +22,7 @@ namespace Friendica\Test\src\Core\Cache; use Exception; -use Friendica\Core\Cache\MemcachedCache; +use Friendica\Core\Cache\Type\MemcachedCache; use Friendica\Core\Config\IConfig; use Mockery; use Psr\Log\NullLogger; diff --git a/tests/src/Core/Cache/RedisCacheTest.php b/tests/src/Core/Cache/RedisCacheTest.php index 146dca6d9f..f5c540d32d 100644 --- a/tests/src/Core/Cache/RedisCacheTest.php +++ b/tests/src/Core/Cache/RedisCacheTest.php @@ -22,7 +22,7 @@ namespace Friendica\Test\src\Core\Cache; use Exception; -use Friendica\Core\Cache\RedisCache; +use Friendica\Core\Cache\Type\RedisCache; use Friendica\Core\Config\IConfig; use Mockery; @@ -58,7 +58,7 @@ class RedisCacheTest extends MemoryCacheTest ->andReturn(null); try { - $this->cache = new RedisCache($host, $configMock); + $this->cache = new \Friendica\Core\Cache\Type\RedisCache($host, $configMock); } catch (Exception $e) { static::markTestSkipped('Redis is not available. Failure: ' . $e->getMessage()); } diff --git a/tests/src/Core/Lock/APCuCacheLockTest.php b/tests/src/Core/Lock/APCuCacheLockTest.php index 9f893ab324..750748975a 100644 --- a/tests/src/Core/Lock/APCuCacheLockTest.php +++ b/tests/src/Core/Lock/APCuCacheLockTest.php @@ -21,7 +21,7 @@ namespace Friendica\Test\src\Core\Lock; -use Friendica\Core\Cache\APCuCache; +use Friendica\Core\Cache\Type\APCuCache; use Friendica\Core\Lock\CacheLock; /** diff --git a/tests/src/Core/Lock/ArrayCacheLockTest.php b/tests/src/Core/Lock/ArrayCacheLockTest.php index 11ea794c68..93c2c20526 100644 --- a/tests/src/Core/Lock/ArrayCacheLockTest.php +++ b/tests/src/Core/Lock/ArrayCacheLockTest.php @@ -21,7 +21,7 @@ namespace Friendica\Test\src\Core\Lock; -use Friendica\Core\Cache\ArrayCache; +use Friendica\Core\Cache\Type\ArrayCache; use Friendica\Core\Lock\CacheLock; class ArrayCacheLockTest extends LockTest diff --git a/tests/src/Core/Lock/MemcacheCacheLockTest.php b/tests/src/Core/Lock/MemcacheCacheLockTest.php index 98266852f9..efb27dcaba 100644 --- a/tests/src/Core/Lock/MemcacheCacheLockTest.php +++ b/tests/src/Core/Lock/MemcacheCacheLockTest.php @@ -22,7 +22,7 @@ namespace Friendica\Test\src\Core\Lock; use Exception; -use Friendica\Core\Cache\MemcacheCache; +use Friendica\Core\Cache\Type\MemcacheCache; use Friendica\Core\Config\IConfig; use Friendica\Core\Lock\CacheLock; use Mockery; diff --git a/tests/src/Core/Lock/MemcachedCacheLockTest.php b/tests/src/Core/Lock/MemcachedCacheLockTest.php index 67d3097fab..f729364847 100644 --- a/tests/src/Core/Lock/MemcachedCacheLockTest.php +++ b/tests/src/Core/Lock/MemcachedCacheLockTest.php @@ -22,7 +22,7 @@ namespace Friendica\Test\src\Core\Lock; use Exception; -use Friendica\Core\Cache\MemcachedCache; +use Friendica\Core\Cache\Type\MemcachedCache; use Friendica\Core\Config\IConfig; use Friendica\Core\Lock\CacheLock; use Mockery; diff --git a/tests/src/Core/Lock/RedisCacheLockTest.php b/tests/src/Core/Lock/RedisCacheLockTest.php index 360fa74fb2..6fdbd1eeb9 100644 --- a/tests/src/Core/Lock/RedisCacheLockTest.php +++ b/tests/src/Core/Lock/RedisCacheLockTest.php @@ -22,7 +22,7 @@ namespace Friendica\Test\src\Core\Lock; use Exception; -use Friendica\Core\Cache\RedisCache; +use Friendica\Core\Cache\Type\RedisCache; use Friendica\Core\Config\IConfig; use Friendica\Core\Lock\CacheLock; use Mockery;