menvil · menvil · Jun 1, 2026 · Jun 1, 2026
diff --git a/app/Conversion/Drivers/Image/Concerns/RendersSingleImagePdf.php b/app/Conversion/Drivers/Image/Concerns/RendersSingleImagePdf.php
@@ -8,15 +8,26 @@
 use App\Support\Conversions\DTO\ConversionResult;
 use Barryvdh\DomPDF\Facade\Pdf;
 use Illuminate\Support\Facades\Storage;
+use Intervention\Image\Drivers\Gd\Driver;
+use Intervention\Image\ImageManager;
+use RuntimeException;
 
 trait RendersSingleImagePdf
 {
     private function renderPdf(ConversionContext $context, string $imageMimeType): ConversionResult
     {
-        $sourceContent = Storage::disk('local')->get($context->sourceFile->stored_path);
+        $storedPath = $context->sourceFile->stored_path;
+
+        if (! Storage::disk('local')->exists($storedPath)) {
+            throw new RuntimeException(
+                "RendersSingleImagePdf: source file not found at [{$storedPath}]."
+            );
+        }
+
+        $sourceContent = Storage::disk('local')->get($storedPath);
         $imageDataUri = "data:{$imageMimeType};base64,".base64_encode($sourceContent);
 
-        $pageSize = $context->options['page_size'] ?? 'a4';
+        $pageSize = $this->resolvePageSize($context->options['page_size'] ?? 'a4');
         $orientation = $this->resolveOrientation($context->options['orientation'] ?? 'auto', $sourceContent);
         $margin = $this->resolveMargin($context->options['margin'] ?? 'small');
         $fitMode = $context->options['fit_mode'] ?? 'contain';
@@ -37,22 +48,33 @@ private function renderPdf(ConversionContext $context, string $imageMimeType): C
         );
     }
 
+    private function resolvePageSize(string $pageSize): string
+    {
+        if ($pageSize === 'auto' || $pageSize === '') {
+            return 'a4';
+        }
+
+        return $pageSize;
+    }
+
     private function resolveOrientation(string $orientation, string $imageContent): string
     {
         if ($orientation !== 'auto') {
             return $orientation;
         }
 
-        $image = imagecreatefromstring($imageContent);
-        if ($image === false) {
-            return 'portrait';
-        }
+        $manager = new ImageManager(new Driver);
 
-        $width = imagesx($image);
-        $height = imagesy($image);
-        imagedestroy($image);
+        try {
+            $image = $manager->decodeBinary($imageContent);
+        } catch (\Throwable $e) {
+            throw new RuntimeException(
+                "RendersSingleImagePdf: could not decode image binary to determine orientation. {$e->getMessage()}",
+                previous: $e,
+            );
+        }
 
-        return $width > $height ? 'landscape' : 'portrait';
+        return $image->width() > $image->height() ? 'landscape' : 'portrait';
     }
 
     private function resolveMargin(string $margin): string

diff --git a/app/Conversion/Drivers/Image/Concerns/ResolvesImageQuality.php b/app/Conversion/Drivers/Image/Concerns/ResolvesImageQuality.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Conversion\Drivers\Image\Concerns;
+
+trait ResolvesImageQuality
+{
+    private function resolveQuality(mixed $quality): int
+    {
+        return match ($quality) {
+            'low' => 60,
+            'medium' => 75,
+            'high' => 90,
+            'max' => 100,
+            default => 85,
+        };
+    }
+}
diff --git a/app/Conversion/Drivers/Image/JpgToPngDriver.php b/app/Conversion/Drivers/Image/JpgToPngDriver.php
@@ -10,6 +10,7 @@
 use Illuminate\Support\Facades\Storage;
 use Intervention\Image\Drivers\Gd\Driver;
 use Intervention\Image\ImageManager;
