mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-09-02 10:23:29 +02:00
Code Issues Releases Wiki Activity

Switch EncodedImage::class to temporary stream resource

Browse Source
This commit is contained in:
Oliver Vogel
2024-10-06 11:36:17 +02:00
committed by GitHub
parent e244bc9c93
commit e77a33394c
44 changed files with 269 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Unit/Drivers/Gd/Encoders/AvifEncoderTest.php
View File

@@ -19,6 +19,6 @@ final class AvifEncoderTest extends GdTestCase
$image = $this->createTestImage(3, 2);
$encoder = new AvifEncoder(10);
$result = $encoder->encode($image);
$this->assertMediaType('image/avif', (string) $result);
$this->assertMediaType('image/avif', $result);
}
}

2
tests/Unit/Drivers/Gd/Encoders/BmpEncoderTest.php
View File

@@ -19,6 +19,6 @@ final class BmpEncoderTest extends GdTestCase
$image = $this->createTestImage(3, 2);
$encoder = new BmpEncoder();
$result = $encoder->encode($image);
$this->assertMediaType(['image/bmp', 'image/x-ms-bmp'], (string) $result);
$this->assertMediaType(['image/bmp', 'image/x-ms-bmp'], $result);
}
}

6
tests/Unit/Drivers/Gd/Encoders/GifEncoderTest.php
View File

@@ -20,7 +20,7 @@ final class GifEncoderTest extends GdTestCase
$image = $this->createTestAnimation();
$encoder = new GifEncoder();
$result = $encoder->encode($image);
$this->assertMediaType('image/gif', (string) $result);
$this->assertMediaType('image/gif', $result);
$this->assertFalse(
Decoder::decode((string) $result)->getFirstFrame()->getImageDescriptor()->isInterlaced()
);
@@ -31,7 +31,7 @@ final class GifEncoderTest extends GdTestCase
$image = $this->createTestImage(3, 2);
$encoder = new GifEncoder(interlaced: true);
$result = $encoder->encode($image);
$this->assertMediaType('image/gif', (string) $result);
$this->assertMediaType('image/gif', $result);
$this->assertTrue(
Decoder::decode((string) $result)->getFirstFrame()->getImageDescriptor()->isInterlaced()
);
@@ -42,7 +42,7 @@ final class GifEncoderTest extends GdTestCase
$image = $this->createTestAnimation(3, 2);
$encoder = new GifEncoder(interlaced: true);
$result = $encoder->encode($image);
$this->assertMediaType('image/gif', (string) $result);
$this->assertMediaType('image/gif', $result);
$this->assertTrue(
Decoder::decode((string) $result)->getFirstFrame()->getImageDescriptor()->isInterlaced()
);

6
tests/Unit/Drivers/Gd/Encoders/JpegEncoderTest.php
View File

@@ -22,7 +22,7 @@ final class JpegEncoderTest extends GdTestCase
$image = $this->createTestImage(3, 2);
$encoder = new JpegEncoder(75);
$result = $encoder->encode($image);
$this->assertMediaType('image/jpeg', (string) $result);
$this->assertMediaType('image/jpeg', $result);
}
public function testEncodeProgressive(): void
@@ -30,7 +30,7 @@ final class JpegEncoderTest extends GdTestCase
$image = $this->createTestImage(3, 2);
$encoder = new JpegEncoder(progressive: true);
$result = $encoder->encode($image);
$this->assertMediaType('image/jpeg', (string) $result);
$this->assertTrue($this->isProgressiveJpeg((string) $result));
$this->assertMediaType('image/jpeg', $result);
$this->assertTrue($this->isProgressiveJpeg($result));
}
}

10
tests/Unit/Drivers/Gd/Encoders/PngEncoderTest.php
View File

@@ -24,8 +24,8 @@ final class PngEncoderTest extends GdTestCase
$image = $this->createTestImage(3, 2);
$encoder = new PngEncoder();
$result = $encoder->encode($image);
$this->assertMediaType('image/png', (string) $result);
$this->assertFalse($this->isInterlacedPng((string) $result));
$this->assertMediaType('image/png', $result);
$this->assertFalse($this->isInterlacedPng($result));
}
public function testEncodeInterlaced(): void
@@ -33,8 +33,8 @@ final class PngEncoderTest extends GdTestCase
$image = $this->createTestImage(3, 2);
$encoder = new PngEncoder(interlaced: true);
$result = $encoder->encode($image);
$this->assertMediaType('image/png', (string) $result);
$this->assertTrue($this->isInterlacedPng((string) $result));
$this->assertMediaType('image/png', $result);
$this->assertTrue($this->isInterlacedPng($result));
}
#[DataProvider('indexedDataProvider')]
@@ -42,7 +42,7 @@ final class PngEncoderTest extends GdTestCase
{
$this->assertEquals(
$result,
$this->pngColorType((string) $encoder->encode($image)),
$this->pngColorType($encoder->encode($image)),
);
}

