Fix test for Watermark

src/Manipulators/Background.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 use League\Glide\Manipulators\Helpers\Color;
 
 /**

src/Manipulators/BaseManipulator.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 abstract class BaseManipulator implements ManipulatorInterface
 {
@@ -44,7 +44,7 @@ public function __get($name)
     /**
      * Perform the image manipulation.
      *
-     * @return Image The manipulated image.
+     * @return ImageInterface The manipulated image.
      */
-    abstract public function run(Image $image);
+    abstract public function run(ImageInterface $image): ImageInterface;
 }

src/Manipulators/Blur.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 /**
  * @property string $blur

src/Manipulators/Border.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 use League\Glide\Manipulators\Helpers\Color;
 use League\Glide\Manipulators\Helpers\Dimension;
 

src/Manipulators/Brightness.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 /**
  * @property string|null $bri

src/Manipulators/Contrast.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 /**
  * @property string|null $con

src/Manipulators/Crop.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 /**
  * @property string|null $crop

src/Manipulators/Encode.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 /**
  * @property string $fm

src/Manipulators/Filter.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 /**
  * @property string $filt

src/Manipulators/Flip.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 /**
  * @property string $flip

src/Manipulators/Gamma.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 /**
  * @property string|null $gam

src/Manipulators/Helpers/Dimension.php

@@ -2,14 +2,14 @@
 
 namespace League\Glide\Manipulators\Helpers;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 class Dimension
 {
     /**
      * The source image.
      *
-     * @var Image
+     * @var ImageInterface
      */
     protected $image;
 
@@ -23,10 +23,10 @@ class Dimension
     /**
      * Create dimension helper instance.
      *
-     * @param Image $image The source image.
+     * @param ImageInterface $image The source image.
      * @param float $dpr   The device pixel ratio.
      */
