symfony
diff --git a/‎src/Symfony/Component/Cache/Adapter/ChainAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/ChainAdapter.php
+9-4Lines changed: 9 additions & 4 deletions b/‎src/Symfony/Component/Cache/Adapter/ChainAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/ChainAdapter.php
+9-4Lines changed: 9 additions & 4 deletions
diff --git a/‎src/Symfony/Component/Cache/Simple/ChainCache.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Simple/ChainCache.php
+9-4Lines changed: 9 additions & 4 deletions b/‎src/Symfony/Component/Cache/Simple/ChainCache.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Simple/ChainCache.php
+9-4Lines changed: 9 additions & 4 deletions
diff --git a/‎src/Symfony/Component/Cache/Traits/ChainTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Traits/ChainTrait.php
-42Lines changed: 0 additions & 42 deletions b/‎src/Symfony/Component/Cache/Traits/ChainTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Traits/ChainTrait.php
-42Lines changed: 0 additions & 42 deletions
diff --git a/‎src/Symfony/Component/Cache/Traits/PdoTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Traits/PdoTrait.php
+3-19Lines changed: 3 additions & 19 deletions b/‎src/Symfony/Component/Cache/Traits/PdoTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Traits/PdoTrait.php
+3-19Lines changed: 3 additions & 19 deletions
@@ -16,7 +16,6 @@
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Component\Cache\Traits\ChainTrait;
 
 /**
  * Chains several adapters together.
@@ -28,8 +27,6 @@
  */
 class ChainAdapter implements AdapterInterface, PruneableInterface
 {
-    use ChainTrait;
-
     private $adapters = array();
     private $adapterCount;
     private $saveUp;
@@ -241,6 +238,14 @@ public function commit()
      */
     public function prune()
     {
-        return $this->doPrune($this->adapters);
+        $pruned = true;
+
+        foreach ($this->adapters as $adapter) {
+            if ($adapter instanceof PruneableInterface) {
+                $pruned = $adapter->prune() && $pruned;
+            }
+        }
+
+        return $pruned;
     }
 }
@@ -14,7 +14,6 @@
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Component\Cache\Traits\ChainTrait;
 
 /**
  * Chains several caches together.
@@ -26,8 +25,6 @@
  */
 class ChainCache implements CacheInterface, PruneableInterface
 {
-    use ChainTrait;
-
     private $miss;
     private $caches = array();
     private $defaultLifetime;
@@ -229,6 +226,14 @@ public function setMultiple($values, $ttl = null)
      */
     public function prune()
     {
-        return $this->doPrune($this->caches);
+        $pruned = true;
+
+        foreach ($this->caches as $cache) {
+            if ($cache instanceof PruneableInterface) {
+                $pruned = $cache->prune() && $pruned;
+            }
+        }
+
+        return $pruned;
     }
 }
@@ -142,26 +142,10 @@ public function createTable()
      */
     public function prune()
     {
-        $pdoConn = $this->getConnection();
-        $selects = $pdoConn->prepare("SELECT $this->idCol FROM $this->table WHERE $this->lifetimeCol + $this->timeCol <= :time");
-        $selects->bindValue(':time', time(), \PDO::PARAM_INT);
-        $selects->execute();
+        $deletes = $this->getConnection()->prepare("DELETE FROM $this->table WHERE $this->lifetimeCol + $this->timeCol <= :time");
+        $deletes->bindValue(':time', time(), \Pdo::PARAM_INT);
 
-        if (0 === count($expired = $selects->fetchAll(\PDO::FETCH_COLUMN))) {
-            return true;
-        }
-
-        $anchors = array_map(function ($i) {
-            return sprintf(':id_%d_anchor', $i);
-        }, array_keys($expired));
-
-        $deletes = $pdoConn->prepare(sprintf("DELETE FROM $this->table WHERE $this->idCol IN (%s)", implode(',', $anchors)));
-
-        foreach ($anchors as $i => $a) {
-            $deletes->bindValue($a, $expired[$i], \PDO::PARAM_STR);
-        }
-
-        return $deletes->execute() && $deletes->rowCount() === count($expired);
+        return $deletes->execute();
     }
 
     /**