Allow set custom Content-Type for downloads

Author: natanfelles

src/ResponseDownload.php

@@ -39,6 +39,7 @@ trait ResponseDownload
     private $handle;
     private int $delay = 0;
     private int $readLength = 1024;
+    private ?string $contentType = null;
 
     /**
      * Sets a file to download/stream.
@@ -75,6 +76,7 @@ public function setDownload(
         $this->filepath = $realpath;
         $this->delay = $delay;
         $this->readLength = $readLength;
+        $this->contentType = $contentType;
         $filesize = @\filesize($this->filepath);
         if ($filesize === false) {
             throw new RuntimeException(
@@ -108,14 +110,17 @@ public function setDownload(
             }
         }
         $this->setHeader(ResponseHeader::CONTENT_LENGTH, (string) $this->filesize);
-        if ($contentType === null) {
-            $contentType = \mime_content_type($this->filepath) ?: 'application/octet-stream';
-        }
-        $this->setHeader(ResponseHeader::CONTENT_TYPE, $contentType);
+        $this->setHeader(ResponseHeader::CONTENT_TYPE, $this->makeContentType());
         $this->sendType = 'normal';
         return $this;
     }
 
+    private function makeContentType() : string
+    {
+        return $this->contentType
+            ?? \mime_content_type($this->filepath) ?: 'application/octet-stream';
+    }
+
     private function prepareRange(string $rangeLine) : void
     {
         $this->byteRanges = $this->parseByteRange($rangeLine);
@@ -223,7 +228,7 @@ private function setSinglePart(int $firstByte, int $lastByte) : void
         );
         $this->setHeader(
             ResponseHeader::CONTENT_TYPE,
-            \mime_content_type($this->filepath) ?: 'application/octet-stream'
+            $this->makeContentType()
         );
         $this->setHeader(
             ResponseHeader::CONTENT_RANGE,

tests/ResponseDownloadTest.php

@@ -221,6 +221,15 @@ public function testReadFileWithDelay() : void
     }
 
     public function testContentType() : void
+    {
+        $filepath = __DIR__ . '/files/logo.png';
+        $this->response->setDownload($filepath);
+        self::assertSame('image/png', $this->response->getHeader('Content-Type'));
+        $this->response->setDownload($filepath, contentType: 'foo/bar');
+        self::assertSame('foo/bar', $this->response->getHeader('Content-Type'));
+    }
+
+    public function testContentTypeWithoutAcceptRanges() : void
     {
         $filepath = __DIR__ . '/files/logo.png';
         $this->response->setDownload($filepath, acceptRanges: false);