bug symfony#18571 [Cache] Minor tweaks (nicolas-grekas)

This PR was merged into the 3.1-dev branch.

Discussion
----------

[Cache] Minor tweaks

| Q             | A
| ------------- | ---
| Branch?       | 3.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | php-cache/integration-tests#51
| License       | MIT
| Doc PR        | -

Commits
-------

9dcbe34 [Cache] Minor tweaks

Author: nicolas-grekas

src/Symfony/Component/Cache/Adapter/AbstractAdapter.php

@@ -46,15 +46,18 @@ function ($key, $value, $isHit) use ($defaultLifetime) {
             CacheItem::class
         );
         $this->mergeByLifetime = \Closure::bind(
-            function ($deferred, $namespace) {
+            function ($deferred, $namespace, &$expiredIds) {
                 $byLifetime = array();
                 $now = time();
+                $expiredIds = array();
 
                 foreach ($deferred as $key => $item) {
                     if (null === $item->expiry) {
                         $byLifetime[0][$namespace.$key] = $item->value;
                     } elseif ($item->expiry > $now) {
                         $byLifetime[$item->expiry - $now][$namespace.$key] = $item->value;
+                    } else {
+                        $expiredIds[] = $namespace.$key;
                     }
                 }
 
@@ -277,9 +280,12 @@ public function commit()
     {
         $ok = true;
         $byLifetime = $this->mergeByLifetime;
-        $byLifetime = $byLifetime($this->deferred, $this->namespace);
+        $byLifetime = $byLifetime($this->deferred, $this->namespace, $expiredIds);
         $retry = $this->deferred = array();
 
+        if ($expiredIds) {
+            $this->doDelete($expiredIds);
+        }
         foreach ($byLifetime as $lifetime => $values) {
             try {
                 $e = $this->doSave($values, $lifetime);

src/Symfony/Component/Cache/CacheItem.php

@@ -73,7 +73,7 @@ public function expiresAt($expiration)
         if (null === $expiration) {
             $this->expiry = $this->defaultLifetime > 0 ? time() + $this->defaultLifetime : null;
         } elseif ($expiration instanceof \DateTimeInterface) {
-            $this->expiry = $expiration->format('U');
+            $this->expiry = (int) $expiration->format('U');
         } else {
             throw new InvalidArgumentException(sprintf('Expiration date must implement DateTimeInterface or be null, "%s" given', is_object($expiration) ? get_class($expiration) : gettype($expiration)));
         }
@@ -89,7 +89,7 @@ public function expiresAfter($time)
         if (null === $time) {
             $this->expiry = $this->defaultLifetime > 0 ? time() + $this->defaultLifetime : null;
         } elseif ($time instanceof \DateInterval) {
-            $this->expiry = \DateTime::createFromFormat('U', time())->add($time)->format('U');
+            $this->expiry = (int) \DateTime::createFromFormat('U', time())->add($time)->format('U');
         } elseif (is_int($time)) {
             $this->expiry = $time + time();
         } else {

src/Symfony/Component/Cache/Tests/Adapter/FilesystemTest.php

@@ -27,4 +27,28 @@ public function createCachePool()
 
         return new FilesystemAdapter('sf-cache');
     }
+
+    public static function tearDownAfterClass()
+    {
+        self::rmdir(sys_get_temp_dir().'/symfony-cache');
+    }
+
+    public static function rmdir($dir)
+    {
+        if (!$dir || 0 !== strpos(dirname($dir), sys_get_temp_dir())) {
+            throw new \Exception(__METHOD__."() operates only on subdirs of system's temp dir");
+        }
+        $children = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
+        foreach($children as $child) {
+            if ($child->isDir()){
+                rmdir($child);
+            } else {
+                unlink($child);
+            }
+        }
+        rmdir($dir);
+    }
 }