-    public function __construct(Image $image, $dpr = 1)
+    public function __construct(ImageInterface $image, $dpr = 1)
     {
         $this->image = $image;
         $this->dpr = $dpr;

src/Manipulators/ManipulatorInterface.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 interface ManipulatorInterface
 {
@@ -16,9 +16,9 @@ public function setParams(array $params);
     /**
      * Perform the image manipulation.
      *
-     * @param Image $image The source image.
+     * @param ImageInterface $image The source image.
      *
-     * @return Image The manipulated image.
+     * @return ImageInterface The manipulated image.
      */
-    public function run(Image $image);
+    public function run(ImageInterface $image): ImageInterface;
 }

src/Manipulators/Orientation.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 /**
  * @property string $or

src/Manipulators/Pixelate.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 /**
  * @property string $pixel

src/Manipulators/Sharpen.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 /**
  * @property string $sharp

src/Manipulators/Size.php

@@ -2,7 +2,7 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
 
 /**
  * @property string      $dpr
@@ -54,11 +54,11 @@ public function getMaxImageSize()
     /**
      * Perform size image manipulation.
      *
-     * @param Image $image The source image.
+     * @param ImageInterface $image The source image.
      *
-     * @return Image The manipulated image.
+     * @return ImageInterface The manipulated image.
      */
-    public function run(Image $image)
+    public function run(ImageInterface $image): ImageInterface
     {
         $width = $this->getWidth();
         $height = $this->getHeight();
@@ -155,13 +155,13 @@ public function getDpr()
     /**
      * Resolve missing image dimensions.
      *
-     * @param Image    $image  The source image.
+     * @param ImageInterface $image  The source image.
      * @param int|null $width  The image width.
      * @param int|null $height The image height.
      *
      * @return int[] The resolved width and height.
      */
-    public function resolveMissingDimensions(Image $image, $width, $height)
+    public function resolveMissingDimensions(ImageInterface $image, $width, $height)
     {
         if (is_null($width) and is_null($height)) {
             $width = $image->width();
@@ -232,14 +232,14 @@ public function limitImageSize($width, $height)
     /**
      * Perform resize image manipulation.
      *
-     * @param Image  $image  The source image.
+     * @param ImageInterface $image  The source image.
      * @param string $fit    The fit.
      * @param int    $width  The width.
      * @param int    $height The height.
      *
-     * @return Image The manipulated image.
+     * @return ImageInterface The manipulated image.
      */
-    public function runResize(Image $image, $fit, $width, $height)
+    public function runResize(ImageInterface $image, $fit, $width, $height): ImageInterface
     {
         if ('contain' === $fit) {
             return $this->runContainResize($image, $width, $height);
@@ -271,13 +271,13 @@ public function runResize(Image $image, $fit, $width, $height)
     /**
      * Perform contain resize image manipulation.
      *
-     * @param Image $image  The source image.
+     * @param ImageInterface $image  The source image.
      * @param int   $width  The width.
      * @param int   $height The height.
      *
-     * @return Image The manipulated image.
+     * @return ImageInterface The manipulated image.
      */
-    public function runContainResize(Image $image, $width, $height)
+    public function runContainResize(ImageInterface $image, $width, $height): ImageInterface
     {
         return $image->resize($width, $height, function ($constraint) {
             $constraint->aspectRatio();
@@ -287,13 +287,13 @@ public function runContainResize(Image $image, $width, $height)
     /**
      * Perform max resize image manipulation.
      *
-     * @param Image $image  The source image.
+     * @param ImageInterface $image  The source image.
      * @param int   $width  The width.
      * @param int   $height The height.
      *
-     * @return Image The manipulated image.
+     * @return ImageInterface The manipulated image.
      */
-    public function runMaxResize(Image $image, $width, $height)
+    public function runMaxResize(ImageInterface $image, $width, $height): ImageInterface
     {
         return $image->resize($width, $height, function ($constraint) {
             $constraint->aspectRatio();
@@ -304,13 +304,13 @@ public function runMaxResize(Image $image, $width, $height)
     /**
      * Perform fill resize image manipulation.
      *
-     * @param Image $image  The source image.
+     * @param ImageInterface $image  The source image.
      * @param int   $width  The width.
      * @param int   $height The height.
      *
-     * @return Image The manipulated image.
+     * @return ImageInterface The manipulated image.
      */
-    public function runFillResize($image, $width, $height)
+    public function runFillResize(ImageInterface $image, $width, $height): ImageInterface
     {
         $image = $this->runMaxResize($image, $width, $height);
 
@@ -320,13 +320,13 @@ public function runFillResize($image, $width, $height)
     /**
      * Perform fill-max resize image manipulation.
      *
-     * @param Image $image  The source image.
+     * @param ImageInterface $image  The source image.
      * @param int   $width  The width.
      * @param int   $height The height.
      *
-     * @return Image The manipulated image.
+     * @return ImageInterface The manipulated image.
      */
-    public function runFillMaxResize(Image $image, $width, $height)
+    public function runFillMaxResize(ImageInterface $image, $width, $height): ImageInterface
     {
         $image = $image->resize($width, $height, function ($constraint) {
             $constraint->aspectRatio();
@@ -338,27 +338,27 @@ public function runFillMaxResize(Image $image, $width, $height)
     /**
      * Perform stretch resize image manipulation.
      *
-     * @param Image $image  The source image.
+     * @param ImageInterface $image  The source image.
      * @param int   $width  The width.
      * @param int   $height The height.
      *
-     * @return Image The manipulated image.
+     * @return ImageInterface The manipulated image.
      */
-    public function runStretchResize(Image $image, $width, $height)
+    public function runStretchResize(ImageInterface $image, $width, $height): ImageInterface
     {
         return $image->resize($width, $height);
     }
 
     /**
      * Perform crop resize image manipulation.
      *
-     * @param Image $image  The source image.
+     * @param ImageInterface $image  The source image.
      * @param int   $width  The width.
      * @param int   $height The height.
      *
-     * @return Image The manipulated image.
+     * @return ImageInterface The manipulated image.
      */
-    public function runCropResize(Image $image, $width, $height)
+    public function runCropResize(ImageInterface $image, $width, $height): ImageInterface
     {
         list($resize_width, $resize_height) = $this->resolveCropResizeDimensions($image, $width, $height);
 
@@ -376,13 +376,13 @@ public function runCropResize(Image $image, $width, $height)
     /**
      * Resolve the crop resize dimensions.
      *
-     * @param Image $image  The source image.
+     * @param ImageInterface $image  The source image.
      * @param int   $width  The width.
      * @param int   $height The height.
      *
      * @return array The resize dimensions.
      */
-    public function resolveCropResizeDimensions(Image $image, $width, $height)
+    public function resolveCropResizeDimensions(ImageInterface $image, $width, $height): array
     {
         if ($height > $width * ($image->height() / $image->width())) {
             return [$height * ($image->width() / $image->height()), $height];
@@ -394,13 +394,13 @@ public function resolveCropResizeDimensions(Image $image, $width, $height)
     /**
      * Resolve the crop offset.
      *
-     * @param Image $image  The source image.
+     * @param ImageInterface $image  The source image.
      * @param int   $width  The width.
      * @param int   $height The height.
      *
      * @return array The crop offset.
      */
-    public function resolveCropOffset(Image $image, $width, $height)
+    public function resolveCropOffset(ImageInterface $image, $width, $height): array
     {
         list($offset_percentage_x, $offset_percentage_y) = $this->getCrop();