Change signature of ImageInterface::insert()

Author: olivervogel

changelog.md

@@ -70,7 +70,7 @@
 - GreyscaleModifier::class was renamed to GrayscaleModifier::class
 - ImageInterface::greyscale() was renamed to ImageInterface::grayscale()
 - ColorInterface::isGreyscale() was renamed to ColorInterface::isGrayscale()
-- ImageInterface::place() was renamed to ImageInterface::insert, signature changed from `offset_x` to `x` and `offset_y` to `y`
+- ImageInterface::place() was renamed to ImageInterface::insert, signature changed from `offset_x` to `x` and `offset_y` to `y` and updated argument order
 - DrawableFactoryInterface::__invoke() was removed, use DrawableFactoryInterface::build or DrawableFactoryInterface::drawable()
 - FontFactory::__invoke() was removed, use FontFactory::build or FontFactory::font()
 - AnimationFactory::__invoke() was removed, use AnimationFactory::build or AnimationFactory::animation()

src/Image.php

@@ -825,12 +825,12 @@ public function trim(int $tolerance = 0): ImageInterface
      */
     public function insert(
         mixed $element,
-        string|Alignment $alignment = Alignment::TOP_LEFT,
         int $x = 0,
         int $y = 0,
+        string|Alignment $alignment = Alignment::TOP_LEFT,
         int $opacity = 100
     ): ImageInterface {
-        return $this->modify(new InsertModifier($element, $alignment, $x, $y, $opacity));
+        return $this->modify(new InsertModifier($element, $x, $y, $alignment, $opacity));
     }
 
     /**

src/Interfaces/ImageInterface.php

@@ -477,9 +477,9 @@ public function trim(int $tolerance = 0): self;
      */
     public function insert(
         mixed $element,
-        string|Alignment $alignment = Alignment::TOP_LEFT,
         int $x = 0,
         int $y = 0,
+        string|Alignment $alignment = Alignment::TOP_LEFT,
         int $opacity = 100
     ): self;
 

src/Modifiers/InsertModifier.php

@@ -16,9 +16,9 @@ class InsertModifier extends SpecializableModifier
      */
     public function __construct(
         public mixed $element,
-        public string|Alignment $alignment = Alignment::TOP_LEFT,
         public int $x = 0,
         public int $y = 0,
+        public string|Alignment $alignment = Alignment::TOP_LEFT,
         public int $opacity = 100
     ) {
         //

tests/Unit/Drivers/Gd/Modifiers/InsertModifierTest.php

@@ -21,15 +21,15 @@ public function testColorChange(): void
     {
         $image = $this->readTestImage('test.jpg');
         $this->assertEquals('febc44', $image->colorAt(300, 25)->toHex());
-        $image->modify(new InsertModifier(Resource::create('circle.png')->path(), Alignment::TOP_RIGHT, 0, 0));
+        $image->modify(new InsertModifier(Resource::create('circle.png')->path(), 0, 0, Alignment::TOP_RIGHT));
         $this->assertEquals('32250d', $image->colorAt(300, 25)->toHex());
     }
 
     public function testColorChangeOpacityPng(): void
     {
         $image = $this->readTestImage('test.jpg');
         $this->assertEquals('febc44', $image->colorAt(300, 25)->toHex());
-        $image->modify(new InsertModifier(Resource::create('circle.png')->path(), Alignment::TOP_RIGHT, 0, 0, 50));
+        $image->modify(new InsertModifier(Resource::create('circle.png')->path(), 0, 0, Alignment::TOP_RIGHT, 50));
         $this->assertColor(152, 112, 40, 1, $image->colorAt(300, 25), tolerance: 1);
         $this->assertColor(255, 202, 107, 1, $image->colorAt(274, 5), tolerance: 1);
     }

tests/Unit/Drivers/Imagick/Modifiers/InsertModifierTest.php

@@ -21,15 +21,15 @@ public function testColorChange(): void
     {
         $image = $this->readTestImage('test.jpg');
         $this->assertEquals('febc44', $image->colorAt(300, 25)->toHex());
-        $image->modify(new InsertModifier(Resource::create('circle.png')->path(), Alignment::TOP_RIGHT, 0, 0));
+        $image->modify(new InsertModifier(Resource::create('circle.png')->path(), 0, 0, Alignment::TOP_RIGHT));
         $this->assertEquals('33260e', $image->colorAt(300, 25)->toHex());
     }
 
     public function testColorChangeOpacityPng(): void
     {
         $image = $this->readTestImage('test.jpg');
         $this->assertEquals('febc44', $image->colorAt(300, 25)->toHex());
-        $image->modify(new InsertModifier(Resource::create('circle.png')->path(), Alignment::TOP_RIGHT, 0, 0, 50));
+        $image->modify(new InsertModifier(Resource::create('circle.png')->path(), 0, 0, Alignment::TOP_RIGHT, 50));
         $this->assertColor(152, 112, 40, 1, $image->colorAt(300, 25), tolerance: 1);
         $this->assertColor(255, 202, 107, 1, $image->colorAt(274, 5), tolerance: 1);
     }