[6.x] Fix pjpg format being used as file extension in AssetUploader (#14134)

Author: lwekuiper

src/Assets/AssetUploader.php

@@ -71,6 +71,10 @@ protected function getNewExtension()
             return null;
         }
 
+        if ($ext === 'pjpg') {
+            $ext = 'jpg';
+        }
+
         return $ext;
     }
 

tests/Assets/AssetTest.php

@@ -1912,6 +1912,36 @@ public function it_can_upload_an_image_into_a_container_with_new_extension_forma
         Event::assertDispatched(AssetSaved::class);
     }
 
+    #[Test]
+    public function it_normalizes_pjpg_format_to_jpg_extension_on_upload()
+    {
+        Event::fake();
+
+        config(['statamic.assets.image_manipulation.presets.progressive' => [
+            'fm' => 'pjpg',
+        ]]);
+
+        $this->container->sourcePreset('progressive');
+
+        $asset = (new Asset)->container($this->container)->path('path/to/asset.jpg')->syncOriginal();
+
+        Facades\AssetContainer::shouldReceive('findByHandle')->with('test_container')->andReturn($this->container);
+        Storage::disk('test')->assertMissing('path/to/asset.jpg');
+
+        ImageValidator::partialMock()
+            ->shouldReceive('isValidImage')
+            ->with('jpg', 'image/jpeg')
+            ->andReturnTrue()
+            ->once();
+
+        $return = $asset->upload(UploadedFile::fake()->image('asset.jpg', 20, 30));
+
+        $this->assertEquals($asset, $return);
+        Storage::disk('test')->assertMissing('path/to/asset.pjpg');
+        Storage::disk('test')->assertExists('path/to/asset.jpg');
+        $this->assertEquals('path/to/asset.jpg', $asset->path());
+    }
+
     #[Test]
     public function it_sanitizes_svgs_on_upload()
     {