[HttpClient] Consider cached responses without expiration as immediately stale

Author: Lctrs

CachingHttpClient.php

@@ -559,7 +559,7 @@ private function evaluateCacheFreshness(array $data): Freshness
         $now = time();
         $expires = $data['expires_at'];
 
-        if (null === $expires || $now <= $expires) {
+        if (null !== $expires && $now <= $expires) {
             return Freshness::Fresh;
         }
 

Tests/CachingHttpClientTest.php

@@ -92,6 +92,9 @@ public function testItServesResponseFromCache()
         $mockClient = new MockHttpClient([
             new MockResponse('foo', [
                 'http_code' => 200,
+                'response_headers' => [
+                    'Cache-Control' => 'max-age=300',
+                ],
             ]),
             new MockResponse('should not be served'),
         ]);
@@ -119,6 +122,7 @@ public function testItSupportsVaryHeader()
             new MockResponse('foo', [
                 'http_code' => 200,
                 'response_headers' => [
+                    'Cache-Control' => 'max-age=300',
                     'Vary' => 'Foo, Bar',
                 ],
             ]),
@@ -183,6 +187,34 @@ public function testItDoesntServeAStaleResponse()
         self::assertSame('bar', $response->getContent());
     }
 
+    public function testAResponseWithoutExpirationAsStale()
+    {
+        $mockClient = new MockHttpClient([
+            new MockResponse('foo', [
+                'http_code' => 200,
+                'response_headers' => [
+                    'Cache-Control' => 'public',
+                ],
+            ]),
+            new MockResponse('bar'),
+        ]);
+
+        $client = new CachingHttpClient(
+            $mockClient,
+            $this->cacheAdapter,
+        );
+
+        // The first request returns "foo".
+        $response = $client->request('GET', 'http://example.com/foo-bar');
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('foo', $response->getContent());
+
+        // After an extra second the cache expires, so a new response is served.
+        $response = $client->request('GET', 'http://example.com/foo-bar');
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('bar', $response->getContent());
+    }
+
     public function testItRevalidatesAResponseWithNoCacheDirective()
     {
         $mockClient = new MockHttpClient([
@@ -329,7 +361,7 @@ public function testASharedCacheStoresAResponseWithPublicDirectiveFromRequestWit
             new MockResponse('foo', [
                 'http_code' => 200,
                 'response_headers' => [
-                    'Cache-Control' => 'public',
+                    'Cache-Control' => 'public, max-age=300',
                 ],
             ]),
             new MockResponse('should not be served'),
@@ -580,7 +612,12 @@ public function testItCanStreamAsyncResponse()
     public function testItCanStreamCachedResponse()
     {
         $mockClient = new MockHttpClient([
-            new MockResponse('foo', ['http_code' => 200]),
+            new MockResponse('foo', [
+                'http_code' => 200,
+                'response_headers' => [
+                    'Cache-Control' => 'max-age=300',
+                ],
+            ]),
         ]);
 
         $client = new CachingHttpClient(
@@ -604,7 +641,12 @@ public function testItCanStreamCachedResponse()
     public function testItCanStreamBoth()
     {
         $mockClient = new MockHttpClient([
-            new MockResponse('foo', ['http_code' => 200]),
+            new MockResponse('foo', [
+                'http_code' => 200,
+                'response_headers' => [
+                    'Cache-Control' => 'max-age=300',
+                ],
+            ]),
             new MockResponse('bar', ['http_code' => 200]),
         ]);
 
@@ -873,7 +915,12 @@ public function testHeuristicFreshnessWithLastModified()
     public function testResponseInfluencingHeadersAffectCacheKey()
     {
         $mockClient = new MockHttpClient([
-            new MockResponse('response for en', ['http_code' => 200]),
+            new MockResponse('response for en', [
+                'http_code' => 200,
+                'response_headers' => [
+                    'Cache-Control' => 'max-age=300',
+                ],
+            ]),
             new MockResponse('response for fr', ['http_code' => 200]),
         ]);