Merge pull request #338 from JefvdA/334-support-special-characters-in…

…-filename feat: add new optional fileNameFallBack argument
KnpLabs · Apr 19, 2024 · 24c61f0 · 24c61f0
2 parents fe25f99 + ccfce02
commit 24c61f0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/src/Snappy/Response/JpegResponse.php b/src/Snappy/Response/JpegResponse.php
@@ -4,8 +4,8 @@
 
 class JpegResponse extends SnappyResponse
 {
-    public function __construct($content, $fileName = 'output.jpg', $contentType = 'image/jpg', $contentDisposition = 'inline', $status = 200, $headers = [])
+    public function __construct($content, $fileName = 'output.jpg', $contentType = 'image/jpg', $contentDisposition = 'inline', $status = 200, $headers = [], $fileNameFallBack = '')
     {
-        parent::__construct($content, $fileName, $contentType, $contentDisposition, $status, $headers);
+        parent::__construct($content, $fileName, $contentType, $contentDisposition, $status, $headers, $fileNameFallBack);
     }
 }
diff --git a/src/Snappy/Response/PdfResponse.php b/src/Snappy/Response/PdfResponse.php
@@ -4,8 +4,8 @@
 
 class PdfResponse extends SnappyResponse
 {
-    public function __construct($content, $fileName = 'output.pdf', $contentType = 'application/pdf', $contentDisposition = 'attachment', $status = 200, $headers = [])
+    public function __construct($content, $fileName = 'output.pdf', $contentType = 'application/pdf', $contentDisposition = 'attachment', $status = 200, $headers = [], $fileNameFallBack = '')
     {
-        parent::__construct($content, $fileName, $contentType, $contentDisposition, $status, $headers);
+        parent::__construct($content, $fileName, $contentType, $contentDisposition, $status, $headers, $fileNameFallBack);
     }
 }
diff --git a/src/Snappy/Response/SnappyResponse.php b/src/Snappy/Response/SnappyResponse.php
@@ -7,7 +7,7 @@
 
 class SnappyResponse extends Base
 {
-    public function __construct($content, $fileName, $contentType, $contentDisposition = 'attachment', $status = 200, $headers = [])
+    public function __construct($content, $fileName, $contentType, $contentDisposition = 'attachment', $status = 200, $headers = [], $fileNameFallBack = '')
     {
         $contentDispositionDirectives = [ResponseHeaderBag::DISPOSITION_INLINE, ResponseHeaderBag::DISPOSITION_ATTACHMENT];
         if (!in_array($contentDisposition, $contentDispositionDirectives)) {
@@ -16,6 +16,6 @@ public function __construct($content, $fileName, $contentType, $contentDispositi
 
         parent::__construct($content, $status, $headers);
         $this->headers->add(['Content-Type' => $contentType]);
-        $this->headers->add(['Content-Disposition' => $this->headers->makeDisposition($contentDisposition, $fileName)]);
+        $this->headers->add(['Content-Disposition' => $this->headers->makeDisposition($contentDisposition, $fileName, $fileNameFallBack)]);
     }
 }
diff --git a/tests/Snappy/Response/JpegResponseTest.php b/tests/Snappy/Response/JpegResponseTest.php
@@ -34,4 +34,10 @@ public function testSetDifferentFileName(): void
 
         $this->assertSame($fileName, $matches[1]);
     }
+
+    public function testSpecialCharacters(): void
+    {
+        $response = new JpegResponse('', 'Ä.jpg', 'image/jpg', fileNameFallBack: 'thefilenamefallback.jpg');
+        $this->assertSame('inline; filename=thefilenamefallback.jpg; filename*=utf-8\'\'%C3%84.jpg', str_replace('"', '', $response->headers->get('Content-Disposition')));
+    }
 }
diff --git a/tests/Snappy/Response/PdfResponseTest.php b/tests/Snappy/Response/PdfResponseTest.php
@@ -34,4 +34,10 @@ public function testSetDifferentFileName(): void
 
         $this->assertSame($fileName, $matches[1]);
     }
+
+    public function testSpecialCharacters(): void
+    {
+        $response = new PdfResponse('', 'Ä.jpg', 'image/jpg', fileNameFallBack: 'thefilenamefallback.jpg');
+        $this->assertSame('attachment; filename=thefilenamefallback.jpg; filename*=utf-8\'\'%C3%84.jpg', str_replace('"', '', $response->headers->get('Content-Disposition')));
+    }
 }