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

Switch test data providers to generators

Browse Source
This commit is contained in:
Oliver Vogel
2024-11-12 16:15:46 +01:00
parent 997ad32068
commit 1da7ba4429
17 changed files with 637 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/Unit/Colors/Hsl/Decoders/StringColorDecoderTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit\Colors\Hsl\Decoders; namespace Intervention\Image\Tests\Unit\Colors\Hsl\Decoders;
use Generator;
use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\RequiresPhpExtension; use PHPUnit\Framework\Attributes\RequiresPhpExtension;
use Intervention\Image\Colors\Hsl\Color; use Intervention\Image\Colors\Hsl\Color;
@@ -24,29 +25,27 @@ final class StringColorDecoderTest extends BaseTestCase
$this->assertEquals($channelValues, $result->toArray()); $this->assertEquals($channelValues, $result->toArray());
} }
public static function decodeDataProvier(): array public static function decodeDataProvier(): Generator
{ {
return [ yield [
[
'hsl(0,0,0)', 'hsl(0,0,0)',
Color::class, Color::class,
[0, 0, 0], [0, 0, 0],
], ];
[ yield [
'hsl(0, 100, 50)', 'hsl(0, 100, 50)',
Color::class, Color::class,
[0, 100, 50], [0, 100, 50],
], ];
[ yield [
'hsl(360, 100, 50)', 'hsl(360, 100, 50)',
Color::class, Color::class,
[360, 100, 50], [360, 100, 50],
], ];
[ yield [
'hsl(180, 100%, 50%)', 'hsl(180, 100%, 50%)',
Color::class, Color::class,
[180, 100, 50], [180, 100, 50],
]
]; ];
} }
} }

35
tests/Unit/Colors/Hsv/Decoders/StringColorDecoderTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit\Colors\Hsv\Decoders; namespace Intervention\Image\Tests\Unit\Colors\Hsv\Decoders;
use Generator;
use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\RequiresPhpExtension; use PHPUnit\Framework\Attributes\RequiresPhpExtension;
use Intervention\Image\Colors\Hsv\Color; use Intervention\Image\Colors\Hsv\Color;
@@ -24,49 +25,47 @@ final class StringColorDecoderTest extends BaseTestCase
$this->assertEquals($channelValues, $result->toArray()); $this->assertEquals($channelValues, $result->toArray());
} }
public static function decodeDataProvier(): array public static function decodeDataProvier(): Generator
{ {
return [ yield [
[
'hsv(0,0,0)', 'hsv(0,0,0)',
Color::class, Color::class,
[0, 0, 0], [0, 0, 0],
], ];
[ yield [
'hsv(0, 100, 100)', 'hsv(0, 100, 100)',
Color::class, Color::class,
[0, 100, 100], [0, 100, 100],
], ];
[ yield [
'hsv(360, 100, 100)', 'hsv(360, 100, 100)',
Color::class, Color::class,
[360, 100, 100], [360, 100, 100],
], ];
[ yield [
'hsv(180, 100%, 100%)', 'hsv(180, 100%, 100%)',
Color::class, Color::class,
[180, 100, 100], [180, 100, 100],
], ];
[ yield [
'hsb(0,0,0)', 'hsb(0,0,0)',
Color::class, Color::class,
[0, 0, 0], [0, 0, 0],
], ];
[ yield [
'hsb(0, 100, 100)', 'hsb(0, 100, 100)',
Color::class, Color::class,
[0, 100, 100], [0, 100, 100],
], ];
[ yield [
'hsb(360, 100, 100)', 'hsb(360, 100, 100)',
Color::class, Color::class,
[360, 100, 100], [360, 100, 100],
], ];
[ yield [
'hsb(180, 100%, 100%)', 'hsb(180, 100%, 100%)',
Color::class, Color::class,
[180, 100, 100], [180, 100, 100],
],
]; ];
} }
} }

43
tests/Unit/Colors/Rgb/Decoders/HexColorDecoderTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit\Colors\Rgb\Decoders; namespace Intervention\Image\Tests\Unit\Colors\Rgb\Decoders;
use Generator;
use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\RequiresPhpExtension; use PHPUnit\Framework\Attributes\RequiresPhpExtension;
use Intervention\Image\Colors\Rgb\Color; use Intervention\Image\Colors\Rgb\Color;
@@ -24,59 +25,57 @@ final class HexColorDecoderTest extends BaseTestCase
$this->assertEquals($channelValues, $result->toArray()); $this->assertEquals($channelValues, $result->toArray());
} }
public static function decodeDataProvier(): array public static function decodeDataProvier(): Generator
{ {
return [ yield [
[
'ccc', 'ccc',
Color::class, Color::class,
[204, 204, 204, 255] [204, 204, 204, 255]
], ];
[ yield [
'ccff33', 'ccff33',
Color::class, Color::class,
[204, 255, 51, 255], [204, 255, 51, 255],
], ];
[ yield [
'#ccc', '#ccc',
Color::class, Color::class,
[204, 204, 204, 255], [204, 204, 204, 255],
], ];
[ yield [
'cccccc', 'cccccc',
Color::class, Color::class,
[204, 204, 204, 255], [204, 204, 204, 255],
], ];
[ yield [
'#cccccc', '#cccccc',
Color::class, Color::class,
[204, 204, 204, 255], [204, 204, 204, 255],
], ];
[ yield [
'#ccccccff', '#ccccccff',
Color::class, Color::class,
[204, 204, 204, 255], [204, 204, 204, 255],
], ];
[ yield [
'#cccf', '#cccf',
Color::class, Color::class,
[204, 204, 204, 255], [204, 204, 204, 255],
], ];
[ yield [
'ccccccff', 'ccccccff',
Color::class, Color::class,
[204, 204, 204, 255], [204, 204, 204, 255],
], ];
[ yield [
'cccf', 'cccf',
Color::class, Color::class,
[204, 204, 204, 255], [204, 204, 204, 255],
], ];
[ yield [
'#b53717aa', '#b53717aa',
Color::class, Color::class,
[181, 55, 23, 170], [181, 55, 23, 170],
],
]; ];
} }
} }

15
tests/Unit/Colors/Rgb/Decoders/HtmlColornameDecoderTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit\Colors\Rgb\Decoders; namespace Intervention\Image\Tests\Unit\Colors\Rgb\Decoders;
use Generator;
use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\RequiresPhpExtension; use PHPUnit\Framework\Attributes\RequiresPhpExtension;
use Intervention\Image\Colors\Rgb\Color; use Intervention\Image\Colors\Rgb\Color;
@@ -24,24 +25,22 @@ final class HtmlColornameDecoderTest extends BaseTestCase
$this->assertEquals($channelValues, $result->toArray()); $this->assertEquals($channelValues, $result->toArray());
} }
public static function decodeDataProvier(): array public static function decodeDataProvier(): Generator
{ {
return [ yield [
[
'salmon', 'salmon',
Color::class, Color::class,
[250, 128, 114, 255], [250, 128, 114, 255],
], ];
[ yield [
'khaki', 'khaki',
Color::class, Color::class,
[240, 230, 140, 255], [240, 230, 140, 255],
], ];
[ yield [
'peachpuff', 'peachpuff',
Color::class, Color::class,
[255, 218, 185, 255], [255, 218, 185, 255],
]
]; ];
} }
} }

