From fc94da24104e2c5bb51a813287ad73fc007f8374 Mon Sep 17 00:00:00 2001
From: Oliver Vogel <oliver@olivervogel.com>
Date: Sat, 21 Oct 2023 11:41:03 +0200
Subject: [PATCH] Refactor code

---
 src/Drivers/Gd/Modifiers/PlaceModifier.php      | 12 +++---------
 src/Drivers/Imagick/Modifiers/PlaceModifier.php | 12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/Drivers/Gd/Modifiers/PlaceModifier.php b/src/Drivers/Gd/Modifiers/PlaceModifier.php
index 1c35c435..a8a9b56a 100644
--- a/src/Drivers/Gd/Modifiers/PlaceModifier.php
+++ b/src/Drivers/Gd/Modifiers/PlaceModifier.php
@@ -2,15 +2,14 @@
 
 namespace Intervention\Image\Drivers\Gd\Modifiers;
 
-use Intervention\Image\Drivers\Gd\Image;
 use Intervention\Image\Interfaces\ImageInterface;
 use Intervention\Image\Interfaces\ModifierInterface;
 use Intervention\Image\Interfaces\PointInterface;
-use Intervention\Image\Traits\CanResolveDriverClass;
+use Intervention\Image\Traits\CanHandleInput;
 
 class PlaceModifier implements ModifierInterface
 {
-    use CanResolveDriverClass;
+    use CanHandleInput;
 
     /**
      * Create new modifier
@@ -27,7 +26,7 @@ class PlaceModifier implements ModifierInterface
 
     public function apply(ImageInterface $image): ImageInterface
     {
-        $watermark = $this->decodeWatermark();
+        $watermark = $this->handleInput($this->element);
         $position = $this->getPosition($image, $watermark);
 
         foreach ($image as $frame) {
@@ -47,11 +46,6 @@ class PlaceModifier implements ModifierInterface
         return $image;
     }
 
-    protected function decodeWatermark(): Image
-    {
-        return $this->resolveDriverClass('InputHandler')->handle($this->element);
-    }
-
     protected function getPosition(ImageInterface $image, ImageInterface $watermark): PointInterface
     {
         $image_size = $image->getSize()->movePivot($this->position, $this->offset_x, $this->offset_y);
diff --git a/src/Drivers/Imagick/Modifiers/PlaceModifier.php b/src/Drivers/Imagick/Modifiers/PlaceModifier.php
index d6181c42..775e7585 100644
--- a/src/Drivers/Imagick/Modifiers/PlaceModifier.php
+++ b/src/Drivers/Imagick/Modifiers/PlaceModifier.php
@@ -4,15 +4,14 @@ namespace Intervention\Image\Drivers\Imagick\Modifiers;
 
 use Imagick;
 use Intervention\Image\Drivers\Imagick\Image;
-use Intervention\Image\Geometry\Point;
 use Intervention\Image\Interfaces\ImageInterface;
 use Intervention\Image\Interfaces\ModifierInterface;
 use Intervention\Image\Interfaces\PointInterface;
-use Intervention\Image\Traits\CanResolveDriverClass;
+use Intervention\Image\Traits\CanHandleInput;
 
 class PlaceModifier implements ModifierInterface
 {
-    use CanResolveDriverClass;
+    use CanHandleInput;
 
     public function __construct(
         protected $element,
@@ -25,7 +24,7 @@ class PlaceModifier implements ModifierInterface
 
     public function apply(ImageInterface $image): ImageInterface
     {
-        $watermark = $this->decodeWatermark();
+        $watermark = $this->handleInput($this->element);
         $position = $this->getPosition($image, $watermark);
 
         foreach ($image as $frame) {
@@ -40,11 +39,6 @@ class PlaceModifier implements ModifierInterface
         return $image;
     }
 
-    protected function decodeWatermark(): Image
-    {
-        return $this->resolveDriverClass('InputHandler')->handle($this->element);
-    }
-
     protected function getPosition(ImageInterface $image, Image $watermark): PointInterface
     {
         $image_size = $image->getSize()->movePivot($this->position, $this->offset_x, $this->offset_y);