From 5f4c71f6a4b1ef53329ca06d0dd25c316edc0b19 Mon Sep 17 00:00:00 2001 From: Jason Fah Date: Mon, 3 Mar 2025 13:33:16 +1000 Subject: [PATCH 1/3] Chore(deps): migrate to intervention/image v3 --- composer.json | 2 +- src/ImageSanitize.php | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index ed39ff1..2696a98 100644 --- a/composer.json +++ b/composer.json @@ -24,9 +24,9 @@ "require": { "php": "^8.1", "illuminate/support": "^10.0|^11.0", - "intervention/image": "^2.7|^3.4", "illuminate/container": "^10.0|^11.0", "illuminate/contracts": "^10.0|^11.0", + "intervention/image": "^3.4", "ext-fileinfo": "*" }, "require-dev": { diff --git a/src/ImageSanitize.php b/src/ImageSanitize.php index 518e9c9..71fd325 100755 --- a/src/ImageSanitize.php +++ b/src/ImageSanitize.php @@ -2,17 +2,17 @@ namespace LaravelAt\ImageSanitize; -use Intervention\Image\Image; +use Intervention\Image\Drivers\Gd\Driver; +use Intervention\Image\EncodedImage; +use Intervention\Image\Encoders\AutoEncoder; use Intervention\Image\ImageManager; use LaravelAt\ImageSanitize\Lists\PatternList; class ImageSanitize { public function __construct( - protected ImageManager $imageManager, protected PatternList $patternList, - ) { - } + ) {} public function detect(string $content): bool { @@ -25,8 +25,12 @@ public function detect(string $content): bool return false; } - public function sanitize(string $content): Image + public function sanitize(string $content): EncodedImage { - return $this->imageManager->make($content)->encode(null, 100); + $imageManager = new ImageManager(new Driver()); + + $image = $imageManager->read($content); + + return $image->encode(new AutoEncoder(quality: 100)); } } From d8fafa1d7d73c79f4c988d12d322a0d60b435ac6 Mon Sep 17 00:00:00 2001 From: Jason Fah Date: Mon, 3 Mar 2025 13:33:37 +1000 Subject: [PATCH 2/3] Chore(laravel): add support for Laravel 12 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 2696a98..f57720e 100644 --- a/composer.json +++ b/composer.json @@ -23,14 +23,14 @@ ], "require": { "php": "^8.1", - "illuminate/support": "^10.0|^11.0", - "illuminate/container": "^10.0|^11.0", - "illuminate/contracts": "^10.0|^11.0", + "illuminate/support": "^10.0|^11.0|^12.0", "intervention/image": "^3.4", + "illuminate/container": "^10.0|^11.0|^12.0", + "illuminate/contracts": "^10.0|^11.0|^12.0", "ext-fileinfo": "*" }, "require-dev": { - "orchestra/testbench": "^8.0|^9.0" + "orchestra/testbench": "^8.0|^9.0|^10.0" }, "autoload": { "psr-4": { From 974b9b821e1119befd41cd7c6c201d392ebad58c Mon Sep 17 00:00:00 2001 From: Jason Fah <52981451+jason-nabooki@users.noreply.github.com> Date: Mon, 3 Mar 2025 13:40:55 +1000 Subject: [PATCH 3/3] Formatting --- src/ImageSanitize.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ImageSanitize.php b/src/ImageSanitize.php index 71fd325..04c70be 100755 --- a/src/ImageSanitize.php +++ b/src/ImageSanitize.php @@ -12,7 +12,8 @@ class ImageSanitize { public function __construct( protected PatternList $patternList, - ) {} + ) { + } public function detect(string $content): bool {