Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for lower and uppercase image extensions but always return the original extension for conversions #2683

Merged
merged 2 commits into from
Dec 3, 2021
Merged

Check for lower and uppercase image extensions but always return the original extension for conversions #2683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9f32a6
Update Conversion.php
timvanuum Dec 2, 2021
366d266
Change test to check if return extension is indeed uppercase as is th…
timvanuum Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Conversions/Conversion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ public function getResultExtension(string $originalFileExtension = ''): string
{
if ($this->shouldKeepOriginalImageFormat()) {
if (in_array(strtolower($originalFileExtension), ['jpg', 'jpeg', 'pjpg', 'png', 'gif'])) {
return strtolower($originalFileExtension);
return $originalFileExtension;
}
}

Expand Down
2 changes: 1 addition & 1 deletion tests/Conversions/ConversionFileExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function it_can_keep_the_original_image_format_if_the_original_file_is_an
{
$media = $this->testModelWithConversion->addMedia($this->getUppercaseExtensionTestPng())->toMediaCollection();

$this->assertExtensionEquals('png', $media->getUrl('keep_original_format'));
$this->assertExtensionEquals('PNG', $media->getUrl('keep_original_format'));
}

/** @test */
Expand Down