fixes

Author: Nyholm

spec/CachePluginSpec.php

@@ -35,8 +35,9 @@ function it_caches_responses(CacheItemPoolInterface $pool, CacheItemInterface $i
         $response->getHeader('Expires')->willReturn(array());
 
         $pool->getItem('e3b717d5883a45ef9493d009741f7c64')->shouldBeCalled()->willReturn($item);
-        $item->exists()->willReturn(false);
-        $item->set($response, 60)->shouldBeCalled();
+        $item->isHit()->willReturn(false);
+        $item->set($response)->willReturn($item)->shouldBeCalled();
+        $item->expiresAfter(60)->willReturn($item)->shouldBeCalled();
         $pool->save($item)->shouldBeCalled();
 
         $next = function (RequestInterface $request) use ($response) {
@@ -55,7 +56,7 @@ function it_doesnt_store_failed_responses(CacheItemPoolInterface $pool, CacheIte
         $response->getHeader('Expires')->willReturn(array());
 
         $pool->getItem('e3b717d5883a45ef9493d009741f7c64')->shouldBeCalled()->willReturn($item);
-        $item->exists()->willReturn(false);
+        $item->isHit()->willReturn(false);
 
         $next = function (RequestInterface $request) use ($response) {
             return new FulfilledPromise($response->getWrappedObject());
@@ -87,10 +88,11 @@ function it_calculate_age_from_response(CacheItemPoolInterface $pool, CacheItemI
         $response->getHeader('Expires')->willReturn(array());
 
         $pool->getItem('e3b717d5883a45ef9493d009741f7c64')->shouldBeCalled()->willReturn($item);
-        $item->exists()->willReturn(false);
+        $item->isHit()->willReturn(false);
 
         // 40-15 should be 25
-        $item->set($response, 25)->shouldBeCalled();
+        $item->set($response)->willReturn($item)->shouldBeCalled();
+        $item->expiresAfter(25)->willReturn($item)->shouldBeCalled();
         $pool->save($item)->shouldBeCalled();
 
         $next = function (RequestInterface $request) use ($response) {

src/CachePlugin.php

@@ -60,14 +60,15 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
         $key = $this->createCacheKey($request);
         $cacheItem = $this->pool->getItem($key);
 
-        if ($cacheItem->exists()) {
+        if ($cacheItem->isHit()) {
             // return cached response
             return $cacheItem->get();
         }
 
         return $next($request)->then(function (ResponseInterface $response) use ($cacheItem) {
             if ($this->isCacheable($response)) {
-                $cacheItem->set($response, $this->getMaxAge($response));
+                $cacheItem->set($response)
+                    ->expiresAfter($this->getMaxAge($response));
                 $this->pool->save($cacheItem);
             }
 
@@ -132,11 +133,11 @@ private function createCacheKey(RequestInterface $request)
     }
 
     /**
-     * Get a ttl in seconds or as a \DateTime object.
+     * Get a ttl in seconds. It could return null if we do not respect cache headers and got no defaultTtl.
      *
      * @param ResponseInterface $response
      *
-     * @return int|\DateTime
+     * @return int|null
      */
     private function getMaxAge(ResponseInterface $response)
     {
@@ -158,7 +159,7 @@ private function getMaxAge(ResponseInterface $response)
         // check for ttl in the Expires header
         $headers = $response->getHeader('Expires');
         foreach ($headers as $header) {
-            return new \DateTime($header);
+            return (new \DateTime($header))->getTimestamp() - (new \DateTime())->getTimestamp();
         }
 
         return $this->defaultTtl;