jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Update Intervention/Image class to v3

Browse source
This commit is contained in:
Jonny Barnes 2023-12-17 13:56:10 +00:00
parent 58a03ef931
commit 6d5b298837
Signed by: jonny
SSH key fingerprint: SHA256:CTuSlns5U7qlD9jqHvtnVmfYV3Zwl2Z7WnJ4/dqOaL8
6 changed files with 84 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Controllers/MicropubMediaController.php
View file

@ -18,7 +18,7 @@ use Illuminate\Http\UploadedFile;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use Intervention\Image\Exception\NotReadableException;
use Intervention\Image\Exceptions\DecoderException;
use Intervention\Image\ImageManager;
use Lcobucci\JWT\Token\InvalidTokenStructure;
use Lcobucci\JWT\Validation\RequiredConstraintsViolated;
@ -108,7 +108,7 @@ class MicropubMediaController extends Controller
{
try {
$tokenData = $this->tokenService->validateToken($request->input('access_token'));
} catch (RequiredConstraintsViolated|InvalidTokenStructure $exception) {
} catch (RequiredConstraintsViolated|InvalidTokenStructure) {
$micropubResponses = new MicropubResponses();
return $micropubResponses->invalidTokenResponse();
@ -144,11 +144,12 @@ class MicropubMediaController extends Controller
$filename = $this->saveFile($request->file('file'));
/** @var ImageManager $manager */
$manager = resolve(ImageManager::class);
try {
$image = $manager->make($request->file('file'));
$image = $manager->read($request->file('file'));
$width = $image->width();
} catch (NotReadableException $exception) {
} catch (DecoderException) {
// not an image
$width = null;
}

6
app/Jobs/ProcessMedia.php
View file

@ -10,7 +10,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Storage;
use Intervention\Image\Exception\NotReadableException;
use Intervention\Image\Exceptions\DecoderException;
use Intervention\Image\ImageManager;
class ProcessMedia implements ShouldQueue
@ -35,8 +35,8 @@ class ProcessMedia implements ShouldQueue
{
//open file
try {
$image = $manager->make(storage_path('app') . '/' . $this->filename);
} catch (NotReadableException $exception) {
$image = $manager->read(storage_path('app') . '/' . $this->filename);
} catch (DecoderException) {
// not an image; delete file and end job
unlink(storage_path('app') . '/' . $this->filename);

2
app/Providers/AppServiceProvider.php
View file

@ -30,7 +30,7 @@ class AppServiceProvider extends ServiceProvider
// configure Intervention/Image
$this->app->bind('Intervention\Image\ImageManager', function () {
return new \Intervention\Image\ImageManager(['driver' => config('image.driver')]);
return \Intervention\Image\ImageManager::withDriver(config('image.driver'));
});
// Bind the Codebird client