35
tests/Unit/Colors/Rgb/Decoders/StringColorDecoderTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit\Colors\Rgb\Decoders; namespace Intervention\Image\Tests\Unit\Colors\Rgb\Decoders;
use Generator;
use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\RequiresPhpExtension; use PHPUnit\Framework\Attributes\RequiresPhpExtension;
use Intervention\Image\Colors\Rgb\Color; use Intervention\Image\Colors\Rgb\Color;
@@ -24,49 +25,47 @@ final class StringColorDecoderTest extends BaseTestCase
$this->assertEquals($channelValues, $result->toArray()); $this->assertEquals($channelValues, $result->toArray());
} }
public static function decodeDataProvier(): array public static function decodeDataProvier(): Generator
{ {
return [ yield [
[
'rgb(204, 204, 204)', 'rgb(204, 204, 204)',
Color::class, Color::class,
[204, 204, 204, 255], [204, 204, 204, 255],
], ];
[ yield [
'rgb(204,204,204)', 'rgb(204,204,204)',
Color::class, Color::class,
[204, 204, 204, 255], [204, 204, 204, 255],
], ];
[ yield [
'rgb(100%,20%,0%)', 'rgb(100%,20%,0%)',
Color::class, Color::class,
[255, 51, 0, 255], [255, 51, 0, 255],
], ];
[ yield [
'rgb(100%,19.8064%,0.1239483%)', 'rgb(100%,19.8064%,0.1239483%)',
Color::class, Color::class,
[255, 51, 0, 255], [255, 51, 0, 255],
], ];
[ yield [
'rgba(204, 204, 204, 1)', 'rgba(204, 204, 204, 1)',
Color::class, Color::class,
[204, 204, 204, 255], [204, 204, 204, 255],
], ];
[ yield [
'rgba(204,204,204,.2)', 'rgba(204,204,204,.2)',
Color::class, Color::class,
[204, 204, 204, 51], [204, 204, 204, 51],
], ];
[ yield [
'rgba(204,204,204,0.2)', 'rgba(204,204,204,0.2)',
Color::class, Color::class,
[204, 204, 204, 51], [204, 204, 204, 51],
], ];
[ yield [
'srgb(255, 0, 0)', 'srgb(255, 0, 0)',
Color::class, Color::class,
[255, 0, 0, 255], [255, 0, 0, 255],
],
]; ];
} }
} }

23
tests/Unit/Drivers/Gd/Decoders/FilePathImageDecoderTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit\Drivers\Gd\Decoders; namespace Intervention\Image\Tests\Unit\Drivers\Gd\Decoders;
use Generator;
use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\RequiresPhpExtension; use PHPUnit\Framework\Attributes\RequiresPhpExtension;
use Intervention\Image\Drivers\Gd\Decoders\FilePathImageDecoder; use Intervention\Image\Drivers\Gd\Decoders\FilePathImageDecoder;
@@ -39,18 +40,16 @@ final class FilePathImageDecoderTest extends BaseTestCase
} }
} }
public static function validFormatPathsProvider(): array public static function validFormatPathsProvider(): Generator
{ {
return [ yield [self::getTestResourcePath('cats.gif'), true];
[self::getTestResourcePath('cats.gif'), true], yield [self::getTestResourcePath('animation.gif'), true];
[self::getTestResourcePath('animation.gif'), true], yield [self::getTestResourcePath('red.gif'), true];
[self::getTestResourcePath('red.gif'), true], yield [self::getTestResourcePath('green.gif'), true];
[self::getTestResourcePath('green.gif'), true], yield [self::getTestResourcePath('blue.gif'), true];
[self::getTestResourcePath('blue.gif'), true], yield [self::getTestResourcePath('gradient.bmp'), true];
[self::getTestResourcePath('gradient.bmp'), true], yield [self::getTestResourcePath('circle.png'), true];
[self::getTestResourcePath('circle.png'), true], yield ['no-path', false];
['no-path', false], yield [str_repeat('x', PHP_MAXPATHLEN + 1), false];
[str_repeat('x', PHP_MAXPATHLEN + 1), false],
];
} }
} }

