guessExtension fallback to clientExtension #2128
Merged
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.
Description
Currently UploadedFile.php has
getExtension()
returning a string (not nullable) butMimes::guessExtensionFromType()
can return null, effectively causing an exception anytime a file is uploaded whose extension does not match the current Mime config list. This change causesgetExtension()
to return the client file's extension if Mime returns null.I suspect this was the original intent for passing
$this->getClientExtension()
as the second parameter toMimes::guessExtensionFromType()
, but that acts as an arbitrator for duplicates rather than a fallback.Checklist: