Merge branch '1.x' into 2.x

timkelty · timkelty · commit 0d7777d42ca4 · 2024-06-05T16:02:52.000-04:00
diff --git a/src/ImageTransformer.php b/src/ImageTransformer.php
@@ -125,7 +125,7 @@ protected function getFormatValue(ImageTransform $imageTransform): string
 
         return match ($imageTransform->format) {
             'jpg' => 'jpeg',
-            default => $imageTransform->format ?? 'auto',
+            default => $imageTransform->format,
         };
     }
 

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ protected function getFormatValue(ImageTransform $imageTransform): string`
`125`	`125`
`126`	`126`	`return match ($imageTransform->format) {`
`127`	`127`	`'jpg' => 'jpeg',`
`128`		`- default => $imageTransform->format ?? 'auto',`
	`128`	`+ default => $imageTransform->format,`
`129`	`129`	`};`
`130`	`130`	`}`
`131`	`131`