Merge pull request #6 from php-panel/develop

fix: udpate intervention/image

Author: leeqvip

composer.json

@@ -24,7 +24,7 @@
         "php": ">=8.2",
         "symfony/dom-crawler": "~7.3",
         "laravel/framework": "^12.0",
-        "intervention/image": "^2.7"
+        "intervention/image": "^3.11"
     },
     "require-dev": {
         "laravel/laravel": ">=12",
@@ -66,4 +66,4 @@
             }
         }
     }
-}
+}

src/Form/Field/ImageField.php

@@ -3,9 +3,9 @@
 namespace Ladmin\Form\Field;
 
 use Illuminate\Support\Str;
-use Intervention\Image\Constraint;
-use Intervention\Image\Facades\Image as InterventionImage;
-use Intervention\Image\ImageManagerStatic;
+use Intervention\Image\Drivers\Gd\Driver as GdDriver;
+use Intervention\Image\Image as InterventionImage;
+use Intervention\Image\ImageManager;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 trait ImageField
@@ -44,14 +44,17 @@ public function defaultDirectory()
     public function callInterventionMethods($target)
     {
         if (!empty($this->interventionCalls)) {
-            $image = ImageManagerStatic::make($target);
+            $manager = new ImageManager(new GdDriver());
+            $image = $manager->read($target);
 
             foreach ($this->interventionCalls as $call) {
                 call_user_func_array(
                     [$image, $call['method']],
                     $call['arguments']
-                )->save($target);
+                );
             }
+
+            $image->save($target);
         }
 
         return $target;
@@ -73,7 +76,7 @@ public function __call($method, $arguments)
             return $this;
         }
 
-        if (!class_exists(ImageManagerStatic::class)) {
+        if (!class_exists(ImageManager::class)) {
             throw new \Exception('To use image handling and manipulation, please install [intervention/image] first.');
         }
 
@@ -189,13 +192,12 @@ protected function uploadAndDeleteOriginalThumbnail(UploadedFile $file)
             $path = $path . '-' . $name . '.' . $ext;
 
             /** @var \Intervention\Image\Image $image */
-            $image = InterventionImage::make($file);
+            $manager = new ImageManager(new GdDriver());
+            $image = $manager->read($file);
 
             $action = $size[2] ?? 'resize';
             // Resize image with aspect ratio
-            $image->$action($size[0], $size[1], function (Constraint $constraint) {
-                $constraint->aspectRatio();
-            })->resizeCanvas($size[0], $size[1], 'center', false, '#ffffff');
+            $image->$action($size[0], $size[1])->resizeCanvas($size[0], $size[1], 'center', false, '#ffffff');
 
             if (!is_null($this->storagePermission)) {
                 $this->storage->put("{$this->getDirectory()}/{$path}", $image->encode(), $this->storagePermission);

tests/TestCase.php

@@ -1,9 +1,13 @@
 <?php
 
+use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
+use Ladmin\AdminServiceProvider;
+use Ladmin\Facades\Admin;
 use Laravel\BrowserKitTesting\TestCase as BaseTestCase;
 
 class TestCase extends BaseTestCase
@@ -25,13 +29,13 @@ public function createApplication()
         $app = require __DIR__ . '/../vendor/laravel/laravel/bootstrap/app.php';
 
         $app->booting(function () {
-            $loader = \Illuminate\Foundation\AliasLoader::getInstance();
-            $loader->alias('Admin', \Ladmin\Facades\Admin::class);
+            $loader = AliasLoader::getInstance();
+            $loader->alias('Admin', Admin::class);
         });
 
-        $app->make('Illuminate\Contracts\Console\Kernel')->bootstrap();
+        $app->make(Kernel::class)->bootstrap();
 
-        $app->register('Ladmin\AdminServiceProvider');
+        $app->register(AdminServiceProvider::class);
 
         return $app;
     }