Refactor code

Author: olivervogel

src/Drivers/Gd/Modifiers/FillModifier.php

@@ -23,7 +23,9 @@ class FillModifier extends GenericFillModifier implements SpecializedInterface
      */
     public function apply(ImageInterface $image): ImageInterface
     {
-        $color = $this->color($image);
+        $color = $this->driver()->colorProcessor($image)->colorToNative(
+            $this->color()
+        );
 
         foreach ($image as $frame) {
             if ($this->hasPosition()) {
@@ -36,16 +38,6 @@ public function apply(ImageInterface $image): ImageInterface
         return $image;
     }
 
-    /**
-     * @throws StateException
-     */
-    private function color(ImageInterface $image): int
-    {
-        return $this->driver()->colorProcessor($image)->colorToNative(
-            $this->driver()->handleColorInput($this->color)
-        );
-    }
-
     /**
      * @throws ModifierException
      */

src/Drivers/Imagick/Modifiers/FillModifier.php

@@ -23,7 +23,7 @@ class FillModifier extends ModifiersFillModifier implements SpecializedInterface
     public function apply(ImageInterface $image): ImageInterface
     {
         $pixel = $this->driver()->colorProcessor($image)->colorToNative(
-            $this->driver()->handleColorInput($this->color)
+            $this->color()
         );
 
         foreach ($image->core()->native() as $frame) {

src/Modifiers/FillModifier.php

@@ -5,6 +5,7 @@
 namespace Intervention\Image\Modifiers;
 
 use Intervention\Image\Drivers\SpecializableModifier;
+use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\PointInterface;
 
 class FillModifier extends SpecializableModifier
@@ -23,4 +24,12 @@ public function hasPosition(): bool
     {
         return $this->position instanceof PointInterface;
     }
+
+    /**
+     * Return filling color object:
+     */
+    protected function color(): ColorInterface
+    {
+        return $this->driver()->handleColorInput($this->color);
+    }
 }