Merge f1d24db5ff into 0a2eef4db4

.github/workflows/ci.yml

@@ -7,11 +7,12 @@ on:
 
 jobs:
   pest:
-    name: Tests (Pest) L${{ matrix.laravel }}
+    name: Tests (Pest) L${{ matrix.laravel }} I${{ matrix.intervention }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         laravel: [10, 11, 12]
+        intervention: [2, 3]
 
     steps:
     - uses: actions/checkout@v2
@@ -22,7 +23,9 @@ jobs:
         tools: composer:v2
         coverage: none
     - name: Install composer dependencies
-      run: composer require "laravel/framework:^${{matrix.laravel}}.0"
+      run: |
+        composer require --dev "laravel/framework:^${{matrix.laravel}}.0"
+        composer require --dev "intervention/image:^${{matrix.intervention}}.0"
     - name: Run tests
       run: vendor/bin/pest
 

composer.json

@@ -29,10 +29,10 @@
     },
     "require-dev": {
         "orchestra/testbench": ">=8.0",
-        "nunomaduro/larastan": ">=2.4",
+        "larastan/larastan": ">=2.4",
         "pestphp/pest": ">=2.0",
         "pestphp/pest-plugin-laravel": ">=2.0",
-        "intervention/image": "^2.7"
+        "intervention/image": "^3.0"
     },
     "extra": {
         "laravel": {

phpstan.neon

@@ -1,5 +1,5 @@
 includes:
-    - ./vendor/nunomaduro/larastan/extension.neon
+    - ./vendor/larastan/larastan/extension.neon
 
 parameters:
     paths:

src/Commands/GenerateFaviconsCommand.php

@@ -37,22 +37,40 @@ class GenerateFaviconsCommand extends Command
             return self::FAILURE;
         }
 
-        // GD driver doesn't support .ico, that's why we use ImageMagick.
+        // Check Intervention Image version
-        $manager = new ImageManager(['driver' => 'imagick']);
+        $interventionV3 = interface_exists('\Intervention\Image\Interfaces\DriverInterface');
+
+        if ($interventionV3) {
+            // v3.x implementation
+            $manager = new ImageManager(
+                new \Intervention\Image\Drivers\Imagick\Driver()
+            );
 
             $this->comment('Generating ico...');
+            $image = $manager->read($path);
+            $image->resize(32, 32);
+            $image->save(public_path('favicon.ico'));
 
-        $manager
+            $this->comment('Generating png...');
+            $image = $manager->read($path);
+            $image->resize(32, 32);
+            $image->save(public_path('favicon.png'));
+        } else {
+            // v2.x implementation
+            $manager = new ImageManager(['driver' => 'imagick']); // @phpstan-ignore argument.type
+
+            $this->comment('Generating ico...');
+            $manager // @phpstan-ignore method.notFound
                 ->make($path)
                 ->resize(32, 32)
                 ->save(public_path('favicon.ico'));
 
             $this->comment('Generating png...');
-
+            $manager // @phpstan-ignore method.notFound
-        $manager
                 ->make($path)
                 ->resize(32, 32)
                 ->save(public_path('favicon.png'));
+        }
 
         $this->info('All favicons have been generated!');