Merge pull request #14 from EAnushan/master

Fix caching streams and cache lifetimes (WIP).
Kevinrob · Jul 20, 2015 · fccedf6 · fccedf6
2 parents 0b14ffa + 921e22b
commit fccedf6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/CacheEntry.php b/src/CacheEntry.php
@@ -141,6 +141,7 @@ public function __sleep()
         // Stream/Resource can't be serialized... So we copy the content
         if ($this->response !== null) {
             $this->responseBody = (string)$this->response->getBody();
+            $this->response->getBody()->rewind();
         }
 
         return array_keys(get_object_vars($this));

diff --git a/src/PrivateCache.php b/src/PrivateCache.php
@@ -98,9 +98,18 @@ public function fetch(RequestInterface $request)
     public function cache(RequestInterface $request, ResponseInterface $response)
     {
         try {
-            return $this->storage->save($this->getCacheKey($request), serialize($this->getCacheObject($response)));
+            $cacheObject = $this->getCacheObject($response);
+            if(isset($cacheObject))
+            {
+                $lifeTime = $this->getCacheObject($response)->getStaleAt()->getTimestamp() - time();
+                if($lifeTime > 0) {
+                    return $this->storage->save($this->getCacheKey($request), serialize($this->getCacheObject($response)), $lifeTime);
+                }
+            }
         } catch (\Exception $ignored) {
             return false;
         }
+
+        return false;
     }
 }