Increment the age of the response #59

Author: bmancone

src/Utils.php

@@ -44,14 +44,7 @@ public static function getDirective(MessageInterface $message, $part)
     public static function getResponseAge(ResponseInterface $response)
     {
         if ($response->hasHeader('Age')) {
-            $age = (int) $response->getHeader('Age');
-
-            // Increment the age based on the X-Guzzle-Cache-Date
-            if ($cacheDate = $response->getHeader('X-Guzzle-Cache-Date')) {
-                $age += (time() - strtotime($cacheDate));
-            }
-
-            return $age;
+            return (int) $response->getHeader('Age');
         }
 
         $date = strtotime($response->getHeader('Date') ?: 'now');
@@ -179,6 +172,12 @@ public static function isResponseValid(
         $responseAge = Utils::getResponseAge($response);
         $maxAge = Utils::getDirective($response, 'max-age');
 
+        // Increment the age based on the X-Guzzle-Cache-Date
+        if ($cacheDate = $response->getHeader('X-Guzzle-Cache-Date')) {
+            $responseAge += (time() - strtotime($cacheDate));
+            $response->setHeader('Age', $responseAge);
+        }
+
         // Check the request's max-age header against the age of the response
         if ($maxAge !== null && $responseAge > $maxAge) {
             return false;