Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 02:24:23 +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

2
tests/src/Core/Cache/APCuCacheDriverTest.php → tests/src/Core/Cache/APCuCacheTest.php
View file

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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()