mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-08-20 12:41:23 +02:00
Code Issues Releases Wiki Activity

Merge pull request #951 from rez1dent3/master

Browse Source 
added the $format parameter to the save method
This commit is contained in:
Oliver Vogel
2019-06-24 16:06:31 +02:00
committed by GitHub
parent 5f5e1c8768 dcae042e71
commit 39eaef720d
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Intervention/Image/Image.php
View File

@@ -126,9 +126,10 @@ class Image extends File
*
* @param string $path
* @param int $quality
* @param string $format
* @return \Intervention\Image\Image
*/
public function save($path = null, $quality = null)
public function save($path = null, $quality = null, $format = null)
{
$path = is_null($path) ? $this->basePath() : $path;
@@ -138,7 +139,11 @@ class Image extends File
);
}
$data = $this->encode(pathinfo($path, PATHINFO_EXTENSION), $quality);
if ($format === null) {
$format = pathinfo($path, PATHINFO_EXTENSION);
}
$data = $this->encode($format, $quality);
$saved = @file_put_contents($path, $data);
if ($saved === false) {

20
tests/ImageTest.php
View File

@@ -1,6 +1,7 @@
<?php
use Intervention\Image\Image;
use Intervention\Image\ImageManager;
use PHPUnit\Framework\TestCase;
class ImageTest extends TestCase
@@ -44,6 +45,25 @@ class ImageTest extends TestCase
@unlink($save_as);
}
public function testFormatSave()
{
$save_as = __DIR__.'/tmp/test';
$config = ['driver' => new Intervention\Image\Imagick\Driver()];
$manager = new ImageManager($config);
$image = $manager->make('data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7');
$this->assertInstanceOf('Intervention\Image\Image', $image);
$this->assertInstanceOf('Imagick', $image->getCore());
$gifCore = $image->getCore();
$this->assertEquals($gifCore->getImageMimeType(), 'image/gif');
$image->save($save_as, null, 'jpg');
$this->assertEquals(\mime_content_type($save_as), 'image/jpeg');
@unlink($save_as);
}
public function testIsEncoded()
{
$image = $this->getTestImage();