Merge branch '4.1' into 4.2

nicolas-grekas · nicolas-grekas · commit 15fefd8cd537 · 2018-12-06T11:00:08.000Z
* 4.1:
  [Cache] Fixed Memcached adapter doClear()to call flush()
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
@@ -193,6 +193,11 @@ public function provideDsnWithOptions()
         );
     }
 
+    public function testClear()
+    {
+        $this->assertTrue($this->createCachePool()->clear());
+    }
+
     public function testMultiServerDsn()
     {
         $dsn = 'memcached:?host[localhost]&host[localhost:12345]&host[/some/memcached.sock:]=3';
diff --git a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php
@@ -292,7 +292,7 @@ protected function doDelete(array $ids)
      */
     protected function doClear($namespace)
     {
-        return false;
+        return '' === $namespace && $this->getClient()->flush();
     }
 
     private function checkResultCode($result)

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,11 @@ public function provideDsnWithOptions()`
`193`	`193`	`);`
`194`	`194`	`}`
`195`	`195`
	`196`	`+ public function testClear()`
	`197`	`+ {`
	`198`	`+ $this->assertTrue($this->createCachePool()->clear());`
	`199`	`+ }`
	`200`	`+`
`196`	`201`	`public function testMultiServerDsn()`
`197`	`202`	`{`
`198`	`203`	`$dsn = 'memcached:?host[localhost]&host[localhost:12345]&host[/some/memcached.sock:]=3';`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ protected function doDelete(array $ids)`
`292`	`292`	`*/`
`293`	`293`	`protected function doClear($namespace)`
`294`	`294`	`{`
`295`		`- return false;`
	`295`	`+ return '' === $namespace && $this->getClient()->flush();`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`private function checkResultCode($result)`