allow CachePool to set ttl via CacheItem callable

rvanlaak · Nyholm · commit f51a11623aad · 2016-12-23T09:25:31.000+01:00
diff --git a/FilesystemCachePool.php b/FilesystemCachePool.php
@@ -78,7 +78,9 @@ protected function fetchObjectFromCache($key)
             return $empty;
         }
 
-        if ($data[0] !== null && time() > $data[0]) {
+        // Determine ttl from data, remove items if expired
+        $ttl = $data[0] ?: null;
+        if ($ttl !== null && time() > $ttl) {
             foreach ($data[2] as $tag) {
                 $this->removeListItem($this->getTagKey($tag), $key);
             }
@@ -87,7 +89,7 @@ protected function fetchObjectFromCache($key)
             return $empty;
         }
 
-        return [true, $data[1], $data[2]];
+        return [true, $data[1], $data[2], $ttl];
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,9 @@ protected function fetchObjectFromCache($key)`
`78`	`78`	`return $empty;`
`79`	`79`	`}`
`80`	`80`
`81`		`- if ($data[0] !== null && time() > $data[0]) {`
	`81`	`+ // Determine ttl from data, remove items if expired`
	`82`	`+ $ttl = $data[0] ?: null;`
	`83`	`+ if ($ttl !== null && time() > $ttl) {`
`82`	`84`	`foreach ($data[2] as $tag) {`
`83`	`85`	`$this->removeListItem($this->getTagKey($tag), $key);`
`84`	`86`	`}`
`@@ -87,7 +89,7 @@ protected function fetchObjectFromCache($key)`
`87`	`89`	`return $empty;`
`88`	`90`	`}`
`89`	`91`
`90`		`- return [true, $data[1], $data[2]];`
	`92`	`+ return [true, $data[1], $data[2], $ttl];`
`91`	`93`	`}`
`92`	`94`
`93`	`95`	`/**`