symfony
diff --git a/‎src/Symfony/Component/Cache/Adapter/PdoAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/PdoAdapter.php
+4-4Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Component/Cache/Adapter/PdoAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/PdoAdapter.php
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php
+26Lines changed: 26 additions & 0 deletions b/‎src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php
+26Lines changed: 26 additions & 0 deletions
@@ -56,9 +56,9 @@ class PdoAdapter extends AbstractAdapter
      * @param int                    $defaultLifetime
      * @param array                  $options         An associative array of options
      *
-     * @throws InvalidArgumentException When first argument is not PDO nor Connection nor string
-     * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
-     * @throws InvalidArgumentException When namespace contains invalid characters
+     * @throws \InvalidArgumentException When first argument is not PDO nor Connection nor string
+     * @throws \InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
+     * @throws \InvalidArgumentException When namespace contains invalid characters
      */
     public function __construct($connOrDsn, $namespace = '', $defaultLifetime = 0, array $options = array())
     {
@@ -195,7 +195,7 @@ protected function doFetch(array $ids)
             foreach ($expired as $id) {
                 $stmt->bindValue(++$i, $id);
             }
-            $stmt->execute($expired);
+            $stmt->execute();
         }
     }
 
 
@@ -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
`@@ -56,9 +56,9 @@ class PdoAdapter extends AbstractAdapter`
`56`	`56`	`* @param int $defaultLifetime`
`57`	`57`	`* @param array $options An associative array of options`
`58`	`58`	`*`
`59`		`- * @throws InvalidArgumentException When first argument is not PDO nor Connection nor string`
`60`		`- * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION`
`61`		`- * @throws InvalidArgumentException When namespace contains invalid characters`
	`59`	`+ * @throws \InvalidArgumentException When first argument is not PDO nor Connection nor string`
	`60`	`+ * @throws \InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION`
	`61`	`+ * @throws \InvalidArgumentException When namespace contains invalid characters`
`62`	`62`	`*/`
`63`	`63`	`public function __construct($connOrDsn, $namespace = '', $defaultLifetime = 0, array $options = array())`
`64`	`64`	`{`
`@@ -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`