199
tests/Unit/Drivers/Gd/DriverTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit\Drivers\Gd; namespace Intervention\Image\Tests\Unit\Drivers\Gd;
use Generator;
use Intervention\Image\Colors\Rgb\Colorspace; use Intervention\Image\Colors\Rgb\Colorspace;
use Intervention\Image\Colors\Rgb\Decoders\HexColorDecoder; use Intervention\Image\Colors\Rgb\Decoders\HexColorDecoder;
use Intervention\Image\Drivers\Gd\Driver; use Intervention\Image\Drivers\Gd\Driver;
@@ -92,115 +93,113 @@ final class DriverTest extends BaseTestCase
$this->assertEquals($result, $this->driver->supports($identifier)); $this->assertEquals($result, $this->driver->supports($identifier));
} }
public static function supportsDataProvider(): array public static function supportsDataProvider(): Generator
{ {
return [ yield [true, Format::JPEG];
[true, Format::JPEG], yield [true, MediaType::IMAGE_JPEG];
[true, MediaType::IMAGE_JPEG], yield [true, MediaType::IMAGE_JPG];
[true, MediaType::IMAGE_JPG], yield [true, FileExtension::JPG];
[true, FileExtension::JPG], yield [true, FileExtension::JPEG];
[true, FileExtension::JPEG], yield [true, 'jpg'];
[true, 'jpg'], yield [true, 'jpeg'];
[true, 'jpeg'], yield [true, 'image/jpg'];
[true, 'image/jpg'], yield [true, 'image/jpeg'];
[true, 'image/jpeg'],
[true, Format::WEBP], yield [true, Format::WEBP];
[true, MediaType::IMAGE_WEBP], yield [true, MediaType::IMAGE_WEBP];
[true, MediaType::IMAGE_X_WEBP], yield [true, MediaType::IMAGE_X_WEBP];
[true, FileExtension::WEBP], yield [true, FileExtension::WEBP];
[true, 'webp'], yield [true, 'webp'];
[true, 'image/webp'], yield [true, 'image/webp'];
[true, 'image/x-webp'], yield [true, 'image/x-webp'];
[true, Format::GIF], yield [true, Format::GIF];
[true, MediaType::IMAGE_GIF], yield [true, MediaType::IMAGE_GIF];
[true, FileExtension::GIF], yield [true, FileExtension::GIF];
[true, 'gif'], yield [true, 'gif'];
[true, 'image/gif'], yield [true, 'image/gif'];
[true, Format::PNG], yield [true, Format::PNG];
[true, MediaType::IMAGE_PNG], yield [true, MediaType::IMAGE_PNG];
[true, MediaType::IMAGE_X_PNG], yield [true, MediaType::IMAGE_X_PNG];
[true, FileExtension::PNG], yield [true, FileExtension::PNG];
[true, 'png'], yield [true, 'png'];
[true, 'image/png'], yield [true, 'image/png'];
[true, 'image/x-png'], yield [true, 'image/x-png'];
[true, Format::AVIF], yield [true, Format::AVIF];
[true, MediaType::IMAGE_AVIF], yield [true, MediaType::IMAGE_AVIF];
[true, MediaType::IMAGE_X_AVIF], yield [true, MediaType::IMAGE_X_AVIF];
[true, FileExtension::AVIF], yield [true, FileExtension::AVIF];
[true, 'avif'], yield [true, 'avif'];
[true, 'image/avif'], yield [true, 'image/avif'];
[true, 'image/x-avif'], yield [true, 'image/x-avif'];
[true, Format::BMP], yield [true, Format::BMP];
[true, FileExtension::BMP], yield [true, FileExtension::BMP];
[true, MediaType::IMAGE_BMP], yield [true, MediaType::IMAGE_BMP];
[true, MediaType::IMAGE_MS_BMP], yield [true, MediaType::IMAGE_MS_BMP];
[true, MediaType::IMAGE_X_BITMAP], yield [true, MediaType::IMAGE_X_BITMAP];
[true, MediaType::IMAGE_X_BMP], yield [true, MediaType::IMAGE_X_BMP];
[true, MediaType::IMAGE_X_MS_BMP], yield [true, MediaType::IMAGE_X_MS_BMP];
[true, MediaType::IMAGE_X_WINDOWS_BMP], yield [true, MediaType::IMAGE_X_WINDOWS_BMP];
[true, MediaType::IMAGE_X_WIN_BITMAP], yield [true, MediaType::IMAGE_X_WIN_BITMAP];
[true, MediaType::IMAGE_X_XBITMAP], yield [true, MediaType::IMAGE_X_XBITMAP];
[true, 'bmp'], yield [true, 'bmp'];
[true, 'image/bmp'], yield [true, 'image/bmp'];
[true, 'image/ms-bmp'], yield [true, 'image/ms-bmp'];
[true, 'image/x-bitmap'], yield [true, 'image/x-bitmap'];
[true, 'image/x-bmp'], yield [true, 'image/x-bmp'];
[true, 'image/x-ms-bmp'], yield [true, 'image/x-ms-bmp'];
[true, 'image/x-windows-bmp'], yield [true, 'image/x-windows-bmp'];
[true, 'image/x-win-bitmap'], yield [true, 'image/x-win-bitmap'];
[true, 'image/x-xbitmap'], yield [true, 'image/x-xbitmap'];
[false, Format::TIFF], yield [false, Format::TIFF];
[false, MediaType::IMAGE_TIFF], yield [false, MediaType::IMAGE_TIFF];
[false, FileExtension::TIFF], yield [false, FileExtension::TIFF];
[false, FileExtension::TIF], yield [false, FileExtension::TIF];
[false, 'tif'], yield [false, 'tif'];
[false, 'tiff'], yield [false, 'tiff'];
[false, 'image/tiff'], yield [false, 'image/tiff'];
[false, Format::JP2], yield [false, Format::JP2];
[false, MediaType::IMAGE_JP2], yield [false, MediaType::IMAGE_JP2];
[false, MediaType::IMAGE_JPX], yield [false, MediaType::IMAGE_JPX];
[false, MediaType::IMAGE_JPM], yield [false, MediaType::IMAGE_JPM];
[false, FileExtension::TIFF], yield [false, FileExtension::TIFF];
[false, FileExtension::TIF], yield [false, FileExtension::TIF];
[false, FileExtension::JP2], yield [false, FileExtension::JP2];
[false, FileExtension::J2K], yield [false, FileExtension::J2K];
[false, FileExtension::JPF], yield [false, FileExtension::JPF];
[false, FileExtension::JPM], yield [false, FileExtension::JPM];
[false, FileExtension::JPG2], yield [false, FileExtension::JPG2];
[false, FileExtension::J2C], yield [false, FileExtension::J2C];
[false, FileExtension::JPC], yield [false, FileExtension::JPC];
[false, FileExtension::JPX], yield [false, FileExtension::JPX];
[false, 'jp2'], yield [false, 'jp2'];
[false, 'j2k'], yield [false, 'j2k'];
[false, 'jpf'], yield [false, 'jpf'];
[false, 'jpm'], yield [false, 'jpm'];
[false, 'jpg2'], yield [false, 'jpg2'];
[false, 'j2c'], yield [false, 'j2c'];
[false, 'jpc'], yield [false, 'jpc'];
[false, 'jpx'], yield [false, 'jpx'];
[false, Format::HEIC], yield [false, Format::HEIC];
[false, MediaType::IMAGE_HEIC], yield [false, MediaType::IMAGE_HEIC];
[false, MediaType::IMAGE_HEIF], yield [false, MediaType::IMAGE_HEIF];
[false, FileExtension::HEIC], yield [false, FileExtension::HEIC];
[false, FileExtension::HEIF], yield [false, FileExtension::HEIF];
[false, 'heic'], yield [false, 'heic'];
[false, 'heif'], yield [false, 'heif'];
[false, 'image/heic'], yield [false, 'image/heic'];
[false, 'image/heif'], yield [false, 'image/heif'];
[false, 'tga'], yield [false, 'tga'];
[false, 'image/tga'], yield [false, 'image/tga'];
[false, 'image/x-targa'], yield [false, 'image/x-targa'];
[false, 'foo'], yield [false, 'foo'];
[false, ''], yield [false, ''];
];
} }
} }

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

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit\Drivers\Gd\Encoders; namespace Intervention\Image\Tests\Unit\Drivers\Gd\Encoders;
use Generator;
use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\RequiresPhpExtension; use PHPUnit\Framework\Attributes\RequiresPhpExtension;
use Intervention\Image\Encoders\PngEncoder; use Intervention\Image\Encoders\PngEncoder;
@@ -48,49 +49,47 @@ final class PngEncoderTest extends GdTestCase
); );
} }
public static function indexedDataProvider(): array public static function indexedDataProvider(): Generator
{ {
return [ yield [
[
static::createTestImage(3, 2), // new static::createTestImage(3, 2), // new
new PngEncoder(indexed: false), new PngEncoder(indexed: false),
'truecolor-alpha', 'truecolor-alpha',
], ];
[ yield [
static::createTestImage(3, 2), // new static::createTestImage(3, 2), // new
new PngEncoder(indexed: true), new PngEncoder(indexed: true),
'indexed', 'indexed',
], ];
[ yield [
static::readTestImage('circle.png'), // truecolor-alpha static::readTestImage('circle.png'), // truecolor-alpha
new PngEncoder(indexed: false), new PngEncoder(indexed: false),
'truecolor-alpha', 'truecolor-alpha',
], ];
[ yield [
static::readTestImage('circle.png'), // indexedcolor-alpha static::readTestImage('circle.png'), // indexedcolor-alpha
new PngEncoder(indexed: true), new PngEncoder(indexed: true),
'indexed', 'indexed',
], ];
[ yield [
static::readTestImage('tile.png'), // indexed static::readTestImage('tile.png'), // indexed
new PngEncoder(indexed: false), new PngEncoder(indexed: false),
'truecolor-alpha', 'truecolor-alpha',
], ];
[ yield [
static::readTestImage('tile.png'), // indexed static::readTestImage('tile.png'), // indexed
new PngEncoder(indexed: true), new PngEncoder(indexed: true),
'indexed', 'indexed',
], ];
[ yield [
static::readTestImage('test.jpg'), // jpeg static::readTestImage('test.jpg'), // jpeg
new PngEncoder(indexed: false), new PngEncoder(indexed: false),
'truecolor-alpha', 'truecolor-alpha',
], ];
[ yield [
static::readTestImage('test.jpg'), // jpeg static::readTestImage('test.jpg'), // jpeg
new PngEncoder(indexed: true), new PngEncoder(indexed: true),
'indexed', 'indexed',
],
]; ];
} }
} }