+use RuntimeException;
 
 final class JpgToPngDriver implements ConverterDriver
 {
@@ -20,10 +21,16 @@ public function key(): string
 
     public function convert(ConversionContext $context): ConversionResult
     {
-        $manager = new ImageManager(new Driver);
+        $storedPath = $context->sourceFile->stored_path;
+
+        if (! Storage::disk('local')->exists($storedPath)) {
+            throw new RuntimeException(
+                "JpgToPngDriver: source file not found at [{$storedPath}]."
+            );
+        }
 
-        $sourcePath = Storage::disk('local')->path($context->sourceFile->stored_path);
-        $image = $manager->decodePath($sourcePath);
+        $manager = new ImageManager(new Driver);
+        $image = $manager->decodePath(Storage::disk('local')->path($storedPath));
 
         $encoded = $image->encodeUsingFileExtension('png');
 

diff --git a/app/Conversion/Drivers/Image/JpgToWebpDriver.php b/app/Conversion/Drivers/Image/JpgToWebpDriver.php
@@ -4,26 +4,36 @@
 
 namespace App\Conversion\Drivers\Image;
 
+use App\Conversion\Drivers\Image\Concerns\ResolvesImageQuality;
 use App\Support\Conversions\Contracts\ConverterDriver;
 use App\Support\Conversions\DTO\ConversionContext;
 use App\Support\Conversions\DTO\ConversionResult;
 use Illuminate\Support\Facades\Storage;
 use Intervention\Image\Drivers\Gd\Driver;
 use Intervention\Image\ImageManager;
+use RuntimeException;
 
 final class JpgToWebpDriver implements ConverterDriver
 {
+    use ResolvesImageQuality;
+
     public function key(): string
     {
         return 'jpg_to_webp';
     }
 
     public function convert(ConversionContext $context): ConversionResult
     {
-        $manager = new ImageManager(new Driver);
+        $storedPath = $context->sourceFile->stored_path;
 
-        $sourcePath = Storage::disk('local')->path($context->sourceFile->stored_path);
-        $image = $manager->decodePath($sourcePath);
+        if (! Storage::disk('local')->exists($storedPath)) {
+            throw new RuntimeException(
+                "JpgToWebpDriver: source file not found at [{$storedPath}]."
+            );
+        }
+
+        $manager = new ImageManager(new Driver);
+        $image = $manager->decodePath(Storage::disk('local')->path($storedPath));
 
         $quality = $this->resolveQuality($context->options['quality'] ?? 'high');
 
@@ -40,15 +50,4 @@ public function convert(ConversionContext $context): ConversionResult
             sizeBytes: Storage::disk('local')->size($outputPath),
         );
     }
-
-    private function resolveQuality(mixed $quality): int
-    {
-        return match ($quality) {
-            'low' => 60,
-            'medium' => 75,
-            'high' => 90,
-            'max' => 100,
-            default => 85,
-        };
-    }
 }
diff --git a/app/Conversion/Drivers/Image/PngToJpgDriver.php b/app/Conversion/Drivers/Image/PngToJpgDriver.php
@@ -4,26 +4,36 @@
 
 namespace App\Conversion\Drivers\Image;
 
+use App\Conversion\Drivers\Image\Concerns\ResolvesImageQuality;
 use App\Support\Conversions\Contracts\ConverterDriver;
 use App\Support\Conversions\DTO\ConversionContext;
 use App\Support\Conversions\DTO\ConversionResult;
 use Illuminate\Support\Facades\Storage;
 use Intervention\Image\Drivers\Gd\Driver;
 use Intervention\Image\ImageManager;
+use RuntimeException;
 
 final class PngToJpgDriver implements ConverterDriver
 {
+    use ResolvesImageQuality;
+
     public function key(): string
     {
         return 'png_to_jpg';
     }
 
     public function convert(ConversionContext $context): ConversionResult
     {
-        $manager = new ImageManager(new Driver);
+        $storedPath = $context->sourceFile->stored_path;
 
-        $sourcePath = Storage::disk('local')->path($context->sourceFile->stored_path);
-        $image = $manager->decodePath($sourcePath);
+        if (! Storage::disk('local')->exists($storedPath)) {
+            throw new RuntimeException(
+                "PngToJpgDriver: source file not found at [{$storedPath}]."
+            );
+        }
+
+        $manager = new ImageManager(new Driver);
+        $image = $manager->decodePath(Storage::disk('local')->path($storedPath));
 
         $background = $context->options['background'] ?? '#ffffff';
         $quality = $this->resolveQuality($context->options['quality'] ?? 'high');
@@ -43,15 +53,4 @@ public function convert(ConversionContext $context): ConversionResult
             sizeBytes: Storage::disk('local')->size($outputPath),
         );
     }
-
-    private function resolveQuality(mixed $quality): int
-    {
-        return match ($quality) {
-            'low' => 60,
-            'medium' => 75,
-            'high' => 90,
-            'max' => 100,
-            default => 85,
-        };
-    }
 }
