Merge pull request #380 from Art4/upgrade-to-glide-3

Upgrade to intervention/image 3

.github/workflows/test.yaml

@@ -4,7 +4,7 @@ on:
     pull_request: ~
     push:
         branches:
-            - master
+            - upgrade-to-glide-3
 
 jobs:
     coding-style:
@@ -13,22 +13,22 @@ jobs:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: '7.4'
+                  php-version: '8.3'
                   extensions: gd, imagick
             - name: php-cs-fixer
               run: |
-                  wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.4/php-cs-fixer.phar -q
-                  php php-cs-fixer.phar fix --dry-run --diff
+                  composer update --no-interaction --no-ansi --no-progress
+                  vendor/bin/php-cs-fixer fix --dry-run --diff
 
     tests:
         runs-on: ubuntu-22.04
         strategy:
             fail-fast: false
             matrix:
-                php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
+                php-version: ['8.1', '8.2', '8.3', '8.4']
                 prefer-lowest: ['']
                 include:
-                    - php-version: '7.2'
+                    - php-version: '8.1'
                       prefer-lowest: 'prefer-lowest'
         steps:
             - uses: actions/checkout@v4

.gitignore

@@ -1,6 +1,7 @@
 build
 vendor
 docs/_site
-.php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache
 composer.lock
+.history

.php-cs-fixer.dist.php

@@ -0,0 +1,14 @@
+<?php
+
+$finder = (new PhpCsFixer\Finder())
+    ->in('src')
+    ->in('tests')
+;
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@Symfony' => true,
+        'phpdoc_annotation_without_dot' => false,
+    ])
+    ->setFinder($finder)
+;

composer.json

@@ -26,15 +26,16 @@
         }
     ],
     "require": {
-        "php": "^7.2|^8.0",
-        "intervention/image": "^2.7",
+        "php": "^8.1",
+        "intervention/image": "^3.2",
         "league/flysystem": "^2.0|^3.0",
         "psr/http-message": "^1.0|^2.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.3.3",
         "phpunit/phpunit": "^8.5|^9.0",
-        "phpunit/php-token-stream": "^3.1|^4.0"
+        "phpunit/php-token-stream": "^3.1|^4.0",
+        "friendsofphp/php-cs-fixer": "^3.48"
     },
     "autoload": {
         "psr-4": {

src/Api/Api.php

@@ -3,7 +3,6 @@
 namespace League\Glide\Api;
 
 use Intervention\Image\ImageManager;
-use InvalidArgumentException;
 use League\Glide\Manipulators\ManipulatorInterface;
 
 class Api implements ApiInterface
@@ -18,7 +17,7 @@ class Api implements ApiInterface
     /**
      * Collection of manipulators.
      *
-     * @var array
+     * @var ManipulatorInterface[]
      */
     protected $manipulators;
 
@@ -59,15 +58,15 @@ public function getImageManager()
     /**
      * Set the manipulators.
      *
-     * @param array $manipulators Collection of manipulators.
+     * @param ManipulatorInterface[] $manipulators Collection of manipulators.
      *
      * @return void
      */
     public function setManipulators(array $manipulators)
     {
         foreach ($manipulators as $manipulator) {
             if (!($manipulator instanceof ManipulatorInterface)) {
-                throw new InvalidArgumentException('Not a valid manipulator.');
+                throw new \InvalidArgumentException('Not a valid manipulator.');
             }
         }
 
@@ -94,14 +93,14 @@ public function getManipulators()
      */
     public function run($source, array $params)
     {
-        $image = $this->imageManager->make($source);
+        $image = $this->imageManager->read($source);
 
         foreach ($this->manipulators as $manipulator) {
             $manipulator->setParams($params);
 
             $image = $manipulator->run($image);
         }
 
-        return $image->getEncoded();
+        return $image->encodeByMediaType()->toString();
     }
 }

src/Filesystem/FileNotFoundException.php

@@ -2,8 +2,6 @@
 
 namespace League\Glide\Filesystem;
 
-use Exception;
-
-class FileNotFoundException extends Exception
+class FileNotFoundException extends \Exception
 {
 }

src/Filesystem/FilesystemException.php

@@ -2,8 +2,6 @@
 
 namespace League\Glide\Filesystem;
 
-use Exception;
-
-class FilesystemException extends Exception
+class FilesystemException extends \Exception
 {
 }

src/Manipulators/Background.php

@@ -2,7 +2,8 @@
 
 namespace League\Glide\Manipulators;
 
-use Intervention\Image\Image;
+use Intervention\Image\Interfaces\ImageInterface;
+use Intervention\Image\Origin;
 use League\Glide\Manipulators\Helpers\Color;
 
 /**
@@ -13,11 +14,11 @@ class Background extends BaseManipulator
     /**
      * Perform background 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
     {
         if (is_null($this->bg)) {
             return $image;
@@ -26,9 +27,14 @@ public function run(Image $image)
         $color = (new Color($this->bg))->formatted();
 
         if ($color) {
-            $new = $image->getDriver()->newImage($image->width(), $image->height(), $color);
-            $new->mime = $image->mime;
-            $image = $new->insert($image, 'top-left', 0, 0);
+            $new = $image->driver()->createImage($image->width(), $image->height())
+                ->fill($color)
+                ->place($image, 'top-left', 0, 0)
+                ->setOrigin(
+                    new Origin($image->origin()->mediaType())
+                );
+
+            $image = $new;
         }
 
         return $image;

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
@@ -12,11 +12,11 @@ class Blur extends BaseManipulator
     /**
      * Perform blur 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
     {
         $blur = $this->getBlur();