23
tests/Unit/Drivers/Imagick/Decoders/FilePathImageDecoderTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit\Drivers\Imagick\Decoders; namespace Intervention\Image\Tests\Unit\Drivers\Imagick\Decoders;
use Generator;
use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\RequiresPhpExtension; use PHPUnit\Framework\Attributes\RequiresPhpExtension;
use Intervention\Image\Drivers\Imagick\Decoders\FilePathImageDecoder; use Intervention\Image\Drivers\Imagick\Decoders\FilePathImageDecoder;
@@ -39,18 +40,16 @@ final class FilePathImageDecoderTest extends BaseTestCase
} }
} }
public static function validFormatPathsProvider(): array public static function validFormatPathsProvider(): Generator
{ {
return [ yield [self::getTestResourcePath('cats.gif'), true];
[self::getTestResourcePath('cats.gif'), true], yield [self::getTestResourcePath('animation.gif'), true];
[self::getTestResourcePath('animation.gif'), true], yield [self::getTestResourcePath('red.gif'), true];
[self::getTestResourcePath('red.gif'), true], yield [self::getTestResourcePath('green.gif'), true];
[self::getTestResourcePath('green.gif'), true], yield [self::getTestResourcePath('blue.gif'), true];
[self::getTestResourcePath('blue.gif'), true], yield [self::getTestResourcePath('gradient.bmp'), true];
[self::getTestResourcePath('gradient.bmp'), true], yield [self::getTestResourcePath('circle.png'), true];
[self::getTestResourcePath('circle.png'), true], yield ['no-path', false];
['no-path', false], yield [str_repeat('x', PHP_MAXPATHLEN + 1), false];
[str_repeat('x', PHP_MAXPATHLEN + 1), false],
];
} }
} }

199
tests/Unit/Drivers/Imagick/DriverTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit\Drivers\Imagick; namespace Intervention\Image\Tests\Unit\Drivers\Imagick;
use Generator;
use Intervention\Image\Colors\Rgb\Colorspace; use Intervention\Image\Colors\Rgb\Colorspace;
use Intervention\Image\Colors\Rgb\Decoders\HexColorDecoder; use Intervention\Image\Colors\Rgb\Decoders\HexColorDecoder;
use Intervention\Image\Drivers\Imagick\Driver; use Intervention\Image\Drivers\Imagick\Driver;
@@ -92,115 +93,113 @@ final class DriverTest extends BaseTestCase
$this->assertEquals($result, $this->driver->supports($identifier)); $this->assertEquals($result, $this->driver->supports($identifier));
} }
public static function supportsDataProvider(): array public static function supportsDataProvider(): Generator
{ {
return [ yield [true, Format::JPEG];
[true, Format::JPEG], yield [true, MediaType::IMAGE_JPEG];
[true, MediaType::IMAGE_JPEG], yield [true, MediaType::IMAGE_JPG];
[true, MediaType::IMAGE_JPG], yield [true, FileExtension::JPG];
[true, FileExtension::JPG], yield [true, FileExtension::JPEG];
[true, FileExtension::JPEG], yield [true, 'jpg'];
[true, 'jpg'], yield [true, 'jpeg'];
[true, 'jpeg'], yield [true, 'image/jpg'];
[true, 'image/jpg'], yield [true, 'image/jpeg'];
[true, 'image/jpeg'],
[true, Format::WEBP], yield [true, Format::WEBP];
[true, MediaType::IMAGE_WEBP], yield [true, MediaType::IMAGE_WEBP];
[true, MediaType::IMAGE_X_WEBP], yield [true, MediaType::IMAGE_X_WEBP];
[true, FileExtension::WEBP], yield [true, FileExtension::WEBP];
[true, 'webp'], yield [true, 'webp'];
[true, 'image/webp'], yield [true, 'image/webp'];
[true, 'image/x-webp'], yield [true, 'image/x-webp'];
[true, Format::GIF], yield [true, Format::GIF];
[true, MediaType::IMAGE_GIF], yield [true, MediaType::IMAGE_GIF];
[true, FileExtension::GIF], yield [true, FileExtension::GIF];
[true, 'gif'], yield [true, 'gif'];
[true, 'image/gif'], yield [true, 'image/gif'];
[true, Format::PNG], yield [true, Format::PNG];
[true, MediaType::IMAGE_PNG], yield [true, MediaType::IMAGE_PNG];
[true, MediaType::IMAGE_X_PNG], yield [true, MediaType::IMAGE_X_PNG];
[true, FileExtension::PNG], yield [true, FileExtension::PNG];
[true, 'png'], yield [true, 'png'];
[true, 'image/png'], yield [true, 'image/png'];
[true, 'image/x-png'], yield [true, 'image/x-png'];
[true, Format::AVIF], yield [true, Format::AVIF];
[true, MediaType::IMAGE_AVIF], yield [true, MediaType::IMAGE_AVIF];
[true, MediaType::IMAGE_X_AVIF], yield [true, MediaType::IMAGE_X_AVIF];
[true, FileExtension::AVIF], yield [true, FileExtension::AVIF];
[true, 'avif'], yield [true, 'avif'];
[true, 'image/avif'], yield [true, 'image/avif'];
[true, 'image/x-avif'], yield [true, 'image/x-avif'];
[true, Format::BMP], yield [true, Format::BMP];
[true, FileExtension::BMP], yield [true, FileExtension::BMP];
[true, MediaType::IMAGE_BMP], yield [true, MediaType::IMAGE_BMP];
[true, MediaType::IMAGE_MS_BMP], yield [true, MediaType::IMAGE_MS_BMP];
[true, MediaType::IMAGE_X_BITMAP], yield [true, MediaType::IMAGE_X_BITMAP];
[true, MediaType::IMAGE_X_BMP], yield [true, MediaType::IMAGE_X_BMP];
[true, MediaType::IMAGE_X_MS_BMP], yield [true, MediaType::IMAGE_X_MS_BMP];
[true, MediaType::IMAGE_X_WINDOWS_BMP], yield [true, MediaType::IMAGE_X_WINDOWS_BMP];
[true, MediaType::IMAGE_X_WIN_BITMAP], yield [true, MediaType::IMAGE_X_WIN_BITMAP];
[true, MediaType::IMAGE_X_XBITMAP], yield [true, MediaType::IMAGE_X_XBITMAP];
[true, 'bmp'], yield [true, 'bmp'];
[true, 'image/bmp'], yield [true, 'image/bmp'];
[true, 'image/ms-bmp'], yield [true, 'image/ms-bmp'];
[true, 'image/x-bitmap'], yield [true, 'image/x-bitmap'];
[true, 'image/x-bmp'], yield [true, 'image/x-bmp'];
[true, 'image/x-ms-bmp'], yield [true, 'image/x-ms-bmp'];
[true, 'image/x-windows-bmp'], yield [true, 'image/x-windows-bmp'];
[true, 'image/x-win-bitmap'], yield [true, 'image/x-win-bitmap'];
[true, 'image/x-xbitmap'], yield [true, 'image/x-xbitmap'];
[true, Format::TIFF], yield [true, Format::TIFF];
[true, MediaType::IMAGE_TIFF], yield [true, MediaType::IMAGE_TIFF];
[true, FileExtension::TIFF], yield [true, FileExtension::TIFF];
[true, FileExtension::TIF], yield [true, FileExtension::TIF];
[true, 'tif'], yield [true, 'tif'];
[true, 'tiff'], yield [true, 'tiff'];
[true, 'image/tiff'], yield [true, 'image/tiff'];
[true, Format::JP2], yield [true, Format::JP2];
[true, MediaType::IMAGE_JP2], yield [true, MediaType::IMAGE_JP2];
[true, MediaType::IMAGE_JPX], yield [true, MediaType::IMAGE_JPX];
[true, MediaType::IMAGE_JPM], yield [true, MediaType::IMAGE_JPM];
[true, FileExtension::TIFF], yield [true, FileExtension::TIFF];
[true, FileExtension::TIF], yield [true, FileExtension::TIF];
[true, FileExtension::JP2], yield [true, FileExtension::JP2];
[true, FileExtension::J2K], yield [true, FileExtension::J2K];
[true, FileExtension::JPF], yield [true, FileExtension::JPF];
[true, FileExtension::JPM], yield [true, FileExtension::JPM];
[true, FileExtension::JPG2], yield [true, FileExtension::JPG2];
[true, FileExtension::J2C], yield [true, FileExtension::J2C];
[true, FileExtension::JPC], yield [true, FileExtension::JPC];
[true, FileExtension::JPX], yield [true, FileExtension::JPX];
[true, 'jp2'], yield [true, 'jp2'];
[true, 'j2k'], yield [true, 'j2k'];
[true, 'jpf'], yield [true, 'jpf'];
[true, 'jpm'], yield [true, 'jpm'];
[true, 'jpg2'], yield [true, 'jpg2'];
[true, 'j2c'], yield [true, 'j2c'];
[true, 'jpc'], yield [true, 'jpc'];
[true, 'jpx'], yield [true, 'jpx'];
[true, Format::HEIC], yield [true, Format::HEIC];
[true, MediaType::IMAGE_HEIC], yield [true, MediaType::IMAGE_HEIC];
[true, MediaType::IMAGE_HEIF], yield [true, MediaType::IMAGE_HEIF];
[true, FileExtension::HEIC], yield [true, FileExtension::HEIC];
[true, FileExtension::HEIF], yield [true, FileExtension::HEIF];
[true, 'heic'], yield [true, 'heic'];
[true, 'heif'], yield [true, 'heif'];
[true, 'image/heic'], yield [true, 'image/heic'];
[true, 'image/heif'], yield [true, 'image/heif'];
[false, 'tga'], yield [false, 'tga'];
[false, 'image/tga'], yield [false, 'image/tga'];
[false, 'image/x-targa'], yield [false, 'image/x-targa'];
[false, 'foo'], yield [false, 'foo'];
[false, ''], yield [false, ''];
];
} }
} }

