From 86bf2ee45a7c7409dbc470b5b1706b19e7e40507 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 4 Aug 2019 10:26:53 +0200 Subject: [PATCH] Rename *CacheDriver to *Cache because they don't act as driver anymore --- src/Console/Cache.php | 8 +-- src/Core/Cache.php | 50 +++++++++---------- src/Core/Cache/APCuCache.php | 4 +- ...tractCacheDriver.php => AbstractCache.php} | 4 +- src/Core/Cache/ArrayCache.php | 4 +- ...abaseCacheDriver.php => DatabaseCache.php} | 4 +- .../Cache/{ICacheDriver.php => ICache.php} | 4 +- ...MemoryCacheDriver.php => IMemoryCache.php} | 8 +-- ...cacheCacheDriver.php => MemcacheCache.php} | 4 +- ...chedCacheDriver.php => MemcachedCache.php} | 4 +- src/Core/Cache/ProfilerCache.php | 12 ++--- .../{RedisCacheDriver.php => RedisCache.php} | 4 +- src/Core/Lock.php | 12 ++--- ...bstractLockDriver.php => AbstractLock.php} | 4 +- src/Core/Lock/CacheLockDriver.php | 10 ++-- ...atabaseLockDriver.php => DatabaseLock.php} | 2 +- src/Core/Lock/{ILockDriver.php => ILock.php} | 6 +-- ...aphoreLockDriver.php => SemaphoreLock.php} | 2 +- src/Factory/CacheDriverFactory.php | 12 ++--- src/Factory/LockDriverFactory.php | 22 ++++---- static/dependencies.config.php | 18 +++---- tests/Util/DbaLockMockTrait.php | 24 ++++++--- ...uCacheDriverTest.php => APCuCacheTest.php} | 2 +- ...CacheDriverTest.php => ArrayCacheTest.php} | 2 +- tests/src/Core/Cache/CacheTest.php | 8 +-- ...heDriverTest.php => DatabaseCacheTest.php} | 4 +- ...heDriverTest.php => MemcacheCacheTest.php} | 6 +-- ...eDriverTest.php => MemcachedCacheTest.php} | 6 +-- tests/src/Core/Cache/MemoryCacheTest.php | 6 +-- ...CacheDriverTest.php => RedisCacheTest.php} | 6 +-- ...ckDriverTest.php => APCuCacheLockTest.php} | 2 +- ...kDriverTest.php => ArrayCacheLockTest.php} | 2 +- ...ockDriverTest.php => DatabaseLockTest.php} | 4 +- tests/src/Core/Lock/LockTest.php | 2 +- ...iverTest.php => MemcacheCacheLockTest.php} | 6 +-- ...verTest.php => MemcachedCacheLockTest.php} | 6 +-- ...kDriverTest.php => RedisCacheLockTest.php} | 6 +-- ...ckDriverTest.php => SemaphoreLockTest.php} | 6 +-- 38 files changed, 152 insertions(+), 144 deletions(-) rename src/Core/Cache/{AbstractCacheDriver.php => AbstractCache.php} (95%) rename src/Core/Cache/{DatabaseCacheDriver.php => DatabaseCache.php} (95%) rename src/Core/Cache/{ICacheDriver.php => ICache.php} (96%) rename src/Core/Cache/{IMemoryCacheDriver.php => IMemoryCache.php} (85%) rename src/Core/Cache/{MemcacheCacheDriver.php => MemcacheCache.php} (96%) rename src/Core/Cache/{MemcachedCacheDriver.php => MemcachedCache.php} (96%) rename src/Core/Cache/{RedisCacheDriver.php => RedisCache.php} (96%) rename src/Core/Lock/{AbstractLockDriver.php => AbstractLock.php} (93%) rename src/Core/Lock/{DatabaseLockDriver.php => DatabaseLock.php} (97%) rename src/Core/Lock/{ILockDriver.php => ILock.php} (93%) rename src/Core/Lock/{SemaphoreLockDriver.php => SemaphoreLock.php} (95%) rename tests/src/Core/Cache/{APCuCacheDriverTest.php => APCuCacheTest.php} (89%) rename tests/src/Core/Cache/{ArrayCacheDriverTest.php => ArrayCacheTest.php} (87%) rename tests/src/Core/Cache/{DatabaseCacheDriverTest.php => DatabaseCacheTest.php} (90%) rename tests/src/Core/Cache/{MemcacheCacheDriverTest.php => MemcacheCacheTest.php} (76%) rename tests/src/Core/Cache/{MemcachedCacheDriverTest.php => MemcachedCacheTest.php} (74%) rename tests/src/Core/Cache/{RedisCacheDriverTest.php => RedisCacheTest.php} (82%) rename tests/src/Core/Lock/{APCuCacheLockDriverTest.php => APCuCacheLockTest.php} (88%) rename tests/src/Core/Lock/{ArrayCacheLockDriverTest.php => ArrayCacheLockTest.php} (86%) rename tests/src/Core/Lock/{DatabaseLockDriverTest.php => DatabaseLockTest.php} (91%) rename tests/src/Core/Lock/{MemcacheCacheLockDriverTest.php => MemcacheCacheLockTest.php} (72%) rename tests/src/Core/Lock/{MemcachedCacheLockDriverTest.php => MemcachedCacheLockTest.php} (70%) rename tests/src/Core/Lock/{RedisCacheLockDriverTest.php => RedisCacheLockTest.php} (79%) rename tests/src/Core/Lock/{SemaphoreLockDriverTest.php => SemaphoreLockTest.php} (88%) diff --git a/src/Console/Cache.php b/src/Console/Cache.php index 7596ae6d51..5f508da7a8 100644 --- a/src/Console/Cache.php +++ b/src/Console/Cache.php @@ -4,7 +4,7 @@ namespace Friendica\Console; use Asika\SimpleConsole\CommandArgsException; use Friendica\App; -use Friendica\Core\Cache\ICacheDriver; +use Friendica\Core\Cache\ICache; use Friendica\Core\Config\Configuration; use Friendica\Factory\CacheDriverFactory; use RuntimeException; @@ -33,7 +33,7 @@ class Cache extends \Asika\SimpleConsole\Console private $cacheDriverName; /** - * @var ICacheDriver + * @var ICache */ private $cache; @@ -71,7 +71,7 @@ HELP; return $help; } - public function __construct(App\Mode $appMode, Configuration $config, ICacheDriver $cache, array $argv = null) + public function __construct(App\Mode $appMode, Configuration $config, ICache $cache, array $argv = null) { parent::__construct($argv); @@ -161,7 +161,7 @@ HELP; if (count($this->args) >= 3) { $key = $this->getArgument(1); $value = $this->getArgument(2); - $duration = intval($this->getArgument(3, ICacheDriver::FIVE_MINUTES)); + $duration = intval($this->getArgument(3, ICache::FIVE_MINUTES)); if (is_array($this->cache->get($key))) { throw new RuntimeException("$key is an array and can't be set using this command."); diff --git a/src/Core/Cache.php b/src/Core/Cache.php index 0c5597aa5e..e469dcba10 100644 --- a/src/Core/Cache.php +++ b/src/Core/Cache.php @@ -5,31 +5,31 @@ namespace Friendica\Core; use Friendica\BaseObject; -use Friendica\Core\Cache\ICacheDriver; +use Friendica\Core\Cache\ICache; /** * @brief Class for storing data for a short time */ class Cache extends BaseObject { - /** @deprecated Use ICacheDriver::MONTH */ - const MONTH = ICacheDriver::MONTH; - /** @deprecated Use ICacheDriver::WEEK */ - const WEEK = 604800; - /** @deprecated Use ICacheDriver::DAY */ - const DAY = 86400; - /** @deprecated Use ICacheDriver::HOUR */ - const HOUR = 3600; - /** @deprecated Use ICacheDriver::HALF_HOUR */ - const HALF_HOUR = 1800; - /** @deprecated Use ICacheDriver::QUARTER_HOUR */ - const QUARTER_HOUR = 900; - /** @deprecated Use ICacheDriver::FIVE_MINUTES */ - const FIVE_MINUTES = 300; - /** @deprecated Use ICacheDriver::MINUTE */ - const MINUTE = 60; - /** @deprecated Use ICacheDriver::INFINITE */ - const INFINITE = 0; + /** @deprecated Use ICache::MONTH */ + const MONTH = ICache::MONTH; + /** @deprecated Use ICache::WEEK */ + const WEEK = ICache::WEEK; + /** @deprecated Use ICache::DAY */ + const DAY = ICache::DAY; + /** @deprecated Use ICache::HOUR */ + const HOUR = ICache::HOUR; + /** @deprecated Use ICache::HALF_HOUR */ + const HALF_HOUR = ICache::HALF_HOUR; + /** @deprecated Use ICache::QUARTER_HOUR */ + const QUARTER_HOUR = ICache::QUARTER_HOUR; + /** @deprecated Use ICache::FIVE_MINUTES */ + const FIVE_MINUTES = ICache::FIVE_MINUTES; + /** @deprecated Use ICache::MINUTE */ + const MINUTE = ICache::MINUTE; + /** @deprecated Use ICache::INFINITE */ + const INFINITE = ICache::INFINITE; /** * @brief Returns all the cache keys sorted alphabetically @@ -41,7 +41,7 @@ class Cache extends BaseObject */ public static function getAllKeys($prefix = null) { - return self::getClass(ICacheDriver::class)->getAllKeys($prefix); + return self::getClass(ICache::class)->getAllKeys($prefix); } /** @@ -54,7 +54,7 @@ class Cache extends BaseObject */ public static function get($key) { - return self::getClass(ICacheDriver::class)->get($key); + return self::getClass(ICache::class)->get($key); } /** @@ -69,9 +69,9 @@ class Cache extends BaseObject * @return bool * @throws \Exception */ - public static function set($key, $value, $duration = ICacheDriver::MONTH) + public static function set($key, $value, $duration = ICache::MONTH) { - return self::getClass(ICacheDriver::class)->set($key, $value, $duration); + return self::getClass(ICache::class)->set($key, $value, $duration); } /** @@ -84,7 +84,7 @@ class Cache extends BaseObject */ public static function delete($key) { - return self::getClass(ICacheDriver::class)->delete($key); + return self::getClass(ICache::class)->delete($key); } /** @@ -97,6 +97,6 @@ class Cache extends BaseObject */ public static function clear($outdated = true) { - return self::getClass(ICacheDriver::class)->clear($outdated); + return self::getClass(ICache::class)->clear($outdated); } } diff --git a/src/Core/Cache/APCuCache.php b/src/Core/Cache/APCuCache.php index b89d7fe4b3..350c8fa067 100644 --- a/src/Core/Cache/APCuCache.php +++ b/src/Core/Cache/APCuCache.php @@ -6,11 +6,11 @@ use Exception; use Friendica\Core\Cache; /** - * APCu Cache Driver. + * APCu Cache. * * @author Philipp Holzer */ -class APCuCache extends AbstractCacheDriver implements IMemoryCacheDriver +class APCuCache extends AbstractCache implements IMemoryCache { use TraitCompareSet; use TraitCompareDelete; diff --git a/src/Core/Cache/AbstractCacheDriver.php b/src/Core/Cache/AbstractCache.php similarity index 95% rename from src/Core/Cache/AbstractCacheDriver.php rename to src/Core/Cache/AbstractCache.php index e12f63bfa4..c60615f089 100644 --- a/src/Core/Cache/AbstractCacheDriver.php +++ b/src/Core/Cache/AbstractCache.php @@ -5,11 +5,11 @@ namespace Friendica\Core\Cache; /** * Abstract class for common used functions * - * Class AbstractCacheDriver + * Class AbstractCache * * @package Friendica\Core\Cache */ -abstract class AbstractCacheDriver implements ICacheDriver +abstract class AbstractCache implements ICache { /** * @var string The hostname diff --git a/src/Core/Cache/ArrayCache.php b/src/Core/Cache/ArrayCache.php index f2f37708de..76f867f700 100644 --- a/src/Core/Cache/ArrayCache.php +++ b/src/Core/Cache/ArrayCache.php @@ -5,13 +5,13 @@ namespace Friendica\Core\Cache; use Friendica\Core\Cache; /** - * Implementation of the IMemoryCacheDriver mainly for testing purpose + * Implementation of the IMemoryCache mainly for testing purpose * * Class ArrayCache * * @package Friendica\Core\Cache */ -class ArrayCache extends AbstractCacheDriver implements IMemoryCacheDriver +class ArrayCache extends AbstractCache implements IMemoryCache { use TraitCompareDelete; diff --git a/src/Core/Cache/DatabaseCacheDriver.php b/src/Core/Cache/DatabaseCache.php similarity index 95% rename from src/Core/Cache/DatabaseCacheDriver.php rename to src/Core/Cache/DatabaseCache.php index f1d6150701..0289ada867 100644 --- a/src/Core/Cache/DatabaseCacheDriver.php +++ b/src/Core/Cache/DatabaseCache.php @@ -7,11 +7,11 @@ use Friendica\Database\Database; use Friendica\Util\DateTimeFormat; /** - * Database Cache Driver + * Database Cache * * @author Hypolite Petovan */ -class DatabaseCacheDriver extends AbstractCacheDriver implements ICacheDriver +class DatabaseCache extends AbstractCache implements ICache { /** * @var Database diff --git a/src/Core/Cache/ICacheDriver.php b/src/Core/Cache/ICache.php similarity index 96% rename from src/Core/Cache/ICacheDriver.php rename to src/Core/Cache/ICache.php index 34b741968a..f57e105cc0 100644 --- a/src/Core/Cache/ICacheDriver.php +++ b/src/Core/Cache/ICache.php @@ -3,11 +3,11 @@ namespace Friendica\Core\Cache; /** - * Cache Driver Interface + * Cache Interface * * @author Hypolite Petovan */ -interface ICacheDriver +interface ICache { const MONTH = 2592000; const WEEK = 604800; diff --git a/src/Core/Cache/IMemoryCacheDriver.php b/src/Core/Cache/IMemoryCache.php similarity index 85% rename from src/Core/Cache/IMemoryCacheDriver.php rename to src/Core/Cache/IMemoryCache.php index e35159a3a6..939e545741 100644 --- a/src/Core/Cache/IMemoryCacheDriver.php +++ b/src/Core/Cache/IMemoryCache.php @@ -5,11 +5,11 @@ namespace Friendica\Core\Cache; /** * This interface defines methods for Memory-Caches only * - * Interface IMemoryCacheDriver + * Interface IMemoryCache * * @package Friendica\Core\Cache */ -interface IMemoryCacheDriver extends ICacheDriver +interface IMemoryCache extends ICache { /** * Sets a value if it's not already stored @@ -19,7 +19,7 @@ interface IMemoryCacheDriver extends ICacheDriver * @param int $ttl The cache lifespan, must be one of the Cache constants * @return bool */ - public function add($key, $value, $ttl = ICacheDriver::FIVE_MINUTES); + public function add($key, $value, $ttl = ICache::FIVE_MINUTES); /** * Compares if the old value is set and sets the new value @@ -31,7 +31,7 @@ interface IMemoryCacheDriver extends ICacheDriver * * @return bool */ - public function compareSet($key, $oldValue, $newValue, $ttl = ICacheDriver::FIVE_MINUTES); + public function compareSet($key, $oldValue, $newValue, $ttl = ICache::FIVE_MINUTES); /** * Compares if the old value is set and removes it diff --git a/src/Core/Cache/MemcacheCacheDriver.php b/src/Core/Cache/MemcacheCache.php similarity index 96% rename from src/Core/Cache/MemcacheCacheDriver.php rename to src/Core/Cache/MemcacheCache.php index bf8c34a416..b5b835f488 100644 --- a/src/Core/Cache/MemcacheCacheDriver.php +++ b/src/Core/Cache/MemcacheCache.php @@ -8,11 +8,11 @@ use Friendica\Core\Config\Configuration; use Memcache; /** - * Memcache Cache Driver + * Memcache Cache * * @author Hypolite Petovan */ -class MemcacheCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver +class MemcacheCache extends AbstractCache implements IMemoryCache { use TraitCompareSet; use TraitCompareDelete; diff --git a/src/Core/Cache/MemcachedCacheDriver.php b/src/Core/Cache/MemcachedCache.php similarity index 96% rename from src/Core/Cache/MemcachedCacheDriver.php rename to src/Core/Cache/MemcachedCache.php index 7b3a2d5dfa..f841cae2ce 100644 --- a/src/Core/Cache/MemcachedCacheDriver.php +++ b/src/Core/Cache/MemcachedCache.php @@ -9,11 +9,11 @@ use Memcached; use Psr\Log\LoggerInterface; /** - * Memcached Cache Driver + * Memcached Cache * * @author Hypolite Petovan */ -class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver +class MemcachedCache extends AbstractCache implements IMemoryCache { use TraitCompareSet; use TraitCompareDelete; diff --git a/src/Core/Cache/ProfilerCache.php b/src/Core/Cache/ProfilerCache.php index 04271e7c69..72d72b2716 100644 --- a/src/Core/Cache/ProfilerCache.php +++ b/src/Core/Cache/ProfilerCache.php @@ -11,10 +11,10 @@ use Friendica\Util\Profiler; * * It is using the decorator pattern (@see */ -class ProfilerCache implements ICacheDriver, IMemoryCacheDriver +class ProfilerCache implements ICache, IMemoryCache { /** - * @var ICacheDriver The original cache driver + * @var ICache The original cache driver */ private $cache; @@ -23,7 +23,7 @@ class ProfilerCache implements ICacheDriver, IMemoryCacheDriver */ private $profiler; - public function __construct(ICacheDriver $cache, Profiler $profiler) + public function __construct(ICache $cache, Profiler $profiler) { $this->cache = $cache; $this->profiler = $profiler; @@ -104,7 +104,7 @@ class ProfilerCache implements ICacheDriver, IMemoryCacheDriver */ public function add($key, $value, $ttl = Cache::FIVE_MINUTES) { - if ($this->cache instanceof IMemoryCacheDriver) { + if ($this->cache instanceof IMemoryCache) { $time = microtime(true); $return = $this->cache->add($key, $value, $ttl); @@ -122,7 +122,7 @@ class ProfilerCache implements ICacheDriver, IMemoryCacheDriver */ public function compareSet($key, $oldValue, $newValue, $ttl = Cache::FIVE_MINUTES) { - if ($this->cache instanceof IMemoryCacheDriver) { + if ($this->cache instanceof IMemoryCache) { $time = microtime(true); $return = $this->cache->compareSet($key, $oldValue, $newValue, $ttl); @@ -140,7 +140,7 @@ class ProfilerCache implements ICacheDriver, IMemoryCacheDriver */ public function compareDelete($key, $value) { - if ($this->cache instanceof IMemoryCacheDriver) { + if ($this->cache instanceof IMemoryCache) { $time = microtime(true); $return = $this->cache->compareDelete($key, $value); diff --git a/src/Core/Cache/RedisCacheDriver.php b/src/Core/Cache/RedisCache.php similarity index 96% rename from src/Core/Cache/RedisCacheDriver.php rename to src/Core/Cache/RedisCache.php index 951f51dc13..6f3a647c55 100644 --- a/src/Core/Cache/RedisCacheDriver.php +++ b/src/Core/Cache/RedisCache.php @@ -8,12 +8,12 @@ use Friendica\Core\Config\Configuration; use Redis; /** - * Redis Cache Driver. This driver is based on Memcache driver + * Redis Cache. This driver is based on Memcache driver * * @author Hypolite Petovan * @author Roland Haeder */ -class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver +class RedisCache extends AbstractCache implements IMemoryCache { /** * @var Redis diff --git a/src/Core/Lock.php b/src/Core/Lock.php index 04dfaa1c5e..06313fdd2d 100644 --- a/src/Core/Lock.php +++ b/src/Core/Lock.php @@ -8,8 +8,8 @@ namespace Friendica\Core; use Friendica\BaseObject; -use Friendica\Core\Cache\ICacheDriver; -use Friendica\Core\Lock\ILockDriver; +use Friendica\Core\Cache\ICache; +use Friendica\Core\Lock\ILock; /** * This class contain Functions for preventing parallel execution of functions @@ -26,9 +26,9 @@ class Lock extends BaseObject * @return boolean Was the lock successful? * @throws \Exception */ - public static function acquire($key, $timeout = 120, $ttl = ICacheDriver::FIVE_MINUTES) + public static function acquire($key, $timeout = 120, $ttl = ICache::FIVE_MINUTES) { - return self::getClass(ILockDriver::class)->acquireLock($key, $timeout, $ttl); + return self::getClass(ILock::class)->acquireLock($key, $timeout, $ttl); } /** @@ -42,7 +42,7 @@ class Lock extends BaseObject */ public static function release($key, $override = false) { - return self::getClass(ILockDriver::class)->releaseLock($key, $override); + return self::getClass(ILock::class)->releaseLock($key, $override); } /** @@ -52,6 +52,6 @@ class Lock extends BaseObject */ public static function releaseAll() { - self::getClass(ILockDriver::class)->releaseAll(); + self::getClass(ILock::class)->releaseAll(); } } diff --git a/src/Core/Lock/AbstractLockDriver.php b/src/Core/Lock/AbstractLock.php similarity index 93% rename from src/Core/Lock/AbstractLockDriver.php rename to src/Core/Lock/AbstractLock.php index 71ad08d088..31744a9245 100644 --- a/src/Core/Lock/AbstractLockDriver.php +++ b/src/Core/Lock/AbstractLock.php @@ -3,13 +3,13 @@ namespace Friendica\Core\Lock; /** - * Class AbstractLockDriver + * Class AbstractLock * * @package Friendica\Core\Lock * * Basic class for Locking with common functions (local acquired locks, releaseAll, ..) */ -abstract class AbstractLockDriver implements ILockDriver +abstract class AbstractLock implements ILock { /** * @var array The local acquired locks diff --git a/src/Core/Lock/CacheLockDriver.php b/src/Core/Lock/CacheLockDriver.php index 6169933ddc..69db1c27f8 100644 --- a/src/Core/Lock/CacheLockDriver.php +++ b/src/Core/Lock/CacheLockDriver.php @@ -3,21 +3,21 @@ namespace Friendica\Core\Lock; use Friendica\Core\Cache; -use Friendica\Core\Cache\IMemoryCacheDriver; +use Friendica\Core\Cache\IMemoryCache; -class CacheLockDriver extends AbstractLockDriver +class CacheLockDriver extends AbstractLock { /** - * @var \Friendica\Core\Cache\ICacheDriver; + * @var \Friendica\Core\Cache\ICache; */ private $cache; /** * CacheLockDriver constructor. * - * @param IMemoryCacheDriver $cache The CacheDriver for this type of lock + * @param IMemoryCache $cache The CacheDriver for this type of lock */ - public function __construct(IMemoryCacheDriver $cache) + public function __construct(IMemoryCache $cache) { $this->cache = $cache; } diff --git a/src/Core/Lock/DatabaseLockDriver.php b/src/Core/Lock/DatabaseLock.php similarity index 97% rename from src/Core/Lock/DatabaseLockDriver.php rename to src/Core/Lock/DatabaseLock.php index e9e0500bb4..e451f5acb0 100644 --- a/src/Core/Lock/DatabaseLockDriver.php +++ b/src/Core/Lock/DatabaseLock.php @@ -9,7 +9,7 @@ use Friendica\Util\DateTimeFormat; /** * Locking driver that stores the locks in the database */ -class DatabaseLockDriver extends AbstractLockDriver +class DatabaseLock extends AbstractLock { /** * The current ID of the process diff --git a/src/Core/Lock/ILockDriver.php b/src/Core/Lock/ILock.php similarity index 93% rename from src/Core/Lock/ILockDriver.php rename to src/Core/Lock/ILock.php index 43793d6287..3c56369eb9 100644 --- a/src/Core/Lock/ILockDriver.php +++ b/src/Core/Lock/ILock.php @@ -5,11 +5,11 @@ namespace Friendica\Core\Lock; use Friendica\Core\Cache; /** - * Lock Driver Interface + * Lock Interface * * @author Philipp Holzer */ -interface ILockDriver +interface ILock { /** * Checks, if a key is currently locked to a or my process @@ -30,7 +30,7 @@ interface ILockDriver * * @return boolean Was the lock successful? */ - public function acquireLock($key, $timeout = 120, $ttl = Cache\ICacheDriver::FIVE_MINUTES); + public function acquireLock($key, $timeout = 120, $ttl = Cache\ICache::FIVE_MINUTES); /** * Releases a lock if it was set by us diff --git a/src/Core/Lock/SemaphoreLockDriver.php b/src/Core/Lock/SemaphoreLock.php similarity index 95% rename from src/Core/Lock/SemaphoreLockDriver.php rename to src/Core/Lock/SemaphoreLock.php index 781e110b17..b791d8c392 100644 --- a/src/Core/Lock/SemaphoreLockDriver.php +++ b/src/Core/Lock/SemaphoreLock.php @@ -4,7 +4,7 @@ namespace Friendica\Core\Lock; use Friendica\Core\Cache; -class SemaphoreLockDriver extends AbstractLockDriver +class SemaphoreLock extends AbstractLock { private static $semaphore = []; diff --git a/src/Factory/CacheDriverFactory.php b/src/Factory/CacheDriverFactory.php index 6b4c878f12..f604a0507d 100644 --- a/src/Factory/CacheDriverFactory.php +++ b/src/Factory/CacheDriverFactory.php @@ -3,7 +3,7 @@ namespace Friendica\Factory; use Friendica\Core\Cache; -use Friendica\Core\Cache\ICacheDriver; +use Friendica\Core\Cache\ICache; use Friendica\Core\Config\Configuration; use Friendica\Database\Database; use Friendica\Util\BaseURL; @@ -61,7 +61,7 @@ class CacheDriverFactory /** * This method creates a CacheDriver for the given cache driver name * - * @return ICacheDriver The instance of the CacheDriver + * @return ICache The instance of the CacheDriver * @throws \Exception The exception if something went wrong during the CacheDriver creation */ public function create() @@ -70,19 +70,19 @@ class CacheDriverFactory switch ($driver) { case 'memcache': - $cache = new Cache\MemcacheCacheDriver($this->hostname, $this->config); + $cache = new Cache\MemcacheCache($this->hostname, $this->config); break; case 'memcached': - $cache = new Cache\MemcachedCacheDriver($this->hostname, $this->config, $this->logger); + $cache = new Cache\MemcachedCache($this->hostname, $this->config, $this->logger); break; case 'redis': - $cache = new Cache\RedisCacheDriver($this->hostname, $this->config); + $cache = new Cache\RedisCache($this->hostname, $this->config); break; case 'apcu': $cache = new Cache\APCuCache($this->hostname); break; default: - $cache = new Cache\DatabaseCacheDriver($this->hostname, $this->dba); + $cache = new Cache\DatabaseCache($this->hostname, $this->dba); } $profiling = $this->config->get('system', 'profiling', false); diff --git a/src/Factory/LockDriverFactory.php b/src/Factory/LockDriverFactory.php index d31728be6c..b0c87cfcec 100644 --- a/src/Factory/LockDriverFactory.php +++ b/src/Factory/LockDriverFactory.php @@ -2,8 +2,8 @@ namespace Friendica\Factory; -use Friendica\Core\Cache\ICacheDriver; -use Friendica\Core\Cache\IMemoryCacheDriver; +use Friendica\Core\Cache\ICache; +use Friendica\Core\Cache\IMemoryCache; use Friendica\Core\Config\Configuration; use Friendica\Core\Lock; use Friendica\Database\Database; @@ -35,7 +35,7 @@ class LockDriverFactory private $dba; /** - * @var ICacheDriver The memory cache driver in case we use it + * @var ICache The memory cache driver in case we use it */ private $cacheDriver; @@ -49,7 +49,7 @@ class LockDriverFactory */ private $logger; - public function __construct(ICacheDriver $cacheDriver, Configuration $config, Database $dba, Profiler $profiler, LoggerInterface $logger) + public function __construct(ICache $cacheDriver, Configuration $config, Database $dba, Profiler $profiler, LoggerInterface $logger) { $this->cacheDriver = $cacheDriver; $this->config = $config; @@ -66,17 +66,17 @@ class LockDriverFactory case 'memcache': case 'memcached': case 'redis': - if ($this->cacheDriver instanceof IMemoryCacheDriver) { + if ($this->cacheDriver instanceof IMemoryCache) { return new Lock\CacheLockDriver($this->cacheDriver); } break; case 'database': - return new Lock\DatabaseLockDriver($this->dba); + return new Lock\DatabaseLock($this->dba); break; case 'semaphore': - return new Lock\SemaphoreLockDriver(); + return new Lock\SemaphoreLock(); break; default: @@ -96,7 +96,7 @@ class LockDriverFactory * 2. Cache Locking * 3. Database Locking * - * @return Lock\ILockDriver + * @return Lock\ILock */ private function useAutoDriver() { @@ -104,7 +104,7 @@ class LockDriverFactory // 1. Try to use Semaphores for - local - locking if (function_exists('sem_get')) { try { - return new Lock\SemaphoreLockDriver(); + return new Lock\SemaphoreLock(); } catch (\Exception $exception) { $this->logger->debug('Using Semaphore driver for locking failed.', ['exception' => $exception]); } @@ -114,7 +114,7 @@ class LockDriverFactory $cache_driver = $this->config->get('system', 'cache_driver', 'database'); if ($cache_driver != 'database') { try { - if ($this->cacheDriver instanceof IMemoryCacheDriver) { + if ($this->cacheDriver instanceof IMemoryCache) { return new Lock\CacheLockDriver($this->cacheDriver); } } catch (\Exception $exception) { @@ -123,6 +123,6 @@ class LockDriverFactory } // 3. Use Database Locking as a Fallback - return new Lock\DatabaseLockDriver($this->dba); + return new Lock\DatabaseLock($this->dba); } } diff --git a/static/dependencies.config.php b/static/dependencies.config.php index 55a2c6845b..1399fe7285 100644 --- a/static/dependencies.config.php +++ b/static/dependencies.config.php @@ -4,7 +4,7 @@ use Dice\Dice; use Friendica\App; use Friendica\Core\Cache; use Friendica\Core\Config; -use Friendica\Core\Lock\ILockDriver; +use Friendica\Core\Lock\ILock; use Friendica\Database\Database; use Friendica\Factory; use Friendica\Util; @@ -106,30 +106,30 @@ return [ * $app = $dice->create(App::class, [], ['$channel' => 'index']); * and is automatically passed as an argument with the same name */ - LoggerInterface::class => [ + LoggerInterface::class => [ 'instanceOf' => Factory\LoggerFactory::class, 'call' => [ ['create', [], Dice::CHAIN_CALL], ], ], - '$devLogger' => [ + '$devLogger' => [ 'instanceOf' => Factory\LoggerFactory::class, 'call' => [ ['createDev', [], Dice::CHAIN_CALL], ] ], - Cache\ICacheDriver::class => [ + Cache\ICache::class => [ 'instanceOf' => Factory\CacheDriverFactory::class, - 'call' => [ + 'call' => [ ['create', [], Dice::CHAIN_CALL], ], ], - Cache\IMemoryCacheDriver::class => [ - 'instanceOf' => Cache\ICacheDriver::class, + Cache\IMemoryCache::class => [ + 'instanceOf' => Cache\ICache::class, ], - ILockDriver::class => [ + ILock::class => [ 'instanceOf' => Factory\LockDriverFactory::class, - 'call' => [ + 'call' => [ ['create', [], Dice::CHAIN_CALL], ], ], diff --git a/tests/Util/DbaLockMockTrait.php b/tests/Util/DbaLockMockTrait.php index 3f76edb884..5b405dcfc2 100644 --- a/tests/Util/DbaLockMockTrait.php +++ b/tests/Util/DbaLockMockTrait.php @@ -3,7 +3,7 @@ namespace Friendica\Test\Util; use Friendica\Core\Cache; -use Friendica\Core\Lock\DatabaseLockDriver; +use Friendica\Core\Lock\DatabaseLock; trait DbaLockMockTrait { @@ -12,7 +12,6 @@ trait DbaLockMockTrait /** * Mocking acquireLock with DBA-backend - * @see DatabaseLockDriver::acquireLock() * * @param mixed $key The key to lock * @param int $ttl The TimeToLive @@ -22,6 +21,9 @@ trait DbaLockMockTrait * @param bool $rowExists True, if a row already exists in the lock table * @param null $time The current timestamp * @param null|int $times How often the method will get used + * + *@see DatabaseLock::acquireLock() + * */ public function mockAcquireLock($key, $ttl = Cache::FIVE_MINUTES, $locked = false, $pid = null, $rowExists = true, $time = null, $times = null) { @@ -55,12 +57,14 @@ trait DbaLockMockTrait /** * Mocking isLocked with DBA-backend - * @see DatabaseLockDriver::isLocked() * * @param mixed $key The key of the lock * @param null|bool $return True, if the key is already locked - * @param null $time The current timestamp + * @param null $time The current timestamp * @param null|int $times How often the method will get used + * + *@see DatabaseLock::isLocked() + * */ public function mockIsLocked($key, $return = true, $time = null, $times = null) { @@ -76,10 +80,12 @@ trait DbaLockMockTrait /** * Mocking releaseAll with DBA-backend - * @see DatabaseLockDriver::releaseAll() * - * @param null $pid The PID which was set - * @param null|int $times How often the method will get used + * @param null $pid The PID which was set + * @param null|int $times How often the method will get used + * + *@see DatabaseLock::releaseAll() + * */ public function mockReleaseAll($pid = null, $times = null) { @@ -92,11 +98,13 @@ trait DbaLockMockTrait /** * Mocking ReleaseLock with DBA-backend - * @see DatabaseLockDriver::releaseLock() * * @param mixed $key The key to release * @param null|int $pid The PID which was set * @param null|int $times How often the method will get used + * + *@see DatabaseLock::releaseLock() + * */ public function mockReleaseLock($key, $pid = null, $times = null) { diff --git a/tests/src/Core/Cache/APCuCacheDriverTest.php b/tests/src/Core/Cache/APCuCacheTest.php similarity index 89% rename from tests/src/Core/Cache/APCuCacheDriverTest.php rename to tests/src/Core/Cache/APCuCacheTest.php index 9925b02352..1b90be574e 100644 --- a/tests/src/Core/Cache/APCuCacheDriverTest.php +++ b/tests/src/Core/Cache/APCuCacheTest.php @@ -4,7 +4,7 @@ namespace Friendica\Test\src\Core\Cache; use Friendica\Core\Cache\APCuCache; -class APCuCacheDriverTest extends MemoryCacheTest +class APCuCacheTest extends MemoryCacheTest { protected function setUp() { diff --git a/tests/src/Core/Cache/ArrayCacheDriverTest.php b/tests/src/Core/Cache/ArrayCacheTest.php similarity index 87% rename from tests/src/Core/Cache/ArrayCacheDriverTest.php rename to tests/src/Core/Cache/ArrayCacheTest.php index 68b8d1dba1..60ca2761e5 100644 --- a/tests/src/Core/Cache/ArrayCacheDriverTest.php +++ b/tests/src/Core/Cache/ArrayCacheTest.php @@ -4,7 +4,7 @@ namespace Friendica\Test\src\Core\Cache; use Friendica\Core\Cache\ArrayCache; -class ArrayCacheDriverTest extends MemoryCacheTest +class ArrayCacheTest extends MemoryCacheTest { protected function getInstance() { diff --git a/tests/src/Core/Cache/CacheTest.php b/tests/src/Core/Cache/CacheTest.php index 088715cd79..92fdaffa32 100644 --- a/tests/src/Core/Cache/CacheTest.php +++ b/tests/src/Core/Cache/CacheTest.php @@ -2,7 +2,7 @@ namespace Friendica\Test\src\Core\Cache; -use Friendica\Core\Cache\MemcachedCacheDriver; +use Friendica\Core\Cache\MemcachedCache; use Friendica\Test\MockedTest; use Friendica\Util\PidFile; @@ -14,12 +14,12 @@ abstract class CacheTest extends MockedTest protected $startTime = 1417011228; /** - * @var \Friendica\Core\Cache\ICacheDriver + * @var \Friendica\Core\Cache\ICache */ protected $instance; /** - * @var \Friendica\Core\Cache\IMemoryCacheDriver + * @var \Friendica\Core\Cache\IMemoryCache */ protected $cache; @@ -202,7 +202,7 @@ abstract class CacheTest extends MockedTest */ public function testGetAllKeys($value1, $value2, $value3) { - if ($this->cache instanceof MemcachedCacheDriver) { + if ($this->cache instanceof MemcachedCache) { $this->markTestSkipped('Memcached doesn\'t support getAllKeys anymore'); } diff --git a/tests/src/Core/Cache/DatabaseCacheDriverTest.php b/tests/src/Core/Cache/DatabaseCacheTest.php similarity index 90% rename from tests/src/Core/Cache/DatabaseCacheDriverTest.php rename to tests/src/Core/Cache/DatabaseCacheTest.php index 1aa9bf02b8..dbc98bcf4f 100644 --- a/tests/src/Core/Cache/DatabaseCacheDriverTest.php +++ b/tests/src/Core/Cache/DatabaseCacheTest.php @@ -11,7 +11,7 @@ use Friendica\Util\ConfigFileLoader; use Friendica\Util\Profiler; use Psr\Log\NullLogger; -class DatabaseCacheDriverTest extends CacheTest +class DatabaseCacheTest extends CacheTest { use DatabaseTestTrait; use VFSTrait; @@ -36,7 +36,7 @@ class DatabaseCacheDriverTest extends CacheTest $dba = new StaticDatabase($configCache, $profiler, $logger); - $this->cache = new Cache\DatabaseCacheDriver('database', $dba); + $this->cache = new Cache\DatabaseCache('database', $dba); return $this->cache; } diff --git a/tests/src/Core/Cache/MemcacheCacheDriverTest.php b/tests/src/Core/Cache/MemcacheCacheTest.php similarity index 76% rename from tests/src/Core/Cache/MemcacheCacheDriverTest.php rename to tests/src/Core/Cache/MemcacheCacheTest.php index 31aa0b4852..ccc3723153 100644 --- a/tests/src/Core/Cache/MemcacheCacheDriverTest.php +++ b/tests/src/Core/Cache/MemcacheCacheTest.php @@ -2,13 +2,13 @@ namespace Friendica\Test\src\Core\Cache; -use Friendica\Core\Cache\MemcacheCacheDriver; +use Friendica\Core\Cache\MemcacheCache; use Friendica\Core\Config\Configuration; /** * @requires extension memcache */ -class MemcacheCacheDriverTest extends MemoryCacheTest +class MemcacheCacheTest extends MemoryCacheTest { protected function getInstance() { @@ -23,7 +23,7 @@ class MemcacheCacheDriverTest extends MemoryCacheTest ->with('system', 'memcache_port') ->andReturn(11211); - $this->cache = new MemcacheCacheDriver('localhost', $configMock); + $this->cache = new MemcacheCache('localhost', $configMock); return $this->cache; } diff --git a/tests/src/Core/Cache/MemcachedCacheDriverTest.php b/tests/src/Core/Cache/MemcachedCacheTest.php similarity index 74% rename from tests/src/Core/Cache/MemcachedCacheDriverTest.php rename to tests/src/Core/Cache/MemcachedCacheTest.php index ade3886841..d887250197 100644 --- a/tests/src/Core/Cache/MemcachedCacheDriverTest.php +++ b/tests/src/Core/Cache/MemcachedCacheTest.php @@ -3,14 +3,14 @@ namespace Friendica\Test\src\Core\Cache; -use Friendica\Core\Cache\MemcachedCacheDriver; +use Friendica\Core\Cache\MemcachedCache; use Friendica\Core\Config\Configuration; use Psr\Log\NullLogger; /** * @requires extension memcached */ -class MemcachedCacheDriverTest extends MemoryCacheTest +class MemcachedCacheTest extends MemoryCacheTest { protected function getInstance() { @@ -23,7 +23,7 @@ class MemcachedCacheDriverTest extends MemoryCacheTest $logger = new NullLogger(); - $this->cache = new MemcachedCacheDriver('localhost', $configMock, $logger); + $this->cache = new MemcachedCache('localhost', $configMock, $logger); return $this->cache; } diff --git a/tests/src/Core/Cache/MemoryCacheTest.php b/tests/src/Core/Cache/MemoryCacheTest.php index 0bd7617dd0..19c102396b 100644 --- a/tests/src/Core/Cache/MemoryCacheTest.php +++ b/tests/src/Core/Cache/MemoryCacheTest.php @@ -2,12 +2,12 @@ namespace Friendica\Test\src\Core\Cache; -use Friendica\Core\Cache\IMemoryCacheDriver; +use Friendica\Core\Cache\IMemoryCache; abstract class MemoryCacheTest extends CacheTest { /** - * @var \Friendica\Core\Cache\IMemoryCacheDriver + * @var \Friendica\Core\Cache\IMemoryCache */ protected $instance; @@ -15,7 +15,7 @@ abstract class MemoryCacheTest extends CacheTest { parent::setUp(); - if (!($this->instance instanceof IMemoryCacheDriver)) { + if (!($this->instance instanceof IMemoryCache)) { throw new \Exception('MemoryCacheTest unsupported'); } } diff --git a/tests/src/Core/Cache/RedisCacheDriverTest.php b/tests/src/Core/Cache/RedisCacheTest.php similarity index 82% rename from tests/src/Core/Cache/RedisCacheDriverTest.php rename to tests/src/Core/Cache/RedisCacheTest.php index 999261834f..df353252df 100644 --- a/tests/src/Core/Cache/RedisCacheDriverTest.php +++ b/tests/src/Core/Cache/RedisCacheTest.php @@ -3,13 +3,13 @@ namespace Friendica\Test\src\Core\Cache; -use Friendica\Core\Cache\RedisCacheDriver; +use Friendica\Core\Cache\RedisCache; use Friendica\Core\Config\Configuration; /** * @requires extension redis */ -class RedisCacheDriverTest extends MemoryCacheTest +class RedisCacheTest extends MemoryCacheTest { protected function getInstance() { @@ -33,7 +33,7 @@ class RedisCacheDriverTest extends MemoryCacheTest ->with('system', 'redis_password') ->andReturn(null); - $this->cache = new RedisCacheDriver('localhost', $configMock); + $this->cache = new RedisCache('localhost', $configMock); return $this->cache; } diff --git a/tests/src/Core/Lock/APCuCacheLockDriverTest.php b/tests/src/Core/Lock/APCuCacheLockTest.php similarity index 88% rename from tests/src/Core/Lock/APCuCacheLockDriverTest.php rename to tests/src/Core/Lock/APCuCacheLockTest.php index 70796b2698..c961013254 100644 --- a/tests/src/Core/Lock/APCuCacheLockDriverTest.php +++ b/tests/src/Core/Lock/APCuCacheLockTest.php @@ -5,7 +5,7 @@ namespace Friendica\Test\src\Core\Lock; use Friendica\Core\Cache\APCuCache; use Friendica\Core\Lock\CacheLockDriver; -class APCuCacheLockDriverTest extends LockTest +class APCuCacheLockTest extends LockTest { protected function setUp() { diff --git a/tests/src/Core/Lock/ArrayCacheLockDriverTest.php b/tests/src/Core/Lock/ArrayCacheLockTest.php similarity index 86% rename from tests/src/Core/Lock/ArrayCacheLockDriverTest.php rename to tests/src/Core/Lock/ArrayCacheLockTest.php index 9b74cd5670..aa4ca47538 100644 --- a/tests/src/Core/Lock/ArrayCacheLockDriverTest.php +++ b/tests/src/Core/Lock/ArrayCacheLockTest.php @@ -5,7 +5,7 @@ namespace Friendica\Test\src\Core\Lock; use Friendica\Core\Cache\ArrayCache; use Friendica\Core\Lock\CacheLockDriver; -class ArrayCacheLockDriverTest extends LockTest +class ArrayCacheLockTest extends LockTest { protected function getInstance() { diff --git a/tests/src/Core/Lock/DatabaseLockDriverTest.php b/tests/src/Core/Lock/DatabaseLockTest.php similarity index 91% rename from tests/src/Core/Lock/DatabaseLockDriverTest.php rename to tests/src/Core/Lock/DatabaseLockTest.php index f1c8376af1..2b20b2c101 100644 --- a/tests/src/Core/Lock/DatabaseLockDriverTest.php +++ b/tests/src/Core/Lock/DatabaseLockTest.php @@ -2,7 +2,7 @@ namespace Friendica\Test\src\Core\Lock; -use Friendica\Core\Lock\DatabaseLockDriver; +use Friendica\Core\Lock\DatabaseLock; use Friendica\Factory\ConfigFactory; use Friendica\Test\DatabaseTestTrait; use Friendica\Test\Util\Database\StaticDatabase; @@ -38,6 +38,6 @@ class DatabaseLockDriverTest extends LockTest $dba = new StaticDatabase($configCache, $profiler, $logger); - return new DatabaseLockDriver($dba, $this->pid); + return new DatabaseLock($dba, $this->pid); } } diff --git a/tests/src/Core/Lock/LockTest.php b/tests/src/Core/Lock/LockTest.php index 5eb409539b..0c231713ae 100644 --- a/tests/src/Core/Lock/LockTest.php +++ b/tests/src/Core/Lock/LockTest.php @@ -12,7 +12,7 @@ abstract class LockTest extends MockedTest protected $startTime = 1417011228; /** - * @var \Friendica\Core\Lock\ILockDriver + * @var \Friendica\Core\Lock\ILock */ protected $instance; diff --git a/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php b/tests/src/Core/Lock/MemcacheCacheLockTest.php similarity index 72% rename from tests/src/Core/Lock/MemcacheCacheLockDriverTest.php rename to tests/src/Core/Lock/MemcacheCacheLockTest.php index 8c723f34ed..b4272b0d25 100644 --- a/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php +++ b/tests/src/Core/Lock/MemcacheCacheLockTest.php @@ -3,14 +3,14 @@ namespace Friendica\Test\src\Core\Lock; -use Friendica\Core\Cache\MemcacheCacheDriver; +use Friendica\Core\Cache\MemcacheCache; use Friendica\Core\Config\Configuration; use Friendica\Core\Lock\CacheLockDriver; /** * @requires extension Memcache */ -class MemcacheCacheLockDriverTest extends LockTest +class MemcacheCacheLockTest extends LockTest { protected function getInstance() { @@ -25,6 +25,6 @@ class MemcacheCacheLockDriverTest extends LockTest ->with('system', 'memcache_port') ->andReturn(11211); - return new CacheLockDriver(new MemcacheCacheDriver('localhost', $configMock)); + return new CacheLockDriver(new MemcacheCache('localhost', $configMock)); } } diff --git a/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php b/tests/src/Core/Lock/MemcachedCacheLockTest.php similarity index 70% rename from tests/src/Core/Lock/MemcachedCacheLockDriverTest.php rename to tests/src/Core/Lock/MemcachedCacheLockTest.php index 7685d816de..ab5d678d68 100644 --- a/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php +++ b/tests/src/Core/Lock/MemcachedCacheLockTest.php @@ -3,7 +3,7 @@ namespace Friendica\Test\src\Core\Lock; -use Friendica\Core\Cache\MemcachedCacheDriver; +use Friendica\Core\Cache\MemcachedCache; use Friendica\Core\Config\Configuration; use Friendica\Core\Lock\CacheLockDriver; use Psr\Log\NullLogger; @@ -11,7 +11,7 @@ use Psr\Log\NullLogger; /** * @requires extension memcached */ -class MemcachedCacheLockDriverTest extends LockTest +class MemcachedCacheLockTest extends LockTest { protected function getInstance() { @@ -24,6 +24,6 @@ class MemcachedCacheLockDriverTest extends LockTest $logger = new NullLogger(); - return new CacheLockDriver(new MemcachedCacheDriver('localhost', $configMock, $logger)); + return new CacheLockDriver(new MemcachedCache('localhost', $configMock, $logger)); } } diff --git a/tests/src/Core/Lock/RedisCacheLockDriverTest.php b/tests/src/Core/Lock/RedisCacheLockTest.php similarity index 79% rename from tests/src/Core/Lock/RedisCacheLockDriverTest.php rename to tests/src/Core/Lock/RedisCacheLockTest.php index fdc961ccc8..dab31f5e3c 100644 --- a/tests/src/Core/Lock/RedisCacheLockDriverTest.php +++ b/tests/src/Core/Lock/RedisCacheLockTest.php @@ -3,14 +3,14 @@ namespace Friendica\Test\src\Core\Lock; -use Friendica\Core\Cache\RedisCacheDriver; +use Friendica\Core\Cache\RedisCache; use Friendica\Core\Config\Configuration; use Friendica\Core\Lock\CacheLockDriver; /** * @requires extension redis */ -class RedisCacheLockDriverTest extends LockTest +class RedisCacheLockTest extends LockTest { protected function getInstance() { @@ -34,6 +34,6 @@ class RedisCacheLockDriverTest extends LockTest ->with('system', 'redis_password') ->andReturn(null); - return new CacheLockDriver(new RedisCacheDriver('localhost', $configMock)); + return new CacheLockDriver(new RedisCache('localhost', $configMock)); } } diff --git a/tests/src/Core/Lock/SemaphoreLockDriverTest.php b/tests/src/Core/Lock/SemaphoreLockTest.php similarity index 88% rename from tests/src/Core/Lock/SemaphoreLockDriverTest.php rename to tests/src/Core/Lock/SemaphoreLockTest.php index d5aaa36ba9..7b9b03d728 100644 --- a/tests/src/Core/Lock/SemaphoreLockDriverTest.php +++ b/tests/src/Core/Lock/SemaphoreLockTest.php @@ -6,9 +6,9 @@ use Dice\Dice; use Friendica\App; use Friendica\BaseObject; use Friendica\Core\Config\Configuration; -use Friendica\Core\Lock\SemaphoreLockDriver; +use Friendica\Core\Lock\SemaphoreLock; -class SemaphoreLockDriverTest extends LockTest +class SemaphoreLockTest extends LockTest { public function setUp() { @@ -33,7 +33,7 @@ class SemaphoreLockDriverTest extends LockTest protected function getInstance() { - return new SemaphoreLockDriver(); + return new SemaphoreLock(); } function testLockTTL()