refactor(wkhtmltopdf): remove Orientation extra option (already managed by Snappy options)

Author: PedroTroller

src/Backend/WkHtmlToPdf/ExtraOption.php

@@ -12,18 +12,5 @@ abstract class ExtraOption
     /**
      * @param non-empty-array<string> $command
      */
-    public function __construct(private readonly bool $repeatable, private readonly array $command) {}
-
-    final public function isRepeatable(): bool
-    {
-        return $this->repeatable;
-    }
-
-    /**
-     * @return non-empty-array<string>
-     */
-    final public function getCommand(): array
-    {
-        return $this->command;
-    }
+    public function __construct(public readonly bool $repeatable, public readonly array $command) {}
 }

src/Backend/WkHtmlToPdf/ExtraOption/Orientation.php

@@ -5,7 +5,6 @@
 namespace KNPLabs\Snappy\Backend\WkHtmlToPdf\Tests;
 
 use KNPLabs\Snappy\Backend\WkHtmlToPdf\ExtraOption;
-use KNPLabs\Snappy\Core\Backend\Options\PageOrientation;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
@@ -142,16 +141,6 @@ public static function nonRepeatableProvider(): iterable
             ['--margin-top', '10mm'],
         ];
 
-        yield [
-            new ExtraOption\Orientation(PageOrientation::LANDSCAPE),
-            ['--orientation', 'Landscape'],
-        ];
-
-        yield [
-            new ExtraOption\Orientation(PageOrientation::PORTRAIT),
-            ['--orientation', 'Portrait'],
-        ];
-
         yield [
             new ExtraOption\PageHeight('297mm'),
             ['--page-height', '297mm'],
@@ -494,8 +483,8 @@ public static function nonRepeatableProvider(): iterable
     #[DataProvider('repeatableProvider')]
     public function testRepeatableOption(ExtraOption $option, array $command): void
     {
-        self::assertTrue($option->isRepeatable());
-        self::assertSame($option->getCommand(), $command);
+        self::assertTrue($option->repeatable);
+        self::assertSame($option->command, $command);
     }
 
     /**
@@ -504,7 +493,7 @@ public function testRepeatableOption(ExtraOption $option, array $command): void
     #[DataProvider('nonRepeatableProvider')]
     public function testNonRepeatableOption(ExtraOption $option, array $command): void
     {
-        self::assertFalse($option->isRepeatable());
-        self::assertSame($option->getCommand(), $command);
+        self::assertFalse($option->repeatable);
+        self::assertSame($option->command, $command);
     }
 }

src/Backend/WkHtmlToPdf/Tests/ExtraOptionTest.php

@@ -26,8 +26,14 @@ final class WkHtmlToPdfAdapterTest extends TestCase
 
     private WkHtmlToPdfAdapter $wkHtmlToPdfAdapter;
 
+    /**
+     * @var MockObject&StreamFactoryInterface
+     */
     private MockObject $streamFactory;
 
+    /**
+     * @var MockObject&UriFactoryInterface
+     */
     private MockObject $uriFactory;
 
     private string $tempDir;
@@ -75,8 +81,6 @@ public function testGenerateFromHtmlFile(): void
             self::fail('Erreur lors de la génération du PDF : '.$exception->getMessage());
         }
 
-        self::assertNotNull($resultStream);
-        self::assertInstanceOf(StreamInterface::class, $resultStream);
         self::assertNotEmpty($resultStream->getContents());
 
         unlink($testFilePath);
@@ -112,10 +116,14 @@ public function testGenerateWithAdditionalOptions(): void
 
         $this->wkHtmlToPdfAdapter = $this->factory->create($options);
 
+        $realpath = realpath($testFilePath);
+
+        self::assertIsString($realpath);
+
         $this->uriFactory
             ->method('createUri')
             ->with($testFilePath)
-            ->willReturn(new Uri(realpath($testFilePath)))
+            ->willReturn(new Uri($realpath))
         ;
 
         $stream = $this->createMock(StreamInterface::class);
@@ -128,8 +136,6 @@ public function testGenerateWithAdditionalOptions(): void
 
         $resultStream = $this->wkHtmlToPdfAdapter->generateFromHtmlFile(new \SplFileInfo($testFilePath));
 
-        self::assertNotNull($resultStream);
-        self::assertInstanceOf(StreamInterface::class, $resultStream);
         self::assertNotEmpty($resultStream->getContents());
 
         unlink($testFilePath);

src/Backend/WkHtmlToPdf/Tests/WkHtmlToPdfAdapterTest.php

@@ -36,10 +36,10 @@ public function __construct(
         private readonly StreamFactoryInterface $streamFactory,
         private readonly UriFactoryInterface $uriFactory,
     ) {
-        $this->validateOptions($options);
-
         $this->factory = $factory;
         $this->options = $options;
+
+        $this->compileOptions();
     }
 
     public function generateFromHtmlFile(\SplFileInfo $file): StreamInterface
@@ -81,51 +81,54 @@ public function generateFromUri(UriInterface $uri): StreamInterface
         return $this->streamFactory->createStreamFromResource($outputFile->resource);
     }
 
-    private function validateOptions(Options $options): void
+    /**
+     * @return array<string>
+     */
+    private function compileOptions(): array
     {
+        $options = [];
+
+        if ($this->options->pageOrientation instanceof PageOrientation) {
+            $options = [
+                ...$options,
+                '--orientation',
+                match ($this->options->pageOrientation) {
+                    PageOrientation::Portrait => 'Portrait',
+                    PageOrientation::Landscape => 'Landscape',
+                },
+            ];
+        }
+
         $optionTypes = [];
 
-        foreach ($options->extraOptions as $option) {
-            if (!$option instanceof ExtraOption) {
+        foreach ($this->options->extraOptions as $extraOption) {
+            if (!$extraOption instanceof ExtraOption) {
                 throw new \InvalidArgumentException(
                     \sprintf(
                         'Invalid option type provided. Expected "%s", received "%s".',
                         ExtraOption::class,
-                        get_debug_type($option),
+                        get_debug_type($extraOption),
                     )
                 );
             }
 
-            if (\in_array($option::class, $optionTypes, true) && !$option->isRepeatable()) {
+            if ($extraOption->repeatable && \in_array($extraOption::class, $optionTypes, true)) {
                 throw new \InvalidArgumentException(
                     \sprintf(
                         'Duplicate option type provided: "%s".',
-                        $option::class,
+                        $extraOption::class,
                     )
                 );
             }
 
-            $optionTypes[] = $option::class;
+            $options = [
+                ...$options,
+                ...$extraOption->command,
+            ];
+
+            $optionTypes[] = $extraOption::class;
         }
-    }
 
-    /**
-     * @return array<float|int|string>
-     */
-    private function compileOptions(): array
-    {
-        return array_reduce(
-            $this->options->extraOptions,
-            fn (array $carry, ExtraOption $extraOption): array => $extraOption instanceof ExtraOption\Orientation && $this->options->pageOrientation instanceof PageOrientation
-                ? [
-                    ...$carry,
-                    ...(new ExtraOption\Orientation($this->options->pageOrientation))->getCommand(),
-                ]
-                : [
-                    ...$carry,
-                    ...$extraOption->getCommand(),
-                ],
-            [],
-        );
+        return $options;
     }
 }