Merge branch '3.4' into 4.1

* 3.4:
  [Cache] Fixed Memcached adapter doClear()to call flush()
This commit is contained in:
Nicolas Grekas 2018-12-06 10:58:36 +00:00
commit 5fc7d5ec81
2 changed files with 6 additions and 1 deletions

View File

@ -192,4 +192,9 @@ class MemcachedAdapterTest extends AdapterTestCase
array(\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8),
);
}
public function testClear()
{
$this->assertTrue($this->createCachePool()->clear());
}
}

View File

@ -260,7 +260,7 @@ trait MemcachedTrait
*/
protected function doClear($namespace)
{
return false;
return '' === $namespace && $this->getClient()->flush();
}
private function checkResultCode($result)