Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 09:10:12 +00: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

12
src/Factory/CacheDriverFactory.php
View file

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

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