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

[8.x] Add GIF, WEBP, WBMP, BMP support to FileFactory::image() #37743

Merged
merged 1 commit into from
Jun 21, 2021
+69 −16
Merged

[8.x] Add GIF, WEBP, WBMP, BMP support to FileFactory::image() #37743

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 9 additions & 14 deletions src/Illuminate/Http/Testing/FileFactory.php
View file
Original file line number Diff line number Diff line change
@@ -2,8 +2,6 @@

namespace Illuminate\Http\Testing;

use Illuminate\Support\Str;

class FileFactory
{
/**
@@ -55,7 +53,7 @@ public function createWithContent($name, $content)
public function image($name, $width = 10, $height = 10)
{
return new File($name, $this->generateImage(
$width, $height, Str::endsWith(Str::lower($name), ['.jpg', '.jpeg']) ? 'jpeg' : 'png'
$width, $height, pathinfo($name, PATHINFO_EXTENSION)
));
}

@@ -64,24 +62,21 @@ public function image($name, $width = 10, $height = 10)
*
* @param int $width
* @param int $height
* @param string $type
* @param string $extension
* @return resource
*/
protected function generateImage($width, $height, $type)
protected function generateImage($width, $height, $extension)
{
return tap(tmpfile(), function ($temp) use ($width, $height, $type) {
return tap(tmpfile(), function ($temp) use ($width, $height, $extension) {
ob_start();

$extension = in_array($extension, ['jpeg', 'png', 'gif', 'webp', 'wbmp', 'bmp'])
? strtolower($extension)
: 'jpeg';

$image = imagecreatetruecolor($width, $height);

switch ($type) {
case 'jpeg':
imagejpeg($image);
break;
case 'png':
imagepng($image);
break;
}
call_user_func("image{$extension}", $image);

fwrite($temp, ob_get_clean());
});
62 changes: 60 additions & 2 deletions tests/Http/HttpTestingFileFactoryTest.php
View file
Original file line number Diff line number Diff line change
@@ -28,13 +28,71 @@ public function testImageJpeg()
$this->markTestSkipped('The extension gd is missing from your system or was compiled without JPEG support.');
}

$image = (new FileFactory)->image('test.jpeg', 15, 20);
$jpeg = (new FileFactory)->image('test.jpeg', 15, 20);
$jpg = (new FileFactory)->image('test.jpg');

$info = getimagesize($image->getRealPath());
$info = getimagesize($jpeg->getRealPath());

$this->assertSame('image/jpeg', $info['mime']);
$this->assertSame(15, $info[0]);
$this->assertSame(20, $info[1]);
$this->assertSame(
'image/jpeg',
mime_content_type($jpg->getRealPath())
);
}

public function testImageGif()
{
if (! function_exists('imagegif'))
$this->markTestSkipped('The extension gd is missing from your system or was compiled without GIF support.');

$image = (new FileFactory)->image('test.gif');

$this->assertSame(
'image/gif',
mime_content_type($image->getRealPath())
);
}

public function testImageWebp()
{
if (! function_exists('imagewebp'))
$this->markTestSkipped('The extension gd is missing from your system or was compiled without WEBP support.');

$image = (new FileFactory)->image('test.webp');

$this->assertSame(
'image/webp',
mime_content_type($image->getRealPath())
);
}

public function testImageWbmp()
{
if (! function_exists('imagewbmp'))
$this->markTestSkipped('The extension gd is missing from your system or was compiled without WBMP support.');

$image = (new FileFactory)->image('test.wbmp');

$this->assertSame(
'image/vnd.wap.wbmp',
getimagesize($image->getRealPath())['mime']
);
}

public function testImageBmp()
{
if (! function_exists('imagebmp'))
$this->markTestSkipped('The extension gd is missing from your system or was compiled without BMP support.');

$image = (new FileFactory)->image('test.bmp');

$imagePath = $image->getRealPath();

$this->assertSame('image/x-ms-bmp', mime_content_type($imagePath));

$this->assertSame('image/bmp', getimagesize($imagePath)['mime']);
}

public function testCreateWithMimeType()