removed extra flush logic

robfrawley · robfrawley · commit 762e10d19f9b · 2016-12-12T13:09:14.000-05:00
diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
@@ -107,14 +107,15 @@ protected function doHave($id)
         return $this->client->get($id) !== false
             || $this->client->getResultCode() === \Memcached::RES_SUCCESS;
     }
+
     /**
      * {@inheritdoc}
      */
     protected function doDelete(array $ids)
     {
         $toDelete = count($ids);
-        foreach ((array) $this->client->deleteMulti($ids) as $result) {
-            if (true === $result || \Memcached::RES_NOTFOUND === $result) {
+        foreach ($this->client->deleteMulti($ids) as $result) {
+            if (\Memcached::RES_SUCCESS === $result || \Memcached::RES_NOTFOUND === $result) {
                 --$toDelete;
             }
         }
@@ -127,27 +128,7 @@ protected function doDelete(array $ids)
      */
     protected function doClear($namespace)
     {
-        if (!isset($namespace[0]) || false === $ids = $this->getIdsByPrefix($namespace)) {
-            return $this->client->flush();
-        }
-
-        $isCleared = true;
-        do {
-            $isCleared = $this->doDelete($ids) && $isCleared;
-        } while ($ids = $this->getIdsByPrefix($namespace));
-
-        return $isCleared;
-    }
-
-    private function getIdsByPrefix($namespace)
-    {
-        if (false === $ids = $this->client->getAllKeys()) {
-            return false;
-        }
-
-        return array_filter((array) $ids, function ($id) use ($namespace) {
-            return 0 === strpos($id, $namespace);
-        });
+        return $this->client->flush();
     }
 
     private function setOption($opt, $val)
