Skip to content

fix: udpate intervention/image #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leeqvip merged 1 commit into from
Dec 5, 2025
Merged

fix: udpate intervention/image #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -66,4 +66,4 @@
}
}
}
}
}
22 changes: 12 additions & 10 deletions src/Form/Field/ImageField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand All @@ -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.');
}

Expand Down Expand Up @@ -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);
Expand Down
12 changes: 8 additions & 4 deletions tests/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
}
Expand Down