39
tests/Unit/Drivers/Imagick/Encoders/PngEncoderTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit\Drivers\Imagick\Encoders; namespace Intervention\Image\Tests\Unit\Drivers\Imagick\Encoders;
use Generator;
use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\RequiresPhpExtension; use PHPUnit\Framework\Attributes\RequiresPhpExtension;
use Intervention\Image\Encoders\PngEncoder; use Intervention\Image\Encoders\PngEncoder;
@@ -48,55 +49,53 @@ final class PngEncoderTest extends ImagickTestCase
); );
} }
public static function indexedDataProvider(): array public static function indexedDataProvider(): Generator
{ {
return [ yield [
[
static::createTestImage(3, 2), // new static::createTestImage(3, 2), // new
new PngEncoder(indexed: false), new PngEncoder(indexed: false),
'truecolor-alpha', 'truecolor-alpha',
], ];
[ yield [
static::createTestImage(3, 2), // new static::createTestImage(3, 2), // new
new PngEncoder(indexed: true), new PngEncoder(indexed: true),
'indexed', 'indexed',
], ];
[ yield [
static::createTestImage(3, 2)->fill('ccc'), // new grayscale static::createTestImage(3, 2)->fill('ccc'), // new grayscale
new PngEncoder(indexed: true), new PngEncoder(indexed: true),
'grayscale', // result should be 'indexed' but there seems to be no way to force this with imagick 'grayscale', // result should be 'indexed' but there seems to be no way to force this with imagick
], ];
[ yield [
static::readTestImage('circle.png'), // truecolor-alpha static::readTestImage('circle.png'), // truecolor-alpha
new PngEncoder(indexed: false), new PngEncoder(indexed: false),
'truecolor-alpha', 'truecolor-alpha',
], ];
[ yield [
static::readTestImage('circle.png'), // indexedcolor-alpha static::readTestImage('circle.png'), // indexedcolor-alpha
new PngEncoder(indexed: true), new PngEncoder(indexed: true),
'grayscale-alpha', // result should be 'indexed' but there seems to be no way to force this with imagick 'grayscale-alpha', // result should be 'indexed' but there seems to be no way to force this with imagick
], ];
[ yield [
static::readTestImage('tile.png'), // indexed static::readTestImage('tile.png'), // indexed
new PngEncoder(indexed: false), new PngEncoder(indexed: false),
'truecolor-alpha', 'truecolor-alpha',
], ];
[ yield [
static::readTestImage('tile.png'), // indexed static::readTestImage('tile.png'), // indexed
new PngEncoder(indexed: true), new PngEncoder(indexed: true),
'indexed', 'indexed',
], ];
[ yield [
static::readTestImage('test.jpg'), // jpeg static::readTestImage('test.jpg'), // jpeg
new PngEncoder(indexed: false), new PngEncoder(indexed: false),
'truecolor-alpha', 'truecolor-alpha',
], ];
[ yield [
static::readTestImage('test.jpg'), // jpeg static::readTestImage('test.jpg'), // jpeg
new PngEncoder(indexed: true), new PngEncoder(indexed: true),
'indexed', 'indexed',
],
]; ];
} }
} }

