Bugfix and started on the tests

Author: Nyholm

spec/CachePluginSpec.php

@@ -15,7 +15,7 @@ class CachePluginSpec extends ObjectBehavior
 {
     function let(CacheItemPoolInterface $pool, StreamFactory $streamFactory)
     {
-        $this->beConstructedWith($pool, $streamFactory, ['default_ttl'=>60]);
+        $this->beConstructedWith($pool, $streamFactory, ['default_ttl'=>60, 'cache_lifetime'=>1000]);
     }
 
     function it_is_initializable(CacheItemPoolInterface $pool)
@@ -41,18 +41,25 @@ function it_caches_responses(CacheItemPoolInterface $pool, CacheItemInterface $i
         $response->getBody()->willReturn($stream);
         $response->getHeader('Cache-Control')->willReturn(array());
         $response->getHeader('Expires')->willReturn(array());
+        $response->getHeader('ETag')->willReturn(array());
 
         $pool->getItem('e3b717d5883a45ef9493d009741f7c64')->shouldBeCalled()->willReturn($item);
         $item->isHit()->willReturn(false);
-        $item->set(['response' => $response, 'body' => $httpBody])->willReturn($item)->shouldBeCalled();
-        $item->expiresAfter(60)->willReturn($item)->shouldBeCalled();
+        $item->set()->willReturn($item)->shouldBeCalled();
+        $item->expiresAfter(1060)->willReturn($item)->shouldBeCalled();
         $pool->save($item)->shouldBeCalled();
 
         $next = function (RequestInterface $request) use ($response) {
             return new FulfilledPromise($response->getWrappedObject());
         };
 
         $this->handleRequest($request, $next, function () {});
+        $item->get()->shouldHaveKeyWithValue('response', $response);
+        $item->get()->shouldHaveKeyWithValue('body', $httpBody);
+        $item->get()->shouldHaveKey('expiresAt');
+        $item->get()->shouldHaveKey('createdAt');
+        $item->get()->shouldHaveKey('etag');
+
     }
 
     function it_doesnt_store_failed_responses(CacheItemPoolInterface $pool, CacheItemInterface $item, RequestInterface $request, ResponseInterface $response)

src/CachePlugin.php

@@ -102,8 +102,9 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
 
                 // The cached response we have is still valid
                 $data = $cacheItem->get();
-                $data['expiresAt'] = time() + $this->getMaxAge($response);
-                $cacheItem->set($data)->expiresAfter($this->config['cache_lifetime'] + $data['expiresAt']);
+                $maxAge = $this->getMaxAge($response);
+                $data['expiresAt'] = time() + $maxAge;
+                $cacheItem->set($data)->expiresAfter($this->config['cache_lifetime'] + $maxAge);
                 $this->pool->save($cacheItem);
 
                 return $this->createResponseFromCacheItem($cacheItem);
@@ -118,13 +119,13 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
                     $response = $response->withBody($this->streamFactory->createStream($body));
                 }
 
-                $expiresAt = time() + $this->getMaxAge($response);
+                $maxAge = $this->getMaxAge($response);
                 $cacheItem
-                    ->expiresAfter($this->config['cache_lifetime'] + $expiresAt)
+                    ->expiresAfter($this->config['cache_lifetime'] + $maxAge)
                     ->set([
                     'response' => $response,
                     'body' => $body,
-                    'expiresAt' => $expiresAt,
+                    'expiresAt' => time() + $maxAge,
                     'createdAt' => time(),
                     'etag' => $response->getHeader('ETag'),
                 ]);