Merge branch '4.0' into 4.1

* 4.0:
  [Cache] fix Memcached tests

Author: nicolas-grekas

src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php

@@ -22,6 +22,7 @@ class MemcachedAdapterTest extends AdapterTestCase
     );
 
     protected static $client;
+    protected static $enableVersioning = false;
 
     public static function setupBeforeClass()
     {
@@ -41,7 +42,23 @@ public function createCachePool($defaultLifetime = 0)
     {
         $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()

src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php

@@ -23,6 +23,7 @@ class MemcachedCacheTest extends CacheTestCase
     );
 
     protected static $client;
+    protected static $enableVersioning = false;
 
     public static function setupBeforeClass()
     {
@@ -42,7 +43,23 @@ public function createSimpleCache($defaultLifetime = 0)
     {
         $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()

src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTextModeTest.php

@@ -20,6 +20,12 @@ public function createSimpleCache($defaultLifetime = 0)
     {
         $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;
     }
 }