47
tests/Unit/Encoders/FileExtensionEncoderTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit\Encoders; namespace Intervention\Image\Tests\Unit\Encoders;
use Generator;
use Intervention\Image\Encoders\AvifEncoder; use Intervention\Image\Encoders\AvifEncoder;
use Intervention\Image\Encoders\BmpEncoder; use Intervention\Image\Encoders\BmpEncoder;
use Intervention\Image\Encoders\FileExtensionEncoder; use Intervention\Image\Encoders\FileExtensionEncoder;
@@ -51,31 +52,29 @@ final class FileExtensionEncoderTest extends BaseTestCase
); );
} }
public static function targetEncoderProvider(): array public static function targetEncoderProvider(): Generator
{ {
return [ yield ['webp', WebpEncoder::class];
['webp', WebpEncoder::class], yield ['avif', AvifEncoder::class];
['avif', AvifEncoder::class], yield ['jpeg', JpegEncoder::class];
['jpeg', JpegEncoder::class], yield ['jpg', JpegEncoder::class];
['jpg', JpegEncoder::class], yield ['bmp', BmpEncoder::class];
['bmp', BmpEncoder::class], yield ['gif', GifEncoder::class];
['gif', GifEncoder::class], yield ['png', PngEncoder::class];
['png', PngEncoder::class], yield ['tiff', TiffEncoder::class];
['tiff', TiffEncoder::class], yield ['tif', TiffEncoder::class];
['tif', TiffEncoder::class], yield ['jp2', Jpeg2000Encoder::class];
['jp2', Jpeg2000Encoder::class], yield ['heic', HeicEncoder::class];
['heic', HeicEncoder::class], yield [FileExtension::WEBP, WebpEncoder::class];
[FileExtension::WEBP, WebpEncoder::class], yield [FileExtension::AVIF, AvifEncoder::class];
[FileExtension::AVIF, AvifEncoder::class], yield [FileExtension::JPG, JpegEncoder::class];
[FileExtension::JPG, JpegEncoder::class], yield [FileExtension::BMP, BmpEncoder::class];
[FileExtension::BMP, BmpEncoder::class], yield [FileExtension::GIF, GifEncoder::class];
[FileExtension::GIF, GifEncoder::class], yield [FileExtension::PNG, PngEncoder::class];
[FileExtension::PNG, PngEncoder::class], yield [FileExtension::TIF, TiffEncoder::class];
[FileExtension::TIF, TiffEncoder::class], yield [FileExtension::TIFF, TiffEncoder::class];
[FileExtension::TIFF, TiffEncoder::class], yield [FileExtension::JP2, Jpeg2000Encoder::class];
[FileExtension::JP2, Jpeg2000Encoder::class], yield [FileExtension::HEIC, HeicEncoder::class];
[FileExtension::HEIC, HeicEncoder::class],
];
} }
public function testArgumentsNotSupportedByTargetEncoder(): void public function testArgumentsNotSupportedByTargetEncoder(): void

45
tests/Unit/Encoders/MediaTypeEncoderTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit\Encoders; namespace Intervention\Image\Tests\Unit\Encoders;
use Generator;
use Intervention\Image\Encoders\AvifEncoder; use Intervention\Image\Encoders\AvifEncoder;
use Intervention\Image\Encoders\BmpEncoder; use Intervention\Image\Encoders\BmpEncoder;
use Intervention\Image\Encoders\GifEncoder; use Intervention\Image\Encoders\GifEncoder;
@@ -51,30 +52,28 @@ final class MediaTypeEncoderTest extends BaseTestCase
); );
} }
public static function targetEncoderProvider(): array public static function targetEncoderProvider(): Generator
{ {
return [ yield ['image/webp', WebpEncoder::class];
['image/webp', WebpEncoder::class], yield ['image/avif', AvifEncoder::class];
['image/avif', AvifEncoder::class], yield ['image/jpeg', JpegEncoder::class];
['image/jpeg', JpegEncoder::class], yield ['image/bmp', BmpEncoder::class];
['image/bmp', BmpEncoder::class], yield ['image/gif', GifEncoder::class];
['image/gif', GifEncoder::class], yield ['image/png', PngEncoder::class];
['image/png', PngEncoder::class], yield ['image/png', PngEncoder::class];
['image/png', PngEncoder::class], yield ['image/tiff', TiffEncoder::class];
['image/tiff', TiffEncoder::class], yield ['image/jp2', Jpeg2000Encoder::class];
['image/jp2', Jpeg2000Encoder::class], yield ['image/heic', HeicEncoder::class];
['image/heic', HeicEncoder::class], yield [MediaType::IMAGE_WEBP, WebpEncoder::class];
[MediaType::IMAGE_WEBP, WebpEncoder::class], yield [MediaType::IMAGE_AVIF, AvifEncoder::class];
[MediaType::IMAGE_AVIF, AvifEncoder::class], yield [MediaType::IMAGE_JPEG, JpegEncoder::class];
[MediaType::IMAGE_JPEG, JpegEncoder::class], yield [MediaType::IMAGE_BMP, BmpEncoder::class];
[MediaType::IMAGE_BMP, BmpEncoder::class], yield [MediaType::IMAGE_GIF, GifEncoder::class];
[MediaType::IMAGE_GIF, GifEncoder::class], yield [MediaType::IMAGE_PNG, PngEncoder::class];
[MediaType::IMAGE_PNG, PngEncoder::class], yield [MediaType::IMAGE_TIFF, TiffEncoder::class];
[MediaType::IMAGE_TIFF, TiffEncoder::class], yield [MediaType::IMAGE_JP2, Jpeg2000Encoder::class];
[MediaType::IMAGE_JP2, Jpeg2000Encoder::class], yield [MediaType::IMAGE_HEIC, HeicEncoder::class];
[MediaType::IMAGE_HEIC, HeicEncoder::class], yield [MediaType::IMAGE_HEIF, HeicEncoder::class];
[MediaType::IMAGE_HEIF, HeicEncoder::class],
];
} }
public function testArgumentsNotSupportedByTargetEncoder(): void public function testArgumentsNotSupportedByTargetEncoder(): void

25
tests/Unit/FileExtensionTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit; namespace Intervention\Image\Tests\Unit;
use Generator;
use Intervention\Image\FileExtension; use Intervention\Image\FileExtension;
use Intervention\Image\Format; use Intervention\Image\Format;
use Intervention\Image\MediaType; use Intervention\Image\MediaType;
@@ -91,19 +92,17 @@ final class FileExtensionTest extends BaseTestCase
$this->assertEquals($mediaType, $extension->mediaType()); $this->assertEquals($mediaType, $extension->mediaType());
} }
public static function mediaTypesDataProvider(): array public static function mediaTypesDataProvider(): Generator
{ {
return [ yield [FileExtension::JPEG, 4, MediaType::IMAGE_JPEG];
[FileExtension::JPEG, 4, MediaType::IMAGE_JPEG], yield [FileExtension::WEBP, 2, MediaType::IMAGE_WEBP];
[FileExtension::WEBP, 2, MediaType::IMAGE_WEBP], yield [FileExtension::GIF, 1, MediaType::IMAGE_GIF];
[FileExtension::GIF, 1, MediaType::IMAGE_GIF], yield [FileExtension::PNG, 2, MediaType::IMAGE_PNG];
[FileExtension::PNG, 2, MediaType::IMAGE_PNG], yield [FileExtension::AVIF, 2, MediaType::IMAGE_AVIF];
[FileExtension::AVIF, 2, MediaType::IMAGE_AVIF], yield [FileExtension::BMP, 8, MediaType::IMAGE_BMP];
[FileExtension::BMP, 8, MediaType::IMAGE_BMP], yield [FileExtension::TIFF, 1, MediaType::IMAGE_TIFF];
[FileExtension::TIFF, 1, MediaType::IMAGE_TIFF], yield [FileExtension::TIF, 1, MediaType::IMAGE_TIFF];
[FileExtension::TIF, 1, MediaType::IMAGE_TIFF], yield [FileExtension::JP2, 3, MediaType::IMAGE_JP2];
[FileExtension::JP2, 3, MediaType::IMAGE_JP2], yield [FileExtension::HEIC, 3, MediaType::IMAGE_HEIC];
[FileExtension::HEIC, 3, MediaType::IMAGE_HEIC],
];
} }
} }

