1
0
mirror of https://github.com/Intervention/image.git synced 2025-08-14 09:54:13 +02:00

Rename Resizer::class to RectangleResizer::class

This commit is contained in:
Oliver Vogel
2022-07-20 16:02:49 +02:00
parent 16cc19a5d0
commit b30fcc4a6a
3 changed files with 62 additions and 62 deletions

View File

@@ -2,7 +2,7 @@
namespace Intervention\Image\Geometry; namespace Intervention\Image\Geometry;
use Intervention\Image\Geometry\Tools\Resizer; use Intervention\Image\Geometry\Tools\RectangleResizer;
use Intervention\Image\Interfaces\PointInterface; use Intervention\Image\Interfaces\PointInterface;
use Intervention\Image\Interfaces\SizeInterface; use Intervention\Image\Interfaces\SizeInterface;
@@ -200,9 +200,9 @@ class Rectangle extends Polygon implements SizeInterface
return $this->width() < $this->height(); return $this->width() < $this->height();
} }
protected function getResizer(?int $width = null, ?int $height = null): Resizer protected function getResizer(?int $width = null, ?int $height = null): RectangleResizer
{ {
return new Resizer($width, $height); return new RectangleResizer($width, $height);
} }
public function resize(?int $width = null, ?int $height = null): SizeInterface public function resize(?int $width = null, ?int $height = null): SizeInterface

View File

