Combine image flip methods

Author: olivervogel

src/Colors/Rgb/NamedColor.php

@@ -7,9 +7,7 @@
 use Intervention\Image\Colors\Rgb\Channels\Alpha;
 use Intervention\Image\Colors\Rgb\Color as RgbColor;
 use Intervention\Image\Colors\Rgb\Colorspace as Rgb;
-use Intervention\Image\Colors\Rgb\Decoders\HexColorDecoder;
 use Intervention\Image\Exceptions\ColorDecoderException;
-use Intervention\Image\InputHandler;
 use Intervention\Image\Interfaces\ColorChannelInterface;
 use Intervention\Image\Interfaces\ColorInterface;
 use Intervention\Image\Interfaces\ColorspaceInterface;
@@ -421,6 +419,10 @@ public function withTransparency(float $transparency): ColorInterface
      */
     private function toRgbColor(): RgbColor
     {
-        return $this->colorspace()->importColor($this);
+        $color = $this->colorspace()->importColor($this);
+
+        return $color instanceof RgbColor
+            ? $color
+            : throw new ColorDecoderException('Failed to convert named color to rgb object');
     }
 }

src/Direction.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Intervention\Image;
+
+enum Direction
+{
+    case HORIZONTAL;
+    case VERTICAL;
+}

src/Drivers/Gd/Modifiers/AlignRotationModifier.php

