Fix reviews

docs/configuration.md

@@ -312,6 +312,9 @@ Enabled byd efault but can be disabled via the `sensiolabs_gotenberg.controller_
 
 ## download from
 
+> [!WARNING]  
+> URL of the file. It MUST return a `Content-Disposition` header with a filename parameter.
+
 To download files resource from URLs.
 
 ``` yaml

docs/pdf/builders_api/HtmlPdfBuilder.md

@@ -128,13 +128,13 @@ Resets the metadata.
 The metadata to write.
 
 * `downloadFrom(array $downloadFrom)`:
-Sets download from to download each entry (file) in parallel (default None).
-(URLs MUST return a Content-Disposition header with a filename parameter.).
 
 * `fileName(string $fileName, string $headerDisposition)`:
 
 * `processor(Sensiolabs\GotenbergBundle\Processor\ProcessorInterface $processor)`:
 
+* `withDownloadFrom(array $formFields, array $downloadFrom)`:
+
 * `addCookies(array $cookies)`:
 Add cookies to store in the Chromium cookie jar.
 

docs/pdf/builders_api/LibreOfficePdfBuilder.md

@@ -86,10 +86,10 @@ Specify if the resolution of each image is reduced to the resolution specified b
 If the form field reduceImageResolution is set to true, tell if all images will be reduced to the given value in DPI. Possible values are: 75, 150, 300, 600 and 1200.
 
 * `downloadFrom(array $downloadFrom)`:
-Sets download from to download each entry (file) in parallel (default None).
-(URLs MUST return a Content-Disposition header with a filename parameter.).
 
 * `fileName(string $fileName, string $headerDisposition)`:
 
 * `processor(Sensiolabs\GotenbergBundle\Processor\ProcessorInterface $processor)`:
 
+* `withDownloadFrom(array $formFields, array $downloadFrom)`:
+

docs/pdf/builders_api/MarkdownPdfBuilder.md

@@ -131,13 +131,13 @@ Resets the metadata.
 The metadata to write.
 
 * `downloadFrom(array $downloadFrom)`:
-Sets download from to download each entry (file) in parallel (default None).
-(URLs MUST return a Content-Disposition header with a filename parameter.).
 
 * `fileName(string $fileName, string $headerDisposition)`:
 
 * `processor(Sensiolabs\GotenbergBundle\Processor\ProcessorInterface $processor)`:
 
+* `withDownloadFrom(array $formFields, array $downloadFrom)`:
+
 * `addCookies(array $cookies)`:
 Add cookies to store in the Chromium cookie jar.
 

docs/pdf/builders_api/UrlPdfBuilder.md

@@ -130,13 +130,13 @@ Resets the metadata.
 The metadata to write.
 
 * `downloadFrom(array $downloadFrom)`:
-Sets download from to download each entry (file) in parallel (default None).
-(URLs MUST return a Content-Disposition header with a filename parameter.).
 
 * `fileName(string $fileName, string $headerDisposition)`:
 
 * `processor(Sensiolabs\GotenbergBundle\Processor\ProcessorInterface $processor)`:
 
+* `withDownloadFrom(array $formFields, array $downloadFrom)`:
+
 * `addCookies(array $cookies)`:
 Add cookies to store in the Chromium cookie jar.
 

docs/pdf/customization.md

@@ -529,6 +529,9 @@ class YourController
 
 ### download from
 
+> [!WARNING]  
+> URL of the file. It MUST return a `Content-Disposition` header with a filename parameter.
+
 To download files resource from URLs.
 
 ```php

docs/pdf/office-builder.md

@@ -773,6 +773,9 @@ class YourController
 
 ### download from
 
+> [!WARNING]  
+> URL of the file. It MUST return a `Content-Disposition` header with a filename parameter.
+
 To download files resource from URLs.
 
 ```php

docs/screenshot/builders_api/HtmlScreenshotBuilder.md

@@ -73,13 +73,13 @@ Adds additional files, like images, fonts, stylesheets, and so on (overrides any
 Adds a file, like an image, font, stylesheet, and so on.
 
 * `downloadFrom(array $downloadFrom)`:
-Sets download from to download each entry (file) in parallel (default None).
-(URLs MUST return a Content-Disposition header with a filename parameter.).
 
 * `fileName(string $fileName, string $headerDisposition)`:
 
 * `processor(Sensiolabs\GotenbergBundle\Processor\ProcessorInterface $processor)`:
 
+* `withDownloadFrom(array $formFields, array $downloadFrom)`:
+
 * `addCookies(array $cookies)`:
 Add cookies to store in the Chromium cookie jar.
 

docs/screenshot/builders_api/MarkdownScreenshotBuilder.md

@@ -76,13 +76,13 @@ Adds additional files, like images, fonts, stylesheets, and so on (overrides any
 Adds a file, like an image, font, stylesheet, and so on.
 
 * `downloadFrom(array $downloadFrom)`:
-Sets download from to download each entry (file) in parallel (default None).
-(URLs MUST return a Content-Disposition header with a filename parameter.).
 
 * `fileName(string $fileName, string $headerDisposition)`:
 
 * `processor(Sensiolabs\GotenbergBundle\Processor\ProcessorInterface $processor)`:
 
+* `withDownloadFrom(array $formFields, array $downloadFrom)`:
+
 * `addCookies(array $cookies)`:
 Add cookies to store in the Chromium cookie jar.
 

docs/screenshot/builders_api/UrlScreenshotBuilder.md

@@ -75,13 +75,13 @@ Adds additional files, like images, fonts, stylesheets, and so on (overrides any
 Adds a file, like an image, font, stylesheet, and so on.
 
 * `downloadFrom(array $downloadFrom)`:
-Sets download from to download each entry (file) in parallel (default None).
-(URLs MUST return a Content-Disposition header with a filename parameter.).
 
 * `fileName(string $fileName, string $headerDisposition)`:
 
 * `processor(Sensiolabs\GotenbergBundle\Processor\ProcessorInterface $processor)`:
 
+* `withDownloadFrom(array $formFields, array $downloadFrom)`:
+
 * `addCookies(array $cookies)`:
 Add cookies to store in the Chromium cookie jar.
 

docs/screenshot/customization.md

@@ -189,6 +189,9 @@ class YourController
 
 ### download from
 
+> [!WARNING]  
+> URL of the file. It MUST return a `Content-Disposition` header with a filename parameter.
+
 To download files resource from URLs.
 
 ```php

src/Builder/DownloadFromTrait.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace Sensiolabs\GotenbergBundle\Builder;
+
+use Sensiolabs\GotenbergBundle\Exception\MissingRequiredFieldException;
+
+trait DownloadFromTrait
+{
+    /**
+     * Sets download from to download each entry (file) in parallel (default None).
+     * (URLs MUST return a Content-Disposition header with a filename parameter.).
+     *
+     * @see https://gotenberg.dev/docs/routes#download-from
+     *
+     * @param list<array{url: string, extraHttpHeaders?: array<string, string>}> $downloadFrom
+     */
+    abstract public function downloadFrom(array $downloadFrom): static;
+
+    /**
+     * @param array{downloadFrom?: array<string, array{url: string, extraHttpHeaders?: array<string, string>}>} $formFields
+     * @param list<array{url: string, extraHttpHeaders?: array<string, string>}>                                $downloadFrom
+     */
+    public function withDownloadFrom(array &$formFields, array $downloadFrom): static
+    {
+        if ([] === $downloadFrom) {
+            unset($formFields['downloadFrom']);
+
+            return $this;
+        }
+
+        $formFields['downloadFrom'] = [];
+
+        foreach ($downloadFrom as $file) {
+            if (!\array_key_exists('url', $file)) {
+                throw new MissingRequiredFieldException('Missing field "url"');
+            }
+
+            $formFields['downloadFrom'][$file['url']] = $file;
+        }
+
+        return $this;
+    }
+
+    private function downloadFromNormalizer(array $value, callable $encoder): array
+    {
+        $downloadsFrom = array_values($value);
+        $data = [];
+
+        array_push($data, ...$downloadsFrom);
+
+        return $encoder('downloadFrom', $data);
+    }
+}

src/Builder/Pdf/AbstractChromiumPdfBuilder.php

@@ -522,31 +522,6 @@ public function addMetadata(string $key, string $value): static
         return $this;
     }
 
-    /**
-     * Sets download from to download each entry (file) in parallel (default None).
-     * (URLs MUST return a Content-Disposition header with a filename parameter.).
-     *
-     * @see https://gotenberg.dev/docs/routes#download-from
-     *
-     * @param list<array{url: string, extraHttpHeaders: array<string, string>}> $downloadFrom
-     */
-    public function downloadFrom(array $downloadFrom): static
-    {
-        if ([] === $downloadFrom) {
-            unset($this->formFields['downloadFrom']);
-
-            return $this;
-        }
-
-        $this->formFields['downloadFrom'] = [];
-
-        foreach ($downloadFrom as $file) {
-            $this->formFields['downloadFrom'][] = $file;
-        }
-
-        return $this;
-    }
-
     protected function withPdfPartFile(Part $pdfPart, string $path): static
     {
         $dataPart = new DataPart(

src/Builder/Pdf/AbstractPdfBuilder.php

@@ -3,12 +3,14 @@
 namespace Sensiolabs\GotenbergBundle\Builder\Pdf;
 
 use Sensiolabs\GotenbergBundle\Builder\DefaultBuilderTrait;
+use Sensiolabs\GotenbergBundle\Builder\DownloadFromTrait;
 use Sensiolabs\GotenbergBundle\Client\GotenbergClientInterface;
 use Sensiolabs\GotenbergBundle\Formatter\AssetBaseDirFormatter;
 
 abstract class AbstractPdfBuilder implements PdfBuilderInterface
 {
     use DefaultBuilderTrait;
+    use DownloadFromTrait;
 
     public function __construct(
         GotenbergClientInterface $gotenbergClient,
@@ -21,9 +23,15 @@ public function __construct(
             'metadata' => function (mixed $value): array {
                 return $this->encodeData('metadata', $value);
             },
-            'downloadFrom' => function (mixed $value): array {
-                return $this->encodeData('downloadFrom', $value);
-            },
+            'downloadFrom' => fn (array $value): array => $this->downloadFromNormalizer($value, $this->encodeData(...)),
         ];
     }
+
+    /**
+     * @param list<array{url: string, extraHttpHeaders: array<string, string>}> $downloadFrom
+     */
+    public function downloadFrom(array $downloadFrom): static
+    {
+        return $this->withDownloadFrom($this->formFields, $downloadFrom);
+    }
 }

src/Builder/Pdf/ConvertPdfBuilder.php

@@ -74,31 +74,6 @@ public function getMultipartFormData(): array
         return parent::getMultipartFormData();
     }
 
-    /**
-     * Sets download from to download each entry (file) in parallel (default None).
-     * (URLs MUST return a Content-Disposition header with a filename parameter.).
-     *
-     * @see https://gotenberg.dev/docs/routes#download-from
-     *
-     * @param list<array{url: string, extraHttpHeaders: array<string, string>}> $downloadFrom
-     */
-    public function downloadFrom(array $downloadFrom): static
-    {
-        if ([] === $downloadFrom) {
-            unset($this->formFields['downloadFrom']);
-
-            return $this;
-        }
-
-        $this->formFields['downloadFrom'] = [];
-
-        foreach ($downloadFrom as $file) {
-            $this->formFields['downloadFrom'][] = $file;
-        }
-
-        return $this;
-    }
-
     protected function getEndpoint(): string
     {
         return self::ENDPOINT;

src/Builder/Pdf/LibreOfficePdfBuilder.php

@@ -43,7 +43,7 @@ public function setConfigurations(array $configurations): static
     /**
      * Set the password for opening the source file.
      */
-    public function password(string $password): self
+    public function password(#[\SensitiveParameter] string $password): self
     {
         $this->formFields['password'] = $password;
 
@@ -347,31 +347,6 @@ public function getMultipartFormData(): array
         return parent::getMultipartFormData();
     }
 
-    /**
-     * Sets download from to download each entry (file) in parallel (default None).
-     * (URLs MUST return a Content-Disposition header with a filename parameter.).
-     *
-     * @see https://gotenberg.dev/docs/routes#download-from
-     *
-     * @param list<array{url: string, extraHttpHeaders: array<string, string>}> $downloadFrom
-     */
-    public function downloadFrom(array $downloadFrom): self
-    {
-        if ([] === $downloadFrom) {
-            unset($this->formFields['downloadFrom']);
-
-            return $this;
-        }
-
-        $this->formFields['downloadFrom'] = [];
-
-        foreach ($downloadFrom as $file) {
-            $this->formFields['downloadFrom'][] = $file;
-        }
-
-        return $this;
-    }
-
     protected function getEndpoint(): string
     {
         return self::ENDPOINT;

src/Builder/Pdf/MergePdfBuilder.php

@@ -96,31 +96,6 @@ public function getMultipartFormData(): array
         return parent::getMultipartFormData();
     }
 
-    /**
-     * Sets download from to download each entry (file) in parallel (default None).
-     * (URLs MUST return a Content-Disposition header with a filename parameter.).
-     *
-     * @see https://gotenberg.dev/docs/routes#download-from
-     *
-     * @param list<array{url: string, extraHttpHeaders: array<string, string>}> $downloadFrom
-     */
-    public function downloadFrom(array $downloadFrom): static
-    {
-        if ([] === $downloadFrom) {
-            unset($this->formFields['downloadFrom']);
-
-            return $this;
-        }
-
-        $this->formFields['downloadFrom'] = [];
-
-        foreach ($downloadFrom as $file) {
-            $this->formFields['downloadFrom'][] = $file;
-        }
-
-        return $this;
-    }
-
     protected function getEndpoint(): string
     {
         return self::ENDPOINT;