Add gotenberg output filename

src/Builder/AsyncBuilderTrait.php

@@ -56,8 +56,9 @@ public function generateAsync(): void
         }
 
         if (null !== $this->fileName) {
-            // Gotenberg will add the extension to the file name (e.g. filename : "file.pdf" => generated file : "file.pdf.pdf").
-            $headers['Gotenberg-Output-Filename'] = $this->fileName;
+            /** @var string $basename Gotenberg will add the extension to the file name */
+            $basename = preg_replace('/\.[^.]+$/', '', $this->fileName);
+            $headers['Gotenberg-Output-Filename'] = $basename;
         }
         $this->client->call($this->getEndpoint(), $this->getMultipartFormData(), $headers);
     }

src/Builder/DefaultBuilderTrait.php

@@ -4,6 +4,7 @@
 
 use Psr\Log\LoggerInterface;
 use Sensiolabs\GotenbergBundle\Client\GotenbergClientInterface;
+use Sensiolabs\GotenbergBundle\Exception\InvalidBuilderConfiguration;
 use Sensiolabs\GotenbergBundle\Exception\JsonEncodingException;
 use Sensiolabs\GotenbergBundle\Formatter\AssetBaseDirFormatter;
 use Sensiolabs\GotenbergBundle\Processor\NullProcessor;
@@ -69,6 +70,10 @@ protected function encodeData(string $key, mixed $value): array
      */
     public function fileName(string $fileName, string $headerDisposition = HeaderUtils::DISPOSITION_INLINE): static
     {
+        if (!preg_match('/\.[^.]+$/', $fileName)) {
+            throw new InvalidBuilderConfiguration(\sprintf('File name "%s" needs to get extension as ".pdf", ".png" or any other valid extension.', $fileName));
+        }
+
         $this->fileName = $fileName;
         $this->headerDisposition = $headerDisposition;
 
@@ -216,11 +221,17 @@ public function generate(): GotenbergFileResult
 
         $processor = $this->processor ?? new NullProcessor();
 
+        $headers = [];
+        if (null !== $this->fileName) {
+            /** @var string $basename Gotenberg will add the extension to the file name */
+            $basename = preg_replace('/\.[^.]+$/', '', $this->fileName);
+            $headers['Gotenberg-Output-Filename'] = $basename;
+        }
+
         return new GotenbergFileResult(
-            $this->client->call($this->getEndpoint(), $this->getMultipartFormData()),
+            $this->client->call($this->getEndpoint(), $this->getMultipartFormData(), $headers),
             $processor($this->fileName),
             $this->headerDisposition,
-            $this->fileName,
         );
     }
 }

src/Builder/GotenbergFileResult.php

@@ -3,6 +3,7 @@
 namespace Sensiolabs\GotenbergBundle\Builder;
 
 use Sensiolabs\GotenbergBundle\Client\GotenbergResponse;
+use Sensiolabs\GotenbergBundle\Exception\ClientException;
 use Sensiolabs\GotenbergBundle\Exception\ProcessorException;
 use Symfony\Component\HttpFoundation\HeaderUtils;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
@@ -18,7 +19,6 @@ public function __construct(
         protected readonly GotenbergResponse $response,
         protected readonly \Generator $processorGenerator,
         protected readonly string $disposition,
-        protected readonly string|null $fileName = null,
     ) {
     }
 
@@ -61,11 +61,16 @@ public function process(): mixed
     public function stream(): StreamedResponse
     {
         $headers = $this->getHeaders();
-        $headers->set('X-Accel-Buffering', 'no'); // See https://symfony.com/doc/current/components/http_foundation.html#streaming-a-json-response
-        if (null !== $this->fileName) {
-            $headers->set('Content-Disposition', HeaderUtils::makeDisposition($this->disposition, $this->fileName));
+
+        if (!preg_match('/filename="([^"]+)"/', $headers->get('Content-Disposition', ''), $matches)) {
+            throw new ClientException('No Content-Disposition header returned by Gotenberg.');
         }
 
+        $contentDisposition = HeaderUtils::makeDisposition($this->disposition, $matches[1]);
+
+        $headers->set('X-Accel-Buffering', 'no'); // See https://symfony.com/doc/current/components/http_foundation.html#streaming-a-json-response
+        $headers->set('Content-Disposition', $contentDisposition);
+
         return new StreamedResponse(
             function (): void {
                 if (!$this->response->getStream()->valid()) {

tests/Builder/GotenbergFileResultTest.php

@@ -26,7 +26,9 @@ protected function setUp(): void
         $this->response = new GotenbergResponse(
             $client->stream($client->request('GET', '/')),
             200,
-            new ResponseHeaderBag(),
+            new ResponseHeaderBag([
+                'Content-Disposition' => 'inline; filename="file.pdf"',
+            ]),
         );
 
         $this->processorGenerator = (function () {
@@ -43,7 +45,7 @@ protected function setUp(): void
     #[TestDox('Response is processed')]
     public function testProcess(): void
     {
-        $result = new GotenbergFileResult($this->response, $this->processorGenerator, 'inline', 'file.pdf');
+        $result = new GotenbergFileResult($this->response, $this->processorGenerator, 'inline');
         $process = $result->process();
 
         self::assertSame('abc', $process);
@@ -53,7 +55,7 @@ public function testProcess(): void
     #[TestDox('Response is streamed')]
     public function testStream(): void
     {
-        $result = new GotenbergFileResult($this->response, $this->processorGenerator, 'inline', 'file.pdf');
+        $result = new GotenbergFileResult($this->response, $this->processorGenerator, 'inline');
         $stream = $result->stream();
 
         ob_start();

tests/Builder/Pdf/AbstractPdfBuilderTest.php

@@ -30,16 +30,20 @@ public function testFilenameIsCorrectlySetOnResponse(): void
     {
         // @phpstan-ignore-next-line
         $this->gotenbergClient = new GotenbergClient(new MockHttpClient([
-            new MockResponse(),
+            new MockResponse(info: [
+                'response_headers' => [
+                    'Content-Disposition' => 'attachment; filename="some_file.pdf"',
+                ],
+            ]),
         ]));
 
         $response = $this->getPdfBuilder()
-            ->fileName('some_file.png', HeaderUtils::DISPOSITION_ATTACHMENT)
+            ->fileName('some_file.pdf', HeaderUtils::DISPOSITION_ATTACHMENT)
             ->generate()
             ->stream()
         ;
 
-        self::assertSame('attachment; filename=some_file.png', $response->headers->get('Content-Disposition'));
+        self::assertSame('attachment; filename=some_file.pdf', $response->headers->get('Content-Disposition'));
     }
 
     public static function nativeNormalizersProvider(): \Generator

tests/Builder/Screenshot/AbstractScreenshotBuilderTest.php

@@ -30,7 +30,11 @@ public function testFilenameIsCorrectlySetOnResponse(): void
     {
         // @phpstan-ignore-next-line
         $this->gotenbergClient = new GotenbergClient(new MockHttpClient([
-            new MockResponse(),
+            new MockResponse(info: [
+                'response_headers' => [
+                    'Content-Disposition' => 'attachment; filename="some_file.png"',
+                ],
+            ]),
         ]));
 
         $response = $this->getScreenshotBuilder()