Fix middleware "SetCacheHeaders" with file responses (#44063)

* Fix test is content empty when it is a file response because in this case, it is always empty * add test for cache header with file
laravel · Sep 9, 2022 · cbeb50b · cbeb50b
1 parent 1b20ec4
commit cbeb50b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Illuminate/Http/Middleware/SetCacheHeaders.php b/src/Illuminate/Http/Middleware/SetCacheHeaders.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Support\Carbon;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class SetCacheHeaders
 {
@@ -21,7 +22,7 @@ public function handle($request, Closure $next, $options = [])
     {
         $response = $next($request);
 
-        if (! $request->isMethodCacheable() || ! $response->getContent()) {
+        if (! $request->isMethodCacheable() || (! $response->getContent() && ! $response instanceof BinaryFileResponse)) {
             return $response;
         }
 

diff --git a/tests/Http/Middleware/CacheTest.php b/tests/Http/Middleware/CacheTest.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Carbon;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class CacheTest extends TestCase
 {
@@ -33,6 +34,16 @@ public function testDoNotSetHeaderWhenNoContent()
         $this->assertNull($response->getEtag());
     }
 
+    public function testSetHeaderToFileEvenWithNoContent()
+    {
+        $response = (new Cache)->handle(new Request, function ()  {
+            $filePath = __DIR__.'/../fixtures/test.txt';
+            return new BinaryFileResponse($filePath);
+        }, 'max_age=120;s_maxage=60');
+
+        $this->assertNotNull($response->getMaxAge());
+    }
+
     public function testAddHeaders()
     {
         $response = (new Cache)->handle(new Request, function () {