[Cache] fix cleanup of expired items for PdoAdapter

dmaicher · dmaicher · commit 219a310877de · 2017-07-01T12:17:16.000+02:00
diff --git a/Adapter/PdoAdapter.php b/Adapter/PdoAdapter.php
@@ -195,7 +195,7 @@ protected function doFetch(array $ids)
             foreach ($expired as $id) {
                 $stmt->bindValue(++$i, $id);
             }
-            $stmt->execute($expired);
+            $stmt->execute();
         }
     }
 
diff --git a/Tests/Adapter/PdoAdapterTest.php b/Tests/Adapter/PdoAdapterTest.php
@@ -41,4 +41,30 @@ public function createCachePool($defaultLifetime = 0)
     {
         return new PdoAdapter('sqlite:'.self::$dbFile, 'ns', $defaultLifetime);
     }
+
+    public function testCleanupExpiredItems()
+    {
+        $pdo = new \PDO('sqlite:'.self::$dbFile);
+
+        $getCacheItemCount = function () use ($pdo) {
+            return (int) $pdo->query('SELECT COUNT(*) FROM cache_items')->fetch(\PDO::FETCH_COLUMN);
+        };
+
+        $this->assertSame(0, $getCacheItemCount());
+
+        $cache = $this->createCachePool();
+
+        $item = $cache->getItem('some_nice_key');
+        $item->expiresAfter(1);
+        $item->set(1);
+
+        $cache->save($item);
+        $this->assertSame(1, $getCacheItemCount());
+
+        sleep(2);
+
+        $newItem = $cache->getItem($item->getKey());
+        $this->assertFalse($newItem->isHit());
+        $this->assertSame(0, $getCacheItemCount(), 'PDOAdapter must clean up expired items');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ protected function doFetch(array $ids)`
`195`	`195`	`foreach ($expired as $id) {`
`196`	`196`	`$stmt->bindValue(++$i, $id);`
`197`	`197`	`}`
`198`		`- $stmt->execute($expired);`
	`198`	`+ $stmt->execute();`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`