mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-01-17 12:18:14 +01:00
Code Issues Releases Wiki Activity

Revert position behaviour of resize methods

Browse Source
This commit is contained in:
Oliver Vogel 2023-12-07 18:37:50 +01:00
parent 2fe03aeba7
commit 3b7238f7a8
7 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Interfaces/ImageInterface.php
View File

@ -349,9 +349,9 @@ interface ImageInterface extends IteratorAggregate, Countable
/**
* Resize the boundaries of the current image to given width and height.
* An anchor position can be defined to determine from what point of the
* image the resizing is going to happen. A background color can be passed
* to define the color of the new emerging areas.
* An anchor position can be defined to determine where the original image
* is fixed. A background color can be passed to define the color of the
* new emerging areas.
*
* @param null|int $width
* @param null|int $height

12
src/Modifiers/ContainModifier.php
View File

@ -25,7 +25,7 @@ class ContainModifier extends AbstractModifier
)
->alignPivotTo(
$this->getResizeSize($image),
$this->position()
$this->position
);
}
@ -33,14 +33,4 @@ class ContainModifier extends AbstractModifier
{
return new Rectangle($this->width, $this->height);
}
protected function position(): string
{
return strtr($this->position, [
'left' => 'right',
'right' => 'left',
'top' => 'bottom',
'bottom' => 'top',
]);
}
}

2
src/Modifiers/PadModifier.php
View File

@ -16,7 +16,7 @@ class PadModifier extends ContainModifier
)
->alignPivotTo(
$this->getResizeSize($image),
$this->position()
$this->position
);
}
}

12
src/Modifiers/ResizeCanvasModifier.php
View File

@ -24,17 +24,7 @@ class ResizeCanvasModifier extends AbstractModifier
return (new Rectangle($width, $height))
->alignPivotTo(
$image->size(),
$this->position()
$this->position
);
}
protected function position(): string
{
return strtr($this->position, [
'left' => 'right',
'right' => 'left',
'top' => 'bottom',
'bottom' => 'top',
]);
}
}

2
src/Modifiers/ResizeCanvasRelativeModifier.php
View File

@ -16,7 +16,7 @@ class ResizeCanvasRelativeModifier extends ResizeCanvasModifier
return (new Rectangle($width, $height))
->alignPivotTo(
$image->size(),
$this->position()
$this->position
);
}
}

2
tests/Drivers/Gd/Modifiers/ResizeCanvasModifierTest.php
View File

@ -46,7 +46,7 @@ class ResizeCanvasModifierTest extends TestCase
{
$image = $this->createTestImage(1, 1);
$this->assertColor(255, 0, 0, 255, $image->pickColor(0, 0));
$image->modify(new ResizeCanvasModifier(null, 2, 'ff0', 'top'));
$image->modify(new ResizeCanvasModifier(null, 2, 'ff0', 'bottom'));
$this->assertEquals(1, $image->width());
$this->assertEquals(2, $image->height());
$this->assertColor(255, 255, 0, 255, $image->pickColor(0, 0));

2
tests/Drivers/Imagick/Modifiers/ResizeCanvasModifierTest.php
View File

@ -46,7 +46,7 @@ class ResizeCanvasModifierTest extends TestCase
{
$image = $this->createTestImage(1, 1);
$this->assertColor(255, 0, 0, 255, $image->pickColor(0, 0));
$image->modify(new ResizeCanvasModifier(null, 2, 'ff0', 'top'));
$image->modify(new ResizeCanvasModifier(null, 2, 'ff0', 'bottom'));
$this->assertEquals(1, $image->width());
$this->assertEquals(2, $image->height());
$this->assertColor(255, 255, 0, 255, $image->pickColor(0, 0));