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

Revert "minor #27649 [Cache] fix Memcached tests (nicolas-grekas)"

Browse Source 
This reverts commit dc323f084c, reversing
changes made to 917b07a5c6.
This commit is contained in:
Nicolas Grekas 2018-06-20 10:56:56 +02:00
parent dc323f084c
commit bb644c1df8
3 changed files with 3 additions and 43 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,7 +22,6 @@ class MemcachedAdapterTest extends AdapterTestCase
);
protected static $client;
protected static $enableVersioning = false;
public static function setupBeforeClass()
{
@ -42,23 +41,7 @@ class MemcachedAdapterTest extends AdapterTestCase
{
$client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST')) : self::$client;
$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;
}
return new MemcachedAdapter($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
}
public function testOptions()

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

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

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

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