Browse Source

Rename *CacheDriver to *Cache because they don't act as driver anymore

pull/7465/head
Philipp Holzer 2 years ago
parent
commit
86bf2ee45a
No known key found for this signature in database GPG Key ID: D8365C3D36B77D90
  1. 8
      src/Console/Cache.php
  2. 50
      src/Core/Cache.php
  3. 4
      src/Core/Cache/APCuCache.php
  4. 4
      src/Core/Cache/AbstractCache.php
  5. 4
      src/Core/Cache/ArrayCache.php
  6. 4
      src/Core/Cache/DatabaseCache.php
  7. 4
      src/Core/Cache/ICache.php
  8. 8
      src/Core/Cache/IMemoryCache.php
  9. 4
      src/Core/Cache/MemcacheCache.php
  10. 4
      src/Core/Cache/MemcachedCache.php
  11. 12
      src/Core/Cache/ProfilerCache.php
  12. 4
      src/Core/Cache/RedisCache.php
  13. 12
      src/Core/Lock.php
  14. 4
      src/Core/Lock/AbstractLock.php
  15. 10
      src/Core/Lock/CacheLockDriver.php
  16. 2
      src/Core/Lock/DatabaseLock.php
  17. 6
      src/Core/Lock/ILock.php
  18. 2
      src/Core/Lock/SemaphoreLock.php
  19. 12
      src/Factory/CacheDriverFactory.php
  20. 22
      src/Factory/LockDriverFactory.php
  21. 18
      static/dependencies.config.php
  22. 24
      tests/Util/DbaLockMockTrait.php
  23. 2
      tests/src/Core/Cache/APCuCacheTest.php
  24. 2
      tests/src/Core/Cache/ArrayCacheTest.php
  25. 8
      tests/src/Core/Cache/CacheTest.php
  26. 4
      tests/src/Core/Cache/DatabaseCacheTest.php
  27. 6
      tests/src/Core/Cache/MemcacheCacheTest.php
  28. 6
      tests/src/Core/Cache/MemcachedCacheTest.php
  29. 6
      tests/src/Core/Cache/MemoryCacheTest.php
  30. 6
      tests/src/Core/Cache/RedisCacheTest.php
  31. 2
      tests/src/Core/Lock/APCuCacheLockTest.php
  32. 2
      tests/src/Core/Lock/ArrayCacheLockTest.php
  33. 4
      tests/src/Core/Lock/DatabaseLockTest.php
  34. 2
      tests/src/Core/Lock/LockTest.php
  35. 6
      tests/src/Core/Lock/MemcacheCacheLockTest.php
  36. 6
      tests/src/Core/Lock/MemcachedCacheLockTest.php
  37. 6
      tests/src/Core/Lock/RedisCacheLockTest.php
  38. 6
      tests/src/Core/Lock/SemaphoreLockTest.php

8
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.");

50
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);
}
}

4
src/Core/Cache/APCuCache.php

@ -6,11 +6,11 @@ use Exception;
use Friendica\Core\Cache;
/**
* APCu Cache Driver.
* APCu Cache.
*
* @author Philipp Holzer <admin@philipp.info>
*/
class APCuCache extends AbstractCacheDriver implements IMemoryCacheDriver
class APCuCache extends AbstractCache implements IMemoryCache
{
use TraitCompareSet;
use TraitCompareDelete;

4
src/Core/Cache/AbstractCacheDriver.php → 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

4
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;

4
src/Core/Cache/DatabaseCacheDriver.php → 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 <hypolite@mrpetovan.com>
*/
class DatabaseCacheDriver extends AbstractCacheDriver implements ICacheDriver
class DatabaseCache extends AbstractCache implements ICache
{
/**
* @var Database

4
src/Core/Cache/ICacheDriver.php → src/Core/Cache/ICache.php

@ -3,11 +3,11 @@
namespace Friendica\Core\Cache;
/**
* Cache Driver Interface
* Cache Interface
*
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
interface ICacheDriver
interface ICache
{
const MONTH = 2592000;
const WEEK = 604800;

8
src/Core/Cache/IMemoryCacheDriver.php → 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

4
src/Core/Cache/MemcacheCacheDriver.php → src/Core/Cache/MemcacheCache.php

@ -8,11 +8,11 @@ use Friendica\Core\Config\Configuration;
use Memcache;
/**
* Memcache Cache Driver
* Memcache Cache
*
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class MemcacheCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
class MemcacheCache extends AbstractCache implements IMemoryCache
{
use TraitCompareSet;
use TraitCompareDelete;

4
src/Core/Cache/MemcachedCacheDriver.php → src/Core/Cache/MemcachedCache.php

@ -9,11 +9,11 @@ use Memcached;
use Psr\Log\LoggerInterface;
/**
* Memcached Cache Driver
* Memcached Cache
*
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
class MemcachedCache extends AbstractCache implements IMemoryCache
{
use TraitCompareSet;
use TraitCompareDelete;

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

4
src/Core/Cache/RedisCacheDriver.php → 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 <hypolite@mrpetovan.com>
* @author Roland Haeder <roland@mxchange.org>
*/
class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
class RedisCache extends AbstractCache implements IMemoryCache
{
/**
* @var Redis

12
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();
}
}

4
src/Core/Lock/AbstractLockDriver.php → 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

10
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;
}

2
src/Core/Lock/DatabaseLockDriver.php → 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

6
src/Core/Lock/ILockDriver.php → 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 <admin@philipp.info>
*/
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

2
src/Core/Lock/SemaphoreLockDriver.php → 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 = [];

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

22
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);
}
}

18
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],
],
],

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

2
tests/src/Core/Cache/APCuCacheDriverTest.php → 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()
{

2
tests/src/Core/Cache/ArrayCacheDriverTest.php → 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()
{

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

4
tests/src/Core/Cache/DatabaseCacheDriverTest.php → 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;
}

6
tests/src/Core/Cache/MemcacheCacheDriverTest.php → 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;
}

6
tests/src/Core/Cache/MemcachedCacheDriverTest.php → 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;
}

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

6
tests/src/Core/Cache/RedisCacheDriverTest.php → 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;
}

2
tests/src/Core/Lock/APCuCacheLockDriverTest.php → 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()
{

2
tests/src/Core/Lock/ArrayCacheLockDriverTest.php → 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()
{

4
tests/src/Core/Lock/DatabaseLockDriverTest.php → 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);
}
}

2
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;

6
tests/src/Core/Lock/MemcacheCacheLockDriverTest.php → 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));
}
}

6
tests/src/Core/Lock/MemcachedCacheLockDriverTest.php → 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));
}
}

6
tests/src/Core/Lock/RedisCacheLockDriverTest.php → 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));
}
}

6
tests/src/Core/Lock/SemaphoreLockDriverTest.php → 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()
Loading…
Cancel
Save