@@ -6,7 +6,7 @@ use Intervention\Image\Exceptions\GeometryException;
use Intervention\Image\Geometry\Rectangle; use Intervention\Image\Geometry\Rectangle;
use Intervention\Image\Interfaces\SizeInterface; use Intervention\Image\Interfaces\SizeInterface;
class Resizer class RectangleResizer
{ {
public function __construct( public function __construct(
protected ?int $width = null, protected ?int $width = null,

View File

@@ -4,61 +4,61 @@ namespace Intervention\Image\Tests\Geometry;
use Intervention\Image\Geometry\Point; use Intervention\Image\Geometry\Point;
use Intervention\Image\Geometry\Rectangle; use Intervention\Image\Geometry\Rectangle;
use Intervention\Image\Geometry\Tools\Resizer; use Intervention\Image\Geometry\Tools\RectangleResizer;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
/** /**
* @covers \Intervention\Image\Geometry\Resizer * @covers \Intervention\Image\Geometry\Tools\RectangleResizer
*/ */
class ResizerTest extends TestCase class RectangleRectangleResizerTest extends TestCase
{ {
public function testMake(): void public function testMake(): void
{ {
$resizer = Resizer::to(); $resizer = RectangleResizer::to();
$this->assertInstanceOf(Resizer::class, $resizer); $this->assertInstanceOf(RectangleResizer::class, $resizer);
$resizer = Resizer::to(height: 100); $resizer = RectangleResizer::to(height: 100);
$this->assertInstanceOf(Resizer::class, $resizer); $this->assertInstanceOf(RectangleResizer::class, $resizer);
$resizer = Resizer::to(100); $resizer = RectangleResizer::to(100);
$this->assertInstanceOf(Resizer::class, $resizer); $this->assertInstanceOf(RectangleResizer::class, $resizer);
$resizer = Resizer::to(100, 100); $resizer = RectangleResizer::to(100, 100);
$this->assertInstanceOf(Resizer::class, $resizer); $this->assertInstanceOf(RectangleResizer::class, $resizer);
} }
public function testToWidth(): void public function testToWidth(): void
{ {
$resizer = new Resizer(); $resizer = new RectangleResizer();
$result = $resizer->toWidth(100); $result = $resizer->toWidth(100);
$this->assertInstanceOf(Resizer::class, $result); $this->assertInstanceOf(RectangleResizer::class, $result);
} }
public function testToHeight(): void public function testToHeight(): void
{ {
$resizer = new Resizer(); $resizer = new RectangleResizer();
$result = $resizer->toHeight(100); $result = $resizer->toHeight(100);
$this->assertInstanceOf(Resizer::class, $result); $this->assertInstanceOf(RectangleResizer::class, $result);
} }
public function testToSize(): void public function testToSize(): void
{ {
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer = $resizer->toSize(new Rectangle(200, 100)); $resizer = $resizer->toSize(new Rectangle(200, 100));
$this->assertInstanceOf(Resizer::class, $resizer); $this->assertInstanceOf(RectangleResizer::class, $resizer);
} }
public function testResize() public function testResize()
{ {
$size = new Rectangle(300, 200); $size = new Rectangle(300, 200);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(150); $resizer->toWidth(150);
$result = $resizer->resize($size); $result = $resizer->resize($size);
$this->assertEquals(150, $result->width()); $this->assertEquals(150, $result->width());
$this->assertEquals(200, $result->height()); $this->assertEquals(200, $result->height());
$size = new Rectangle(300, 200); $size = new Rectangle(300, 200);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(20); $resizer->toWidth(20);
$resizer->toHeight(10); $resizer->toHeight(10);
$result = $resizer->resize($size); $result = $resizer->resize($size);
@@ -66,13 +66,13 @@ class ResizerTest extends TestCase
$this->assertEquals(10, $result->height()); $this->assertEquals(10, $result->height());
$size = new Rectangle(300, 200); $size = new Rectangle(300, 200);
$resizer = new Resizer(width: 150); $resizer = new RectangleResizer(width: 150);
$result = $resizer->resize($size); $result = $resizer->resize($size);
$this->assertEquals(150, $result->width()); $this->assertEquals(150, $result->width());
$this->assertEquals(200, $result->height()); $this->assertEquals(200, $result->height());
$size = new Rectangle(300, 200); $size = new Rectangle(300, 200);
$resizer = new Resizer(height: 10, width: 20); $resizer = new RectangleResizer(height: 10, width: 20);
$result = $resizer->resize($size); $result = $resizer->resize($size);
$this->assertEquals(20, $result->width()); $this->assertEquals(20, $result->width());
$this->assertEquals(10, $result->height()); $this->assertEquals(10, $result->height());
@@ -82,7 +82,7 @@ class ResizerTest extends TestCase
{ {
// 800x600 > 1000x2000 = 800x600 // 800x600 > 1000x2000 = 800x600
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(1000); $resizer->toWidth(1000);
$resizer->toHeight(2000); $resizer->toHeight(2000);
$result = $resizer->resizeDown($size); $result = $resizer->resizeDown($size);
@@ -91,7 +91,7 @@ class ResizerTest extends TestCase
// 800x600 > 400x1000 = 400x600 // 800x600 > 400x1000 = 400x600
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(400); $resizer->toWidth(400);
$resizer->toHeight(1000); $resizer->toHeight(1000);
$result = $resizer->resizeDown($size); $result = $resizer->resizeDown($size);
@@ -100,7 +100,7 @@ class ResizerTest extends TestCase
// 800x600 > 1000x400 = 800x400 // 800x600 > 1000x400 = 800x400
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(1000); $resizer->toWidth(1000);
$resizer->toHeight(400); $resizer->toHeight(400);
$result = $resizer->resizeDown($size); $result = $resizer->resizeDown($size);
@@ -109,7 +109,7 @@ class ResizerTest extends TestCase
// 800x600 > 400x300 = 400x300 // 800x600 > 400x300 = 400x300
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(400); $resizer->toWidth(400);
$resizer->toHeight(300); $resizer->toHeight(300);
$result = $resizer->resizeDown($size); $result = $resizer->resizeDown($size);
@@ -118,7 +118,7 @@ class ResizerTest extends TestCase
// 800x600 > 1000xnull = 800x600 // 800x600 > 1000xnull = 800x600
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(1000); $resizer->toWidth(1000);
$result = $resizer->resizeDown($size); $result = $resizer->resizeDown($size);
$this->assertEquals(800, $result->width()); $this->assertEquals(800, $result->width());
@@ -126,7 +126,7 @@ class ResizerTest extends TestCase
// 800x600 > nullx1000 = 800x600 // 800x600 > nullx1000 = 800x600
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toHeight(1000); $resizer->toHeight(1000);
$result = $resizer->resizeDown($size); $result = $resizer->resizeDown($size);
$this->assertEquals(800, $result->width()); $this->assertEquals(800, $result->width());
@@ -137,7 +137,7 @@ class ResizerTest extends TestCase
{ {
// 800x600 > 1000x2000 = 1000x750 // 800x600 > 1000x2000 = 1000x750
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(1000); $resizer->toWidth(1000);
$resizer->toHeight(2000); $resizer->toHeight(2000);
$result = $resizer->scale($size); $result = $resizer->scale($size);
@@ -146,7 +146,7 @@ class ResizerTest extends TestCase
// 800x600 > 2000x1000 = 1333x1000 // 800x600 > 2000x1000 = 1333x1000
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(2000); $resizer->toWidth(2000);
$resizer->toHeight(1000); $resizer->toHeight(1000);
$result = $resizer->scale($size); $result = $resizer->scale($size);
@@ -155,7 +155,7 @@ class ResizerTest extends TestCase
// // 800x600 > nullx3000 = 4000x3000 // // 800x600 > nullx3000 = 4000x3000
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toHeight(3000); $resizer->toHeight(3000);
$result = $resizer->scale($size); $result = $resizer->scale($size);
$this->assertEquals(4000, $result->width()); $this->assertEquals(4000, $result->width());
@@ -163,7 +163,7 @@ class ResizerTest extends TestCase
// // 800x600 > 8000xnull = 8000x6000 // // 800x600 > 8000xnull = 8000x6000
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(8000); $resizer->toWidth(8000);
$result = $resizer->scale($size); $result = $resizer->scale($size);
$this->assertEquals(8000, $result->width()); $this->assertEquals(8000, $result->width());
@@ -171,7 +171,7 @@ class ResizerTest extends TestCase
// // 800x600 > 100x400 = 100x75 // // 800x600 > 100x400 = 100x75
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(100); $resizer->toWidth(100);
$resizer->toHeight(400); $resizer->toHeight(400);
$result = $resizer->scale($size); $result = $resizer->scale($size);
@@ -180,7 +180,7 @@ class ResizerTest extends TestCase
// // 800x600 > 400x100 = 133x100 // // 800x600 > 400x100 = 133x100
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(400); $resizer->toWidth(400);
$resizer->toHeight(100); $resizer->toHeight(100);
$result = $resizer->scale($size); $result = $resizer->scale($size);
@@ -189,7 +189,7 @@ class ResizerTest extends TestCase
// // 800x600 > nullx300 = 400x300 // // 800x600 > nullx300 = 400x300
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toHeight(300); $resizer->toHeight(300);
$result = $resizer->scale($size); $result = $resizer->scale($size);
$this->assertEquals(400, $result->width()); $this->assertEquals(400, $result->width());
@@ -197,7 +197,7 @@ class ResizerTest extends TestCase
// // 800x600 > 80xnull = 80x60 // // 800x600 > 80xnull = 80x60
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(80); $resizer->toWidth(80);
$result = $resizer->scale($size); $result = $resizer->scale($size);
$this->assertEquals(80, $result->width()); $this->assertEquals(80, $result->width());
@@ -205,7 +205,7 @@ class ResizerTest extends TestCase
// // 640x480 > 225xnull = 225x169 // // 640x480 > 225xnull = 225x169
$size = new Rectangle(640, 480); $size = new Rectangle(640, 480);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(225); $resizer->toWidth(225);
$result = $resizer->scale($size); $result = $resizer->scale($size);
$this->assertEquals(225, $result->width()); $this->assertEquals(225, $result->width());
@@ -213,7 +213,7 @@ class ResizerTest extends TestCase
// // 640x480 > 223xnull = 223x167 // // 640x480 > 223xnull = 223x167
$size = new Rectangle(640, 480); $size = new Rectangle(640, 480);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(223); $resizer->toWidth(223);
$result = $resizer->scale($size); $result = $resizer->scale($size);
$this->assertEquals(223, $result->width()); $this->assertEquals(223, $result->width());
@@ -221,7 +221,7 @@ class ResizerTest extends TestCase
// // 600x800 > 300x300 = 225x300 // // 600x800 > 300x300 = 225x300
$size = new Rectangle(600, 800); $size = new Rectangle(600, 800);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(300); $resizer->toWidth(300);
$resizer->toHeight(300); $resizer->toHeight(300);
$result = $resizer->scale($size); $result = $resizer->scale($size);
@@ -230,7 +230,7 @@ class ResizerTest extends TestCase
// // 800x600 > 400x10 = 13x10 // // 800x600 > 400x10 = 13x10
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(400); $resizer->toWidth(400);
$resizer->toHeight(10); $resizer->toHeight(10);
$result = $resizer->scale($size); $result = $resizer->scale($size);
@@ -239,7 +239,7 @@ class ResizerTest extends TestCase
// // 800x600 > 1000x1200 = 1000x750 // // 800x600 > 1000x1200 = 1000x750
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(1000); $resizer->toWidth(1000);
$resizer->toHeight(1200); $resizer->toHeight(1200);
$result = $resizer->scale($size); $result = $resizer->scale($size);
@@ -247,7 +247,7 @@ class ResizerTest extends TestCase
$this->assertEquals(750, $result->height()); $this->assertEquals(750, $result->height());
$size = new Rectangle(12000, 12); $size = new Rectangle(12000, 12);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(4000); $resizer->toWidth(4000);
$resizer->toHeight(3000); $resizer->toHeight(3000);
$result = $resizer->scale($size); $result = $resizer->scale($size);
@@ -255,7 +255,7 @@ class ResizerTest extends TestCase
$this->assertEquals(4, $result->height()); $this->assertEquals(4, $result->height());
$size = new Rectangle(12, 12000); $size = new Rectangle(12, 12000);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(4000); $resizer->toWidth(4000);
$resizer->toHeight(3000); $resizer->toHeight(3000);
$result = $resizer->scale($size); $result = $resizer->scale($size);
@@ -263,7 +263,7 @@ class ResizerTest extends TestCase
$this->assertEquals(3000, $result->height()); $this->assertEquals(3000, $result->height());
$size = new Rectangle(12000, 6000); $size = new Rectangle(12000, 6000);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(4000); $resizer->toWidth(4000);
$resizer->toHeight(3000); $resizer->toHeight(3000);
$result = $resizer->scale($size); $result = $resizer->scale($size);
@@ -274,7 +274,7 @@ class ResizerTest extends TestCase
public function testScaleDown() public function testScaleDown()
{ {
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(1000); $resizer->toWidth(1000);
$resizer->toHeight(2000); $resizer->toHeight(2000);
$result = $resizer->scaleDown($size); $result = $resizer->scaleDown($size);
@@ -282,7 +282,7 @@ class ResizerTest extends TestCase
$this->assertEquals(600, $result->height()); $this->assertEquals(600, $result->height());
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(1000); $resizer->toWidth(1000);
$resizer->toHeight(600); $resizer->toHeight(600);
$result = $resizer->scaleDown($size); $result = $resizer->scaleDown($size);
@@ -290,7 +290,7 @@ class ResizerTest extends TestCase
$this->assertEquals(600, $result->height()); $this->assertEquals(600, $result->height());
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(1000); $resizer->toWidth(1000);
$resizer->toHeight(300); $resizer->toHeight(300);
$result = $resizer->scaleDown($size); $result = $resizer->scaleDown($size);
@@ -298,7 +298,7 @@ class ResizerTest extends TestCase
$this->assertEquals(300, $result->height()); $this->assertEquals(300, $result->height());
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(400); $resizer->toWidth(400);
$resizer->toHeight(1000); $resizer->toHeight(1000);
$result = $resizer->scaleDown($size); $result = $resizer->scaleDown($size);
@@ -306,42 +306,42 @@ class ResizerTest extends TestCase
$this->assertEquals(300, $result->height()); $this->assertEquals(300, $result->height());
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(400); $resizer->toWidth(400);
$result = $resizer->scaleDown($size); $result = $resizer->scaleDown($size);
$this->assertEquals(400, $result->width()); $this->assertEquals(400, $result->width());
$this->assertEquals(300, $result->height()); $this->assertEquals(300, $result->height());
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toHeight(300); $resizer->toHeight(300);
$result = $resizer->scaleDown($size); $result = $resizer->scaleDown($size);
$this->assertEquals(400, $result->width()); $this->assertEquals(400, $result->width());
$this->assertEquals(300, $result->height()); $this->assertEquals(300, $result->height());
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(1000); $resizer->toWidth(1000);
$result = $resizer->scaleDown($size); $result = $resizer->scaleDown($size);
$this->assertEquals(800, $result->width()); $this->assertEquals(800, $result->width());
$this->assertEquals(600, $result->height()); $this->assertEquals(600, $result->height());
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toHeight(1000); $resizer->toHeight(1000);
$result = $resizer->scaleDown($size); $result = $resizer->scaleDown($size);
$this->assertEquals(800, $result->width()); $this->assertEquals(800, $result->width());
$this->assertEquals(600, $result->height()); $this->assertEquals(600, $result->height());
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(100); $resizer->toWidth(100);
$result = $resizer->scaleDown($size); $result = $resizer->scaleDown($size);
$this->assertEquals(100, $result->width()); $this->assertEquals(100, $result->width());
$this->assertEquals(75, $result->height()); $this->assertEquals(75, $result->height());
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(300); $resizer->toWidth(300);
$resizer->toHeight(200); $resizer->toHeight(200);
$result = $resizer->scaleDown($size); $result = $resizer->scaleDown($size);
@@ -349,7 +349,7 @@ class ResizerTest extends TestCase
$this->assertEquals(200, $result->height()); $this->assertEquals(200, $result->height());
$size = new Rectangle(600, 800); $size = new Rectangle(600, 800);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(300); $resizer->toWidth(300);
$resizer->toHeight(300); $resizer->toHeight(300);
$result = $resizer->scaleDown($size); $result = $resizer->scaleDown($size);
@@ -357,7 +357,7 @@ class ResizerTest extends TestCase
$this->assertEquals(300, $result->height()); $this->assertEquals(300, $result->height());
$size = new Rectangle(800, 600); $size = new Rectangle(800, 600);
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toWidth(400); $resizer->toWidth(400);
$resizer->toHeight(10); $resizer->toHeight(10);
$result = $resizer->scaleDown($size); $result = $resizer->scaleDown($size);
@@ -370,7 +370,7 @@ class ResizerTest extends TestCase
*/ */
public function testCover($origin, $target, $result): void public function testCover($origin, $target, $result): void
{ {
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toSize($target); $resizer->toSize($target);
$resized = $resizer->cover($origin); $resized = $resizer->cover($origin);
$this->assertEquals($result->width(), $resized->width()); $this->assertEquals($result->width(), $resized->width());
@@ -397,7 +397,7 @@ class ResizerTest extends TestCase
*/ */
public function testContain($origin, $target, $result): void public function testContain($origin, $target, $result): void
{ {
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toSize($target); $resizer->toSize($target);
$resized = $resizer->contain($origin); $resized = $resizer->contain($origin);
$this->assertEquals($result->width(), $resized->width()); $this->assertEquals($result->width(), $resized->width());
@@ -424,7 +424,7 @@ class ResizerTest extends TestCase
*/ */
public function testCrop($origin, $target, $position, $result): void public function testCrop($origin, $target, $position, $result): void
{ {
$resizer = new Resizer(); $resizer = new RectangleResizer();
$resizer->toSize($target); $resizer->toSize($target);
$resized = $resizer->crop($origin, $position); $resized = $resizer->crop($origin, $position);
$this->assertEquals($result->width(), $resized->width()); $this->assertEquals($result->width(), $resized->width());