Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 21:44:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Philipp Holzer 2019-08-04 10:26:53 +02:00
parent d56bd28a07
commit 86bf2ee45a
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
38 changed files with 152 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/Core/Cache.php
View file

@ -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
View file

@ -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
View file

@ -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
View file

@ -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
View file

@ -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
View file

@ -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
View file

@ -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
View file

@ -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
View file

@ -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
View file

@ -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
View file

@ -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
View file

@ -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
View file

@ -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
View file

@ -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
View file

@ -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
View file

@ -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
View file

@ -4,7 +4,7 @@ namespace Friendica\Core\Lock;
use Friendica\Core\Cache;
class SemaphoreLockDriver extends AbstractLockDriver
class SemaphoreLock extends AbstractLock
{
private static $semaphore = [];