diff --git a/app/Conversion/Drivers/Image/PngToWebpDriver.php b/app/Conversion/Drivers/Image/PngToWebpDriver.php
@@ -4,26 +4,36 @@
 
 namespace App\Conversion\Drivers\Image;
 
+use App\Conversion\Drivers\Image\Concerns\ResolvesImageQuality;
 use App\Support\Conversions\Contracts\ConverterDriver;
 use App\Support\Conversions\DTO\ConversionContext;
 use App\Support\Conversions\DTO\ConversionResult;
 use Illuminate\Support\Facades\Storage;
 use Intervention\Image\Drivers\Gd\Driver;
 use Intervention\Image\ImageManager;
+use RuntimeException;
 
 final class PngToWebpDriver implements ConverterDriver
 {
+    use ResolvesImageQuality;
+
     public function key(): string
     {
         return 'png_to_webp';
     }
 
     public function convert(ConversionContext $context): ConversionResult
     {
-        $manager = new ImageManager(new Driver);
+        $storedPath = $context->sourceFile->stored_path;
 
-        $sourcePath = Storage::disk('local')->path($context->sourceFile->stored_path);
-        $image = $manager->decodePath($sourcePath);
+        if (! Storage::disk('local')->exists($storedPath)) {
+            throw new RuntimeException(
+                "PngToWebpDriver: source file not found at [{$storedPath}]."
+            );
+        }
+
+        $manager = new ImageManager(new Driver);
+        $image = $manager->decodePath(Storage::disk('local')->path($storedPath));
 
         $quality = $this->resolveQuality($context->options['quality'] ?? 'high');
 
@@ -40,15 +50,4 @@ public function convert(ConversionContext $context): ConversionResult
             sizeBytes: Storage::disk('local')->size($outputPath),
         );
     }
-
-    private function resolveQuality(mixed $quality): int
-    {
-        return match ($quality) {
-            'low' => 60,
-            'medium' => 75,
-            'high' => 90,
-            'max' => 100,
-            default => 85,
-        };
-    }
 }
diff --git a/resources/views/pdf/single-image.blade.php b/resources/views/pdf/single-image.blade.php
@@ -3,35 +3,24 @@
 <head>
 <meta charset="UTF-8">
 <style>
-    * { margin: 0; padding: 0; box-sizing: border-box; }
+    * { margin: 0; padding: 0; }
     body { margin: {{ $margin }}; }
-    .image-container {
-        width: 100%;
-        height: 100%;
-        @if ($fitMode === 'contain')
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        @endif
-    }
-    img {
-        @if ($fitMode === 'contain')
-        max-width: 100%;
-        max-height: 100%;
-        object-fit: contain;
-        @elseif ($fitMode === 'fill')
-        width: 100%;
-        height: 100%;
-        object-fit: fill;
-        @else
-        display: block;
-        @endif
-    }
+    @if ($fitMode === 'contain')
+    table { width: 100%; height: 100%; border-collapse: collapse; }
+    td { text-align: center; vertical-align: middle; }
+    img { max-width: 100%; max-height: 100%; }
+    @elseif ($fitMode === 'cover')
+    img { width: 100%; height: 100%; }
+    @else
+    img { display: block; }
+    @endif
 </style>
 </head>
 <body>
