diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.0

Browse Source 
* 3.4:
  [Cache] fix Memcached tests
This commit is contained in:
Nicolas Grekas 2018-06-20 09:27:05 +02:00
commit 9b64e8bedf
3 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
View File

@ -22,6 +22,7 @@ class MemcachedAdapterTest extends AdapterTestCase
);
protected static $client;
protected static $enableVersioning = false;
public static function setupBeforeClass()
{
@ -41,7 +42,23 @@ class MemcachedAdapterTest extends AdapterTestCase
{
$client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST')) : self::$client;
return new MemcachedAdapter($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
$adapter = new MemcachedAdapter($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
if (self::$enableVersioning) {
$adapter->enableVersioning();
}
return $adapter;
}
public function testClear()
{
self::$enableVersioning = true;
try {
parent::testClear();
} finally {
self::$enableVersioning = false;
}
}
public function testOptions()

19
src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php
View File

@ -23,6 +23,7 @@ class MemcachedCacheTest extends CacheTestCase
);
protected static $client;
protected static $enableVersioning = false;
public static function setupBeforeClass()
{
@ -42,7 +43,23 @@ class MemcachedCacheTest extends CacheTestCase
{
$client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('binary_protocol' => false)) : self::$client;
return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
$adapter = new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
if (self::$enableVersioning) {
$adapter->enableVersioning();
}
return $adapter;
}
public function testClear()
{
self::$enableVersioning = true;
try {
parent::testClear();
} finally {
self::$enableVersioning = false;
}
}
public function testCreatePersistentConnectionShouldNotDupServerList()

8
src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTextModeTest.php
View File

@ -20,6 +20,12 @@ class MemcachedCacheTextModeTest extends MemcachedCacheTest
{
$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('binary_protocol' => false));
return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
$adapter = new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
if (self::$enableVersioning) {
$adapter->enableVersioning();
}
return $adapter;
}
}