8000 support intervention/image v3 · coderpick/laravel-filemanager@ff217fe · GitHub
[go: up one dir, main page]
Skip to content

Commit ff217fe

Browse files
MeeDNiteMeeDNite
committed
support intervention/image v3
1 parent 539a190 commit ff217fe

File tree

2 files changed

+23
-8
lines changed

2 files changed

+23
-8
lines changed

‎src/Controllers/CropController.php

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
namespace UniSharp\LaravelFilemanager\Controllers;
44

5-
use Intervention\Image\Facades\Image;
5+
use Intervention\Image\Facades\Image as InterventionImageV2;
6+
use Intervention\Image\Laravel\Facades\Image as InterventionImageV3;
67
use UniSharp\LaravelFilemanager\Events\ImageIsCropping;
78
use UniSharp\LaravelFilemanager\Events\ImageWasCropped;
89

@@ -42,10 +43,15 @@ public function getCropImage($overWrite = true)
4243
$crop_info = request()->only('dataWidth', 'dataHeight', 'dataX', 'dataY');
4344

4445
// crop image
45-
// TODO: support intervention/image v3
46-
Image::make($image_path)
47-
->crop(...array_values($crop_info))
48-
->save($crop_path);
46+
if (class_exists(InterventionImageV2::class)) {
47+
InterventionImageV2::make($image_path)
48+
->crop(...array_values($crop_info))
49+
->save($crop_path);
50+
} else {
51+
InterventionImageV3::read($image_path)
52+
->crop(...array_values($crop_info))
53+
->save($crop_path);
54+
}
4955

5056
// make new thumbnail
5157
$this->lfm->generateThumbnail($image_name);

‎src/Controllers/ResizeController.php

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
namespace UniSharp\LaravelFilemanager\Controllers;
44

5-
use Intervention\Image\Facades\Image;
5+
use Intervention\Image\Facades\Image as InterventionImageV2;
6+
use Intervention\Image\Laravel\Facades\Image as InterventionImageV3;
67
use UniSharp\LaravelFilemanager\Events\ImageIsResizing;
78
use UniSharp\LaravelFilemanager\Events\ImageWasResized;
89

@@ -65,8 +66,16 @@ public function performResize($overWrite = true)
6566
}
6667

6768
event(new ImageIsResizing($image_path));
68-
// TODO: support intervention/image v3
69-
Image::make($image_path)->resize(request('dataWidth'), request('dataHeight'))->save($resize_path);
69+
70+
if (class_exists(InterventionImageV2::class)) {
71+
InterventionImageV2::make($image_path)
72+
->resize(request('dataWidth'), request('dataHeight'))
73+
->save($resize_path);
74+
} else {
75+
InterventionImageV3::read($image_path)
76+
->resize(request('dataWidth'), request('dataHeight'))
77+
->save($resize_path);
78+
}
7079
event(new ImageWasResized($image_path));
7180

7281
return parent::$success_response;

0 commit comments

Comments
 (0)
0