-<div class="image-container">
-    <img src="{{ $imageDataUri }}" alt="">
-</div>
+@if ($fitMode === 'contain')
+<table><tr><td><img src="{{ $imageDataUri }}" alt=""></td></tr></table>
+@else
+<img src="{{ $imageDataUri }}" alt="">
+@endif
 </body>
 </html>
diff --git a/tests/Feature/Conversion/Drivers/JpgToPdfDriverTest.php b/tests/Feature/Conversion/Drivers/JpgToPdfDriverTest.php
@@ -13,7 +13,6 @@
     $sourcePath = ImageFixture::jpg('source.jpg', width: 600, height: 400);
     $context = ConversionContextFactory::forSourcePath(
         sourcePath: $sourcePath,
-        outputExtension: 'pdf',
         options: [
             'page_size' => 'a4',
             'orientation' => 'auto',

diff --git a/tests/Feature/Conversion/Drivers/JpgToPngDriverTest.php b/tests/Feature/Conversion/Drivers/JpgToPngDriverTest.php
@@ -13,7 +13,6 @@
     $sourcePath = ImageFixture::jpg('source.jpg', width: 600, height: 400);
     $context = ConversionContextFactory::forSourcePath(
         sourcePath: $sourcePath,
-        outputExtension: 'png',
         options: [
             'resize' => 'original',
             'remove_metadata' => true,

diff --git a/tests/Feature/Conversion/Drivers/JpgToWebpDriverTest.php b/tests/Feature/Conversion/Drivers/JpgToWebpDriverTest.php
@@ -13,7 +13,6 @@
     $sourcePath = ImageFixture::jpg('source.jpg', width: 600, height: 400);
     $context = ConversionContextFactory::forSourcePath(
         sourcePath: $sourcePath,
-        outputExtension: 'webp',
         options: [
             'quality' => 'high',
             'resize' => 'original',

diff --git a/tests/Feature/Conversion/Drivers/PngToJpgDriverTest.php b/tests/Feature/Conversion/Drivers/PngToJpgDriverTest.php
@@ -13,7 +13,6 @@
     $sourcePath = ImageFixture::png('source.png', width: 600, height: 400);
     $context = ConversionContextFactory::forSourcePath(
         sourcePath: $sourcePath,
-        outputExtension: 'jpg',
         options: [
             'quality' => 'high',
             'background' => '#ffffff',

diff --git a/tests/Feature/Conversion/Drivers/PngToPdfDriverTest.php b/tests/Feature/Conversion/Drivers/PngToPdfDriverTest.php
@@ -13,7 +13,6 @@
     $sourcePath = ImageFixture::png('source.png', width: 600, height: 400);
     $context = ConversionContextFactory::forSourcePath(
         sourcePath: $sourcePath,
-        outputExtension: 'pdf',
         options: [
             'page_size' => 'a4',
             'orientation' => 'auto',

diff --git a/tests/Feature/Conversion/Drivers/PngToWebpDriverTest.php b/tests/Feature/Conversion/Drivers/PngToWebpDriverTest.php
@@ -13,7 +13,6 @@
     $sourcePath = ImageFixture::png('source.png', width: 600, height: 400);
     $context = ConversionContextFactory::forSourcePath(
         sourcePath: $sourcePath,
-        outputExtension: 'webp',
         options: [
             'quality' => 'high',
             'resize' => 'original',

diff --git a/tests/Support/ConversionContextFactory.php b/tests/Support/ConversionContextFactory.php
@@ -16,7 +16,6 @@ final class ConversionContextFactory
      */
     public static function forSourcePath(
         string $sourcePath,
-        string $outputExtension,
         array $options = [],
     ): ConversionContext {
         $sourceFile = new FileRecord;