[5.6] Add JPEG support to FileFactory::image() #24853
Merged
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
SimonStaudenmeir
force-pushed
the
fake-image-jpg
branch
from
5b97b34 to
a451a2b
Compare
tzsk
reviewed
Jul 17, 2018
| @@ -28,7 +30,9 @@ public function create($name, $kilobytes = 0) | |||
| */ | |||
| public function image($name, $width = 10, $height = 10) | |||
| { | |||
| return new File($name, $this->generateImage($width, $height)); | |||
| $type = Str::endsWith($name, ['.jpg', '.jpeg']) ? 'jpeg' : 'png'; | |||
There was a problem hiding this comment.
I would use strtolower($name) because in some cases image.JPG might also come.
|
This could cause a tests failure if your testing environment is not configure |
|
Same error here... :( |
|
If you have failing tests, test with a png image by making sure it has .png file extension. |
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.
Currently, when generating dummy images for testing,
FileFactory::image()always creates a PNG:This PR checks the file extension and creates JPEG images when the filename ends with
.jpegor.jpg.The tests use
getimagesize()instead of$image->getMimeType().getMimeType()derives the mime type from the filename, whilegetimagesize()examines the actual file.