@@ -17,20 +17,30 @@ class AlignRotationModifier extends GenericAlignRotationModifier implements Spec
      */
     public function apply(ImageInterface $image): ImageInterface
     {
-        $image = match ($image->exif('IFD0.Orientation')) {
-            2 => $image->flop(),
+        $image = match ($this->orientation($image)) {
+            2 => $image->flip(),
             3 => $image->rotate(180),
-            4 => $image->rotate(180)->flop(),
-            5 => $image->rotate(270)->flop(),
-            6 => $image->rotate(270),
-            7 => $image->rotate(90)->flop(),
-            8 => $image->rotate(90),
+            4 => $image->rotate(180)->flip(),
+            5 => $image->rotate(90)->flip(),
+            6 => $image->rotate(90),
+            7 => $image->rotate(270)->flip(),
+            8 => $image->rotate(270),
             default => $image
         };
 
         return $this->markAligned($image);
     }
 
+    /**
+     * Return exif information about image orientation.
+     */
+    private function orientation(ImageInterface $image): int
+    {
+        $orientation = $image->exif('IFD0.Orientation');
+
+        return is_numeric($orientation) ? (int) $orientation : 0;
+    }
+
     /**
      * Set exif data of image to top-left orientation, marking the image as
      * aligned and making sure the rotation correction process is not

src/Drivers/Gd/Modifiers/FlipModifier.php

@@ -4,6 +4,7 @@
 
 namespace Intervention\Image\Drivers\Gd\Modifiers;
 
+use Intervention\Image\Direction;
 use Intervention\Image\Exceptions\ModifierException;
 use Intervention\Image\Interfaces\ImageInterface;
 use Intervention\Image\Interfaces\SpecializedInterface;
@@ -20,8 +21,10 @@ class FlipModifier extends GenericFlipModifier implements SpecializedInterface
      */
     public function apply(ImageInterface $image): ImageInterface
     {
+        $direction = $this->direction === Direction::HORIZONTAL ? IMG_FLIP_HORIZONTAL : IMG_FLIP_VERTICAL;
+
         foreach ($image as $frame) {
-            imageflip($frame->native(), IMG_FLIP_VERTICAL);
+            imageflip($frame->native(), $direction);
         }
 
         return $image;

src/Drivers/Gd/Modifiers/FlopModifier.php

@@ -30,16 +30,16 @@ public function apply(ImageInterface $image): ImageInterface
                 => $image->core()->native()->rotateImage('#000', 180) && $image->core()->native()->flopImage(), // 4
 
                 Imagick::ORIENTATION_LEFTTOP
-                => $image->core()->native()->rotateImage('#000', -270) && $image->core()->native()->flopImage(), // 5
+                => $image->core()->native()->rotateImage('#000', 90) && $image->core()->native()->flopImage(), // 5
 
                 Imagick::ORIENTATION_RIGHTTOP
-                => $image->core()->native()->rotateImage('#000', -270), // 6
+                => $image->core()->native()->rotateImage('#000', 90), // 6
 
                 Imagick::ORIENTATION_RIGHTBOTTOM
-                => $image->core()->native()->rotateImage('#000', -90) && $image->core()->native()->flopImage(), // 7
+                => $image->core()->native()->rotateImage('#000', 270) && $image->core()->native()->flopImage(), // 7
 
                 Imagick::ORIENTATION_LEFTBOTTOM
-                => $image->core()->native()->rotateImage('#000', -90), // 8
+                => $image->core()->native()->rotateImage('#000', 270), // 8
 
                 default => 'value',
             };

src/Drivers/Imagick/Modifiers/AlignRotationModifier.php

@@ -5,6 +5,7 @@
 namespace Intervention\Image\Drivers\Imagick\Modifiers;
 
 use ImagickException;
+use Intervention\Image\Direction;
 use Intervention\Image\Exceptions\ModifierException;
 use Intervention\Image\Interfaces\ImageInterface;
 use Intervention\Image\Interfaces\SpecializedInterface;
@@ -19,7 +20,9 @@ public function apply(ImageInterface $image): ImageInterface
     {
         foreach ($image as $frame) {
             try {
-                $result = $frame->native()->flipImage();
+                $result = $this->direction === Direction::HORIZONTAL
+                    ? $frame->native()->flopImage()
+                    : $frame->native()->flipImage();
                 if ($result === false) {
                     throw new ModifierException(
                         'Failed to apply ' . self::class . ', unable to mirror image',

src/Drivers/Imagick/Modifiers/FlipModifier.php

@@ -67,7 +67,6 @@
 use Intervention\Image\Modifiers\DrawRectangleModifier;
 use Intervention\Image\Modifiers\FillModifier;
 use Intervention\Image\Modifiers\FlipModifier;
-use Intervention\Image\Modifiers\FlopModifier;
 use Intervention\Image\Modifiers\GammaModifier;
 use Intervention\Image\Modifiers\GrayscaleModifier;
 use Intervention\Image\Modifiers\InsertModifier;
@@ -546,19 +545,9 @@ public function colorize(int $red = 0, int $green = 0, int $blue = 0): ImageInte
      *
      * @see ImageInterface::flip()
      */
-    public function flip(): ImageInterface
+    public function flip(Direction $direction = Direction::HORIZONTAL): ImageInterface
     {
-        return $this->modify(new FlipModifier());
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @see ImageInterface::flop()
-     */
-    public function flop(): ImageInterface
-    {
-        return $this->modify(new FlopModifier());
+        return $this->modify(new FlipModifier($direction));
     }
 
     /**

src/Drivers/Imagick/Modifiers/FlopModifier.php

@@ -15,6 +15,7 @@
 use Intervention\Image\MediaType;
 use Intervention\Image\Origin;
 use Intervention\Image\Alignment;
+use Intervention\Image\Direction;
 use Intervention\Image\Fraction;
 use Intervention\Image\Format;
 use IteratorAggregate;
@@ -273,16 +274,9 @@ public function colorize(int $red = 0, int $green = 0, int $blue = 0): self;
     /**
      * Mirror the current image horizontally.
      *
-     * @link https://image.intervention.io/v3/modifying-images/effects#mirror-image-vertically
+     * @link https://image.intervention.io/v3/modifying-images/effects
      */
-    public function flip(): self;
-
-    /**
-     * Mirror the current image vertically.
-     *
-     * @link https://image.intervention.io/v3/modifying-images/effects#mirror-image-horizontally
-     */
-    public function flop(): self; // TODO: maybe rename
+    public function flip(Direction $direction = Direction::HORIZONTAL): self;
 
     /**
      * Blur current image by given strength.