Refactor code to set default extension to 'jpg'

spatie · Dec 8, 2023 · 51303b8 · 51303b8
1 parent 4ee4a40
commit 51303b8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/Conversions/Actions/PerformManipulationsAction.php b/src/Conversions/Actions/PerformManipulationsAction.php
@@ -30,7 +30,8 @@ public function execute(
         }
 
         $image = Image::useImageDriver(config('media-library.image_driver'))
-            ->load($conversionTempFile);
+            ->load($conversionTempFile)
+            ->format('jpg');
 
         $conversion->getManipulations()->apply($image);
 
@@ -46,7 +47,13 @@ protected function getConversionTempFileName(
     ): string {
         $directory = pathinfo($imageFile, PATHINFO_DIRNAME);
 
-        $fileName = Str::random(32)."{$conversion->getName()}.{$media->extension}";
+        $extension = $media->extension;
+
+        if ($extension === '') {
+            $extension = 'jpg';
+        }
+
+        $fileName = Str::random(32)."{$conversion->getName()}.{$extension}";
 
         return "{$directory}/{$fileName}";
     }

diff --git a/src/Conversions/ImageGenerators/Svg.php b/src/Conversions/ImageGenerators/Svg.php
@@ -25,7 +25,7 @@ public function convert(string $file, Conversion $conversion = null): string
 
     public function requirementsAreInstalled(): bool
     {
-        return class_exists(\Imagick::class);
+        return class_exists(Imagick::class);
     }
 
     public function supportedExtensions(): Collection

diff --git a/tests/Conversions/ConversionTest.php b/tests/Conversions/ConversionTest.php
@@ -134,7 +134,7 @@
         ->nonOptimized()
         ->getManipulations()
         ->toArray();
-    ray($manipulations);
+
     $this->assertArrayNotHasKey('optimize', $manipulations);
 });