always return stale on rejection (#169)

Kevinrob · Nov 9, 2023 · 6bd64db · 6bd64db
1 parent 65f85ca
commit 6bd64db
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/src/CacheMiddleware.php b/src/CacheMiddleware.php
@@ -237,11 +237,9 @@ function (ResponseInterface $response) use ($request, $cacheEntry) {
                     return static::addToCache($this->cacheStorage, $request, $response, $update);
                 },
                 function ($reason) use ($cacheEntry) {
-                    if ($reason instanceof TransferException) {
-                        $response = static::getStaleResponse($cacheEntry);
-                        if ($response instanceof ResponseInterface) {
-                            return $response;
-                        }
+                    $response = static::getStaleResponse($cacheEntry);
+                    if ($response instanceof ResponseInterface) {
+                        return $response;
                     }
 
                     return new RejectedPromise($reason);

diff --git a/tests/CacheMiddlewareTest.php b/tests/CacheMiddlewareTest.php
@@ -2,9 +2,11 @@
 
 namespace Kevinrob\GuzzleCache\Tests;
 
+use GuzzleHttp\Promise\RejectedPromise;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\Utils;
+use Kevinrob\GuzzleCache\CacheEntry;
 use Kevinrob\GuzzleCache\CacheMiddleware as BaseCacheMiddleware;
 use Kevinrob\GuzzleCache\Storage\Psr6CacheStorage;
 use Kevinrob\GuzzleCache\Strategy\CacheStrategyInterface;
@@ -35,6 +37,27 @@ public function testRewindAfterReadingStream()
 
         $this->assertEquals('seekable stream', $response->getBody()->getContents());
     }
+
+    public function testStaleOnRejected()
+    {
+        $request = new Request('GET', '/uri');
+        $response = (new Response())->withHeader('Cache-Control', 'stale-if-error=120');
+        $strategy = $this->createStub(CacheStrategyInterface::class);
+        $strategy->method('fetch')->willReturn(new CacheEntry(
+            $request,
+            $response,
+            new \DateTime('-1 second')
+        ));
+        $handler = function () {
+            return new RejectedPromise(new \RuntimeException('Unexpected error'));
+        };
+        $middleware = new CacheMiddleware($strategy);
+
+        $result = ($middleware($handler)($request, []))->wait();
+
+        $this->assertInstanceOf(ResponseInterface::class, $result);
+        $this->assertEquals(CacheMiddleware::HEADER_CACHE_STALE, $result->getHeaderLine(CacheMiddleware::HEADER_CACHE_INFO));
+    }
 }
 
 class CacheMiddleware extends BaseCacheMiddleware