style fix

Author: Nyholm

src/CachePlugin.php

@@ -99,7 +99,7 @@ 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']);
+                $cacheItem->set($data)->expiresAfter($this->config['cache_lifetime'] + $data['expiresAt']);
                 $this->pool->save($cacheItem);
 
                 return $this->createResponseFromCacheItem($cacheItem);
@@ -114,12 +114,13 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
                     $response = $response->withBody($this->streamFactory->createStream($body));
                 }
 
+                $expiresAt = time() + $this->getMaxAge($response);
                 $cacheItem
-                    ->expiresAfter($this->config['cache_lifetime'])
+                    ->expiresAfter($this->config['cache_lifetime'] + $expiresAt)
                     ->set([
                     'response' => $response,
                     'body' => $body,
-                    'expiresAt' => time() + $this->getMaxAge($response),
+                    'expiresAt' => $expiresAt,
                     'createdAt' => time(),
                     'etag' => $response->getHeader('ETag'),
                 ]);
@@ -268,7 +269,7 @@ private function getModifiedAt(CacheItemInterface $cacheItem)
     {
         $data = $cacheItem->get();
         if (!isset($data['createdAt'])) {
-            return null;
+            return;
         }
 
         return $data['createdAt'];
@@ -285,17 +286,17 @@ private function getETag(CacheItemInterface $cacheItem)
     {
         $data = $cacheItem->get();
         if (!isset($data['etag'])) {
-            return null;
+            return;
         }
 
         if (is_array($data['etag'])) {
-            foreach($data['etag'] as $etag) {
+            foreach ($data['etag'] as $etag) {
                 if (!empty($etag)) {
                     return $etag;
                 }
             }
 
-            return null;
+            return;
         }
 
         return $data['etag'];