109
tests/Unit/Geometry/RectangleResizerTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit\Geometry; namespace Intervention\Image\Tests\Unit\Geometry;
use Generator;
use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\DataProvider;
use Intervention\Image\Geometry\Point; use Intervention\Image\Geometry\Point;
@@ -382,7 +383,7 @@ final class RectangleResizerTest extends TestCase
} }
#[DataProvider('coverDataProvider')] #[DataProvider('coverDataProvider')]
public function testCover($origin, $target, $result): void public function testCover(Rectangle $origin, Rectangle $target, Rectangle $result): void
{ {
$resizer = new RectangleResizer(); $resizer = new RectangleResizer();
$resizer->toSize($target); $resizer->toSize($target);
@@ -391,23 +392,21 @@ final class RectangleResizerTest extends TestCase
$this->assertEquals($result->height(), $resized->height()); $this->assertEquals($result->height(), $resized->height());
} }
public static function coverDataProvider(): array public static function coverDataProvider(): Generator
{ {
return [ yield [new Rectangle(800, 600), new Rectangle(100, 100), new Rectangle(133, 100)];
[new Rectangle(800, 600), new Rectangle(100, 100), new Rectangle(133, 100)], yield [new Rectangle(800, 600), new Rectangle(200, 100), new Rectangle(200, 150)];
[new Rectangle(800, 600), new Rectangle(200, 100), new Rectangle(200, 150)], yield [new Rectangle(800, 600), new Rectangle(100, 200), new Rectangle(267, 200)];
[new Rectangle(800, 600), new Rectangle(100, 200), new Rectangle(267, 200)], yield [new Rectangle(800, 600), new Rectangle(2000, 10), new Rectangle(2000, 1500)];
[new Rectangle(800, 600), new Rectangle(2000, 10), new Rectangle(2000, 1500)], yield [new Rectangle(800, 600), new Rectangle(10, 2000), new Rectangle(2667, 2000)];
[new Rectangle(800, 600), new Rectangle(10, 2000), new Rectangle(2667, 2000)], yield [new Rectangle(800, 600), new Rectangle(800, 600), new Rectangle(800, 600)];
[new Rectangle(800, 600), new Rectangle(800, 600), new Rectangle(800, 600)], yield [new Rectangle(400, 300), new Rectangle(120, 120), new Rectangle(160, 120)];
[new Rectangle(400, 300), new Rectangle(120, 120), new Rectangle(160, 120)], yield [new Rectangle(600, 800), new Rectangle(100, 100), new Rectangle(100, 133)];
[new Rectangle(600, 800), new Rectangle(100, 100), new Rectangle(100, 133)], yield [new Rectangle(100, 100), new Rectangle(800, 600), new Rectangle(800, 800)];
[new Rectangle(100, 100), new Rectangle(800, 600), new Rectangle(800, 800)],
];
} }
#[DataProvider('containDataProvider')] #[DataProvider('containDataProvider')]
public function testContain($origin, $target, $result): void public function testContain(Rectangle $origin, Rectangle $target, Rectangle $result): void
{ {
$resizer = new RectangleResizer(); $resizer = new RectangleResizer();
$resizer->toSize($target); $resizer->toSize($target);
@@ -416,23 +415,21 @@ final class RectangleResizerTest extends TestCase
$this->assertEquals($result->height(), $resized->height()); $this->assertEquals($result->height(), $resized->height());
} }
public static function containDataProvider(): array public static function containDataProvider(): Generator
{ {
return [ yield [new Rectangle(800, 600), new Rectangle(100, 100), new Rectangle(100, 75)];
[new Rectangle(800, 600), new Rectangle(100, 100), new Rectangle(100, 75)], yield [new Rectangle(800, 600), new Rectangle(200, 100), new Rectangle(133, 100)];
[new Rectangle(800, 600), new Rectangle(200, 100), new Rectangle(133, 100)], yield [new Rectangle(800, 600), new Rectangle(100, 200), new Rectangle(100, 75)];
[new Rectangle(800, 600), new Rectangle(100, 200), new Rectangle(100, 75)], yield [new Rectangle(800, 600), new Rectangle(2000, 10), new Rectangle(13, 10)];
[new Rectangle(800, 600), new Rectangle(2000, 10), new Rectangle(13, 10)], yield [new Rectangle(800, 600), new Rectangle(10, 2000), new Rectangle(10, 8)];
[new Rectangle(800, 600), new Rectangle(10, 2000), new Rectangle(10, 8)], yield [new Rectangle(800, 600), new Rectangle(800, 600), new Rectangle(800, 600)];
[new Rectangle(800, 600), new Rectangle(800, 600), new Rectangle(800, 600)], yield [new Rectangle(400, 300), new Rectangle(120, 120), new Rectangle(120, 90)];
[new Rectangle(400, 300), new Rectangle(120, 120), new Rectangle(120, 90)], yield [new Rectangle(600, 800), new Rectangle(100, 100), new Rectangle(75, 100)];
[new Rectangle(600, 800), new Rectangle(100, 100), new Rectangle(75, 100)], yield [new Rectangle(100, 100), new Rectangle(800, 600), new Rectangle(600, 600)];
[new Rectangle(100, 100), new Rectangle(800, 600), new Rectangle(600, 600)],
];
} }
#[DataProvider('cropDataProvider')] #[DataProvider('cropDataProvider')]
public function testCrop($origin, $target, $position, $result): void public function testCrop(Rectangle $origin, Rectangle $target, string $position, Rectangle $result): void
{ {
$resizer = new RectangleResizer(); $resizer = new RectangleResizer();
$resizer->toSize($target); $resizer->toSize($target);
@@ -443,17 +440,55 @@ final class RectangleResizerTest extends TestCase
$this->assertEquals($result->pivot()->y(), $resized->pivot()->y()); $this->assertEquals($result->pivot()->y(), $resized->pivot()->y());
} }
public static function cropDataProvider(): array public static function cropDataProvider(): Generator
{ {
return [ yield [
[new Rectangle(800, 600), new Rectangle(100, 100), 'center', new Rectangle(100, 100, new Point(350, 250))], new Rectangle(800, 600),
[new Rectangle(800, 600), new Rectangle(200, 100), 'center', new Rectangle(200, 100, new Point(300, 250))], new Rectangle(100, 100),
[new Rectangle(800, 600), new Rectangle(100, 200), 'center', new Rectangle(100, 200, new Point(350, 200))], 'center',
[new Rectangle(800, 600), new Rectangle(2000, 10), 'center', new Rectangle(2000, 10, new Point(-600, 295))], new Rectangle(100, 100, new Point(350, 250))
[new Rectangle(800, 600), new Rectangle(10, 2000), 'center', new Rectangle(10, 2000, new Point(395, -700))], ];
[new Rectangle(800, 600), new Rectangle(800, 600), 'center', new Rectangle(800, 600, new Point(0, 0))], yield [
[new Rectangle(400, 300), new Rectangle(120, 120), 'center', new Rectangle(120, 120, new Point(140, 90))], new Rectangle(800, 600),
[new Rectangle(600, 800), new Rectangle(100, 100), 'center', new Rectangle(100, 100, new Point(250, 350))], new Rectangle(200, 100),
'center',
new Rectangle(200, 100, new Point(300, 250))
];
yield [
new Rectangle(800, 600),
new Rectangle(100, 200),
'center',
new Rectangle(100, 200, new Point(350, 200))
];
yield [
new Rectangle(800, 600),
new Rectangle(2000, 10),
'center',
new Rectangle(2000, 10, new Point(-600, 295))
];
yield [
new Rectangle(800, 600),
new Rectangle(10, 2000),
'center',
new Rectangle(10, 2000, new Point(395, -700))
];
yield [
new Rectangle(800, 600),
new Rectangle(800, 600),
'center',
new Rectangle(800, 600, new Point(0, 0))
];
yield [
new Rectangle(400, 300),
new Rectangle(120, 120),
'center',
new Rectangle(120, 120, new Point(140, 90))
];
yield [
new Rectangle(600, 800),
new Rectangle(100, 100),
'center',
new Rectangle(100, 100, new Point(250, 350))
]; ];
} }
} }

