Merge pull request #114 from Nyholm/expiration-timestamp

Expiration timestamp

Author: Nyholm

FilesystemCachePool.php

@@ -13,6 +13,7 @@
 
 use Cache\Adapter\Common\AbstractCachePool;
 use Cache\Adapter\Common\Exception\InvalidArgumentException;
+use Cache\Adapter\Common\PhpCacheItem;
 use Cache\Taggable\TaggableItemInterface;
 use Cache\Taggable\TaggablePoolInterface;
 use Cache\Taggable\TaggablePoolTrait;
@@ -65,7 +66,7 @@ public function setFolder($folder)
      */
     protected function fetchObjectFromCache($key)
     {
-        $empty = [false, null, []];
+        $empty = [false, null, [], null];
         $file  = $this->getFilePath($key);
 
         try {
@@ -77,16 +78,18 @@ protected function fetchObjectFromCache($key)
             return $empty;
         }
 
-        if ($data[0] !== null && time() > $data[0]) {
-            foreach ($data[2] as $tag) {
+        // Determine expirationTimestamp from data, remove items if expired
+        $expirationTimestamp = $data[2] ?: null;
+        if ($expirationTimestamp !== null && time() > $expirationTimestamp) {
+            foreach ($data[1] as $tag) {
                 $this->removeListItem($this->getTagKey($tag), $key);
             }
             $this->forceClear($key);
 
             return $empty;
         }
 
-        return [true, $data[1], $data[2]];
+        return [true, $data[0], $data[1], $expirationTimestamp];
     }
 
     /**
@@ -113,7 +116,7 @@ protected function clearOneObjectFromCache($key)
     /**
      * {@inheritdoc}
      */
-    protected function storeItemInCache(CacheItemInterface $item, $ttl)
+    protected function storeItemInCache(PhpCacheItem $item, $ttl)
     {
         $tags = [];
         if ($item instanceof TaggableItemInterface) {
@@ -122,9 +125,9 @@ protected function storeItemInCache(CacheItemInterface $item, $ttl)
 
         $data = serialize(
             [
-                ($ttl === null ? null : time() + $ttl),
                 $item->get(),
                 $tags,
+                $item->getExpirationTimestamp(),
             ]
         );