2
tests/Unit/Drivers/Gd/Encoders/WebpEncoderTest.php
View File

@@ -19,6 +19,6 @@ final class WebpEncoderTest extends GdTestCase
$image = $this->createTestImage(3, 2);
$encoder = new WebpEncoder(75);
$result = $encoder->encode($image);
$this->assertMediaType('image/webp', (string) $result);
$this->assertMediaType('image/webp', $result);
}
}

34
tests/Unit/Drivers/Gd/ImageTest.php
View File

@@ -142,48 +142,48 @@ final class ImageTest extends GdTestCase
{
$result = $this->readTestImage('blue.gif')->encode();
$this->assertInstanceOf(EncodedImage::class, $result);
$this->assertMediaType('image/gif', (string) $result);
$this->assertMediaType('image/gif', $result);
}
public function testEncodeByMediaType(): void
{
$result = $this->readTestImage('blue.gif')->encodeByMediaType();
$this->assertInstanceOf(EncodedImage::class, $result);
$this->assertMediaType('image/gif', (string) $result);
$this->assertMediaType('image/gif', $result);
$result = $this->readTestImage('blue.gif')->encodeByMediaType('image/png');
$this->assertInstanceOf(EncodedImage::class, $result);
$this->assertMediaType('image/png', (string) $result);
$this->assertMediaType('image/png', $result);
$result = $this->readTestImage('blue.gif')->encodeByMediaType(MediaType::IMAGE_PNG);
$this->assertInstanceOf(EncodedImage::class, $result);
$this->assertMediaType('image/png', (string) $result);
$this->assertMediaType('image/png', $result);
}
public function testEncodeByExtension(): void
{
$result = $this->readTestImage('blue.gif')->encodeByExtension();
$this->assertInstanceOf(EncodedImage::class, $result);
$this->assertMediaType('image/gif', (string) $result);
$this->assertMediaType('image/gif', $result);
$result = $this->readTestImage('blue.gif')->encodeByExtension('png');
$this->assertInstanceOf(EncodedImage::class, $result);
$this->assertMediaType('image/png', (string) $result);
$this->assertMediaType('image/png', $result);
$result = $this->readTestImage('blue.gif')->encodeByExtension(FileExtension::PNG);
$this->assertInstanceOf(EncodedImage::class, $result);
$this->assertMediaType('image/png', (string) $result);
$this->assertMediaType('image/png', $result);
}
public function testEncodeByPath(): void
{
$result = $this->readTestImage('blue.gif')->encodeByPath();
$this->assertInstanceOf(EncodedImage::class, $result);
$this->assertMediaType('image/gif', (string) $result);
$this->assertMediaType('image/gif', $result);
$result = $this->readTestImage('blue.gif')->encodeByPath('foo/bar.png');
$this->assertInstanceOf(EncodedImage::class, $result);
$this->assertMediaType('image/png', (string) $result);
$this->assertMediaType('image/png', $result);
}
public function testSaveAsFormat(): void
@@ -299,8 +299,8 @@ final class ImageTest extends GdTestCase
public function testToJpeg(): void
{
$this->assertMediaType('image/jpeg', (string) $this->image->toJpeg());
$this->assertMediaType('image/jpeg', (string) $this->image->toJpg());
$this->assertMediaType('image/jpeg', $this->image->toJpeg());
$this->assertMediaType('image/jpeg', $this->image->toJpg());
}
public function testToJpeg2000(): void
@@ -311,28 +311,28 @@ final class ImageTest extends GdTestCase
public function testToPng(): void
{
$this->assertMediaType('image/png', (string) $this->image->toPng());
$this->assertMediaType('image/png', $this->image->toPng());
}
public function testToGif(): void
{
$this->assertMediaType('image/gif', (string) $this->image->toGif());
$this->assertMediaType('image/gif', $this->image->toGif());
}
public function testToWebp(): void
{
$this->assertMediaType('image/webp', (string) $this->image->toWebp());
$this->assertMediaType('image/webp', $this->image->toWebp());
}
public function testToBitmap(): void
{
$this->assertMediaTypeBitmap((string) $this->image->toBitmap());
$this->assertMediaTypeBitmap((string) $this->image->toBmp());
$this->assertMediaTypeBitmap($this->image->toBitmap());
$this->assertMediaTypeBitmap($this->image->toBmp());
}
public function testToAvif(): void
{
$this->assertMediaType('image/avif', (string) $this->image->toAvif());
$this->assertMediaType('image/avif', $this->image->toAvif());
}
public function testToTiff(): void