Support intervention/image v4 and drop v3

- Require intervention/image ^4.0 and bump PHP to ^8.3 (v4's floor); drop Laravel 9 / testbench 7 accordingly
- Port to the v4 API: read()->decode(), encodeByExtension()->encodeUsingFileExtension(), greyscale()->grayscale(), and pickColor()->colorAt() in tests
- Trim the CI matrix to PHP 8.3-8.5
- Add #[Override] attributes now surfaced by Rector under the 8.3 floor

Author: sdebacker

.github/workflows/tests.yml

@@ -9,7 +9,7 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ ubuntu-latest ]
-                php: [ 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ]
+                php: [ 8.5, 8.4, 8.3 ]
                 laravel: [ 13.*, 12.*, 11.*, 10.* ]
                 stability: [ prefer-stable ]
                 include:
@@ -24,24 +24,8 @@ jobs:
                 exclude:
                     -   laravel: 13.*
                         php: 8.3
-                    -   laravel: 13.*
-                        php: 8.2
-                    -   laravel: 13.*
-                        php: 8.1
-                    -   laravel: 13.*
-                        php: 8.0
-                    -   laravel: 12.*
-                        php: 8.1
-                    -   laravel: 12.*
-                        php: 8.0
-                    -   laravel: 11.*
-                        php: 8.1
-                    -   laravel: 11.*
-                        php: 8.0
                     -   laravel: 10.*
                         php: 8.5
-                    -   laravel: 10.*
-                        php: 8.0
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

composer.json

@@ -18,11 +18,11 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "illuminate/console": "^9.0|^10.0|^11.0|^12.0|^13.0",
-        "illuminate/support": "^9.0|^10.0|^11.0|^12.0|^13.0",
-        "illuminate/routing": "^9.0|^10.0|^11.0|^12.0|^13.0",
-        "intervention/image": "^3.6",
+        "php": "^8.3",
+        "illuminate/console": "^10.0|^11.0|^12.0|^13.0",
+        "illuminate/support": "^10.0|^11.0|^12.0|^13.0",
+        "illuminate/routing": "^10.0|^11.0|^12.0|^13.0",
+        "intervention/image": "^4.0",
         "league/flysystem": "^3.0",
         "symfony/http-foundation": "^6.0|^7.0|^8.0",
         "symfony/http-kernel": "^6.0|^7.0|^8.0",
@@ -31,7 +31,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9.5.10|^11.5.3|^12.5.12",
         "mockery/mockery": "^1.4.4",
-        "orchestra/testbench": "^7.5|^8.0|^9.0|^10.0|^11.0",
+        "orchestra/testbench": "^8.0|^9.0|^10.0|^11.0",
         "larastan/larastan": "^2.11.2|^3.9",
         "driftingly/rector-laravel": "^1.0|^2.1",
         "laravel/pint": "^1.0"

src/Commands/Purge.php

@@ -5,12 +5,15 @@
 namespace Bkwld\Croppa\Commands;
 
 use Bkwld\Croppa\Storage;
+use Illuminate\Console\Attributes\Description;
 use Illuminate\Console\Command;
+use Override;
 use Symfony\Component\Console\Input\InputOption;
 
 /**
  * Delete all crops from the crops_disk.
  */
+#[Description('Delete all crops')]
 class Purge extends Command
 {
     /**
@@ -20,13 +23,6 @@ class Purge extends Command
      */
     protected $name = 'croppa:purge';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Delete all crops';
-
     /**
      * Dependency inject.
      */
@@ -51,6 +47,7 @@ public function handle(): void
      *
      * @return array<InputOption>
      */
+    #[Override]
     protected function getOptions(): array
     {
         return [

src/CroppaServiceProvider.php

@@ -8,9 +8,11 @@
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
+use Override;
 
 class CroppaServiceProvider extends ServiceProvider
 {
+    #[Override]
     public function register(): void
     {
         // Bind the Croppa URL generator and parser.

src/Filters/BlackWhite.php

@@ -10,6 +10,6 @@ class BlackWhite implements FilterInterface
 {
     public function applyFilter(ImageInterface $image): ImageInterface
     {
-        return $image->greyscale();
+        return $image->grayscale();
     }
 }

src/Filters/Darkgray.php

@@ -10,6 +10,6 @@ class Darkgray implements FilterInterface
 {
     public function applyFilter(ImageInterface $image): ImageInterface
     {
-        return $image->greyscale()->colorize(-50, -50, -50);
+        return $image->grayscale()->colorize(-50, -50, -50);
     }
 }

src/Filters/OrangeWarhol.php

@@ -10,6 +10,6 @@ class OrangeWarhol implements FilterInterface
 {
     public function applyFilter(ImageInterface $image): ImageInterface
     {
-        return $image->greyscale()->brightness(50)->colorize(-10, -70, -100);
+        return $image->grayscale()->brightness(50)->colorize(-10, -70, -100);
     }
 }

src/Filters/TurquoiseWarhol.php

@@ -10,6 +10,6 @@ class TurquoiseWarhol implements FilterInterface
 {
     public function applyFilter(ImageInterface $image): ImageInterface
     {
-        return $image->greyscale()->brightness(50)->colorize(-70, -10, -20);
+        return $image->grayscale()->brightness(50)->colorize(-70, -10, -20);
     }
 }

src/Image.php

@@ -29,7 +29,7 @@ class Image
     public function __construct(string $path, array $options = [])
     {
         $imageManager = new ImageManager(new Driver);
-        $this->image = $imageManager->read($path);
+        $this->image = $imageManager->decode($path);
         $this->interlace = $options['interlace'];
         $this->upsize = $options['upsize'];
         if (isset($options['quality']) && is_array($options['quality'])) {
@@ -247,6 +247,6 @@ private function getFormatFromPath(string $path): string
      */
     public function get(): string
     {
-        return (string) $this->image->encodeByExtension($this->format, progressive: $this->interlace, quality: $this->quality);
+        return (string) $this->image->encodeUsingFileExtension($this->format, progressive: $this->interlace, quality: $this->quality);
     }
 }

src/Storage.php

@@ -152,7 +152,7 @@ public function path(string $path): string
                 return $tmpDisk->path($path);
             }
 
-            // With Intervention 3, this will lead to a DecoderException ("Unable to decode input")
+            // With Intervention Image, this will lead to a DecoderException ("Unable to decode input")
             // We should probably throw an exception here to inform the developer that a tmp_disk is required.
             return $filesystemAdapter->url($path);
         }