Merge branch '3.4' into 4.1

nicolas-grekas · nicolas-grekas · commit 5fc7d5ec81c9 · 2018-12-06T10:58:36.000Z
* 3.4:
  [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
@@ -192,4 +192,9 @@ public function provideDsnWithOptions()
             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());
+    }
 }
diff --git a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php
@@ -260,7 +260,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
`@@ -192,4 +192,9 @@ public function provideDsnWithOptions()`
`192`	`192`	`array(\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8),`
`193`	`193`	`);`
`194`	`194`	`}`
	`195`	`+`
	`196`	`+ public function testClear()`
	`197`	`+ {`
	`198`	`+ $this->assertTrue($this->createCachePool()->clear());`
	`199`	`+ }`
`195`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ protected function doDelete(array $ids)`
`260`	`260`	`*/`
`261`	`261`	`protected function doClear($namespace)`
`262`	`262`	`{`
`263`		`- return false;`
	`263`	`+ return '' === $namespace && $this->getClient()->flush();`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`private function checkResultCode($result)`