8
tests/Unit/InputHandlerTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit; namespace Intervention\Image\Tests\Unit;
use Generator;
use Intervention\Image\Colors\Rgb\Decoders\HexColorDecoder; use Intervention\Image\Colors\Rgb\Decoders\HexColorDecoder;
use Intervention\Image\Drivers\Gd\Driver as GdDriver; use Intervention\Image\Drivers\Gd\Driver as GdDriver;
use Intervention\Image\Drivers\Imagick\Driver as ImagickDriver; use Intervention\Image\Drivers\Imagick\Driver as ImagickDriver;
@@ -33,7 +34,7 @@ class InputHandlerTest extends BaseTestCase
} }
} }
public static function testHandleProvider(): array public static function testHandleProvider(): Generator
{ {
$base = [ $base = [
[null, DecoderException::class], [null, DecoderException::class],
@@ -49,16 +50,13 @@ class InputHandlerTest extends BaseTestCase
[file_get_contents(self::getTestResourcePath()), ImageInterface::class], [file_get_contents(self::getTestResourcePath()), ImageInterface::class],
]; ];
$data = [];
$drivers = [GdDriver::class, ImagickDriver::class]; $drivers = [GdDriver::class, ImagickDriver::class];
foreach ($drivers as $driver) { foreach ($drivers as $driver) {
foreach ($base as $line) { foreach ($base as $line) {
array_unshift($line, $driver); // prepend driver array_unshift($line, $driver); // prepend driver
$data[] = $line; yield $line;
} }
} }
return $data;
} }
public function testResolveWithoutDriver(): void public function testResolveWithoutDriver(): void

57
tests/Unit/MediaTypeTest.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Intervention\Image\Tests\Unit; namespace Intervention\Image\Tests\Unit;
use Generator;
use Intervention\Image\FileExtension; use Intervention\Image\FileExtension;
use Intervention\Image\Format; use Intervention\Image\Format;
use Intervention\Image\MediaType; use Intervention\Image\MediaType;
@@ -118,35 +119,33 @@ final class MediaTypeTest extends BaseTestCase
$this->assertEquals($fileExtension, $mediaType->fileExtension()); $this->assertEquals($fileExtension, $mediaType->fileExtension());
} }
public static function fileExtensionsDataProvider(): array public static function fileExtensionsDataProvider(): Generator
{ {
return [ yield [MediaType::IMAGE_JPEG, 2, FileExtension::JPG];
[MediaType::IMAGE_JPEG, 2, FileExtension::JPG], yield [MediaType::IMAGE_JPG, 2, FileExtension::JPG];
[MediaType::IMAGE_JPG, 2, FileExtension::JPG], yield [MediaType::IMAGE_PJPEG, 2, FileExtension::JPG];
[MediaType::IMAGE_PJPEG, 2, FileExtension::JPG], yield [MediaType::IMAGE_X_JPEG, 2, FileExtension::JPG];
[MediaType::IMAGE_X_JPEG, 2, FileExtension::JPG], yield [MediaType::IMAGE_WEBP, 1, FileExtension::WEBP];
[MediaType::IMAGE_WEBP, 1, FileExtension::WEBP], yield [MediaType::IMAGE_X_WEBP, 1, FileExtension::WEBP];
[MediaType::IMAGE_X_WEBP, 1, FileExtension::WEBP], yield [MediaType::IMAGE_GIF, 1, FileExtension::GIF];
[MediaType::IMAGE_GIF, 1, FileExtension::GIF], yield [MediaType::IMAGE_PNG, 1, FileExtension::PNG];
[MediaType::IMAGE_PNG, 1, FileExtension::PNG], yield [MediaType::IMAGE_X_PNG, 1, FileExtension::PNG];
[MediaType::IMAGE_X_PNG, 1, FileExtension::PNG], yield [MediaType::IMAGE_AVIF, 1, FileExtension::AVIF];
[MediaType::IMAGE_AVIF, 1, FileExtension::AVIF], yield [MediaType::IMAGE_X_AVIF, 1, FileExtension::AVIF];
[MediaType::IMAGE_X_AVIF, 1, FileExtension::AVIF], yield [MediaType::IMAGE_BMP, 1, FileExtension::BMP];
[MediaType::IMAGE_BMP, 1, FileExtension::BMP], yield [MediaType::IMAGE_MS_BMP, 1, FileExtension::BMP];
[MediaType::IMAGE_MS_BMP, 1, FileExtension::BMP], yield [MediaType::IMAGE_X_BITMAP, 1, FileExtension::BMP];
[MediaType::IMAGE_X_BITMAP, 1, FileExtension::BMP], yield [MediaType::IMAGE_X_BMP, 1, FileExtension::BMP];
[MediaType::IMAGE_X_BMP, 1, FileExtension::BMP], yield [MediaType::IMAGE_X_MS_BMP, 1, FileExtension::BMP];
[MediaType::IMAGE_X_MS_BMP, 1, FileExtension::BMP], yield [MediaType::IMAGE_X_WINDOWS_BMP, 1, FileExtension::BMP];
[MediaType::IMAGE_X_WINDOWS_BMP, 1, FileExtension::BMP], yield [MediaType::IMAGE_X_WIN_BITMAP, 1, FileExtension::BMP];
[MediaType::IMAGE_X_WIN_BITMAP, 1, FileExtension::BMP], yield [MediaType::IMAGE_X_XBITMAP, 1, FileExtension::BMP];
[MediaType::IMAGE_X_XBITMAP, 1, FileExtension::BMP], yield [MediaType::IMAGE_TIFF, 2, FileExtension::TIF];
[MediaType::IMAGE_TIFF, 2, FileExtension::TIF], yield [MediaType::IMAGE_JP2, 8, FileExtension::JP2];
[MediaType::IMAGE_JP2, 8, FileExtension::JP2], yield [MediaType::IMAGE_JPX, 8, FileExtension::JP2];
[MediaType::IMAGE_JPX, 8, FileExtension::JP2], yield [MediaType::IMAGE_JPM, 8, FileExtension::JP2];
[MediaType::IMAGE_JPM, 8, FileExtension::JP2], yield [MediaType::IMAGE_HEIC, 2, FileExtension::HEIC];
[MediaType::IMAGE_HEIC, 2, FileExtension::HEIC], yield [MediaType::IMAGE_X_HEIC, 2, FileExtension::HEIC];
[MediaType::IMAGE_X_HEIC, 2, FileExtension::HEIC], yield [MediaType::IMAGE_HEIF, 2, FileExtension::HEIC];
[MediaType::IMAGE_HEIF, 2, FileExtension::HEIC],
];
} }
} }