[8.x] Fix validating image/jpeg images after Symfony/Mime update #35416
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Symfony/Mime v5.20 changed the returned extension for an image with image/jpeg mime type: symfony/mime@aa1d922 This breaks laravel image validation, as it relied on a return value of `.jpeg`. This commit changes `.jpeg` to `.jpg`, which fixes the validation. I coudn't find any tests for this part of the framework, but I'm not very familiar with the framework tests, so this might be an oversight on my part.
|
This will fix #35417. |
erikgaal
reviewed
Nov 30, 2020
| @@ -1036,7 +1036,7 @@ public function validateLte($attribute, $value, $parameters) | |||
| */ | |||
| public function validateImage($attribute, $value) | |||
| { | |||
| return $this->validateMimes($attribute, $value, ['jpeg', 'png', 'gif', 'bmp', 'svg', 'webp']); | |||
| return $this->validateMimes($attribute, $value, ['jpg', 'png', 'gif', 'bmp', 'svg', 'webp']); | |||
There was a problem hiding this comment.
We must keep the original jpeg item in the array for developers who use versions of symfony/mime prior to 5.2.0.
Suggested change
| return $this->validateMimes($attribute, $value, ['jpg', 'png', 'gif', 'bmp', 'svg', 'webp']); | |
| return $this->validateMimes($attribute, $value, ['jpeg', 'jpg', 'png', 'gif', 'bmp', 'svg', 'webp']); |
There was a problem hiding this comment.
Yeah, suppose you're right, fixed this
Nyholm
approved these changes
Nov 30, 2020
|
Please send to 6.x. We will then merge upwards. |
|
Because, yes, Laravel 6 is comparable with symfony mime 5.2. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Symfony/Mime v5.20 changed the returned extension for an image with image/jpeg mime type: symfony/mime@aa1d922
This breaks laravel image validation, as it relied on a return value of
.jpeg. This commit changes.jpegto.jpg, which fixes the validation. I coudn't find any tests for this part of the framework, but I'm not very familiar with the framework tests, so this might be an oversight on my part.Edit: Updated the test for this. I'm not sure if
getClientOriginalExtensionis reached in this case, so I did not alter the extension in that line of the test.