Add support L11 (#8)

* add spatie Image V3

* Change render Croppa method to new crop V3 Spatie Image

* check Laravel 11

* fix carbon on run test

* fix on file error, remove them in board

* Fix styling

---------

Co-authored-by: webplusmultimedia <webplusmultimedia@users.noreply.github.com>

.github/workflows/phpstan.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.2'
           coverage: none
 
       - name: Install composer dependencies

.github/workflows/run-tests.yml

@@ -13,13 +13,19 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.2, 8.1]
-        laravel: [10.*]
+        php: [8.3,8.2, 8.1]
+        laravel: [10.*,11.*]
         stability: [prefer-stable]
         include:
+          - laravel: 11.*
+            testbench: 9.*
+            carbon: ^2.63
           - laravel: 10.*
             testbench: 8.*
             carbon: ^2.63
+        exclude:
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

composer.json

@@ -25,15 +25,15 @@
     "require": {
         "php": "^8.1",
         "filament/filament": "^3.0",
-        "illuminate/contracts": "^10.0",
-        "spatie/image": "^2.2",
+        "illuminate/contracts": "^10.0|^11.0",
+        "spatie/image": "^2.2|^3.0",
         "spatie/laravel-package-tools": "^1.15.0"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^7.9",
+        "nunomaduro/collision": "^7.9|^8.0",
         "larastan/larastan": "^2.0.1",
-        "orchestra/testbench": "^8.0",
+        "orchestra/testbench": "^8.0|^9.0",
         "pestphp/pest": "^2.0",
         "pestphp/pest-plugin-arch": "^2.0",
         "pestphp/pest-plugin-laravel": "^2.0",

config/gallery-json-media.php

@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 // config for WebplusMultimedia\GalleryJsonMedia
-use Spatie\Image\Manipulations;
 
 return [
     'disk' => 'public',
@@ -13,7 +12,7 @@
         'signing_key' => 'app.key',
         'driver' => 'imagick', // gd or imagick
         'quality' => 80,
-        'thumbnails-crop-method' => Manipulations::CROP_CENTER,
+        'thumbnails-crop-method' => null,
         'thumbnails-saved-format' => null, // Manipulations::FORMAT_PNG / following formats are supported: FORMAT_JPG, FORMAT_PJPG, FORMAT_PNG, FORMAT_GIF, FORMAT_WEBP and FORMAT_TIFF
 
     ],

resources/js/index.js

@@ -78,10 +78,17 @@ export function galleryFileUpload(
             /**@type {HTMLElement} */
             const wrapper = this.$refs.galleryImages
             const stopUploading = function(component) {
-                let rest = component.uploadFiles.filter(f => f.is_success === false).length
+                let rest = component.uploadFiles.filter(f => f.is_success === false).length,
+                    numberErrors = component.uploadFiles.filter(f => f.error === true).length
 
-                if (rest === 0) {
+                if ((rest - numberErrors) === 0) {
                     component.dispatchFormEvent('form-processing-finished')
+                    if(numberErrors) {
+                        // Removed thumbnails with no upload
+                        component.uploadFiles = component.uploadFiles
+                            .filter(file => !file.error)
+                            .map(file =>{ file.error = false; return file })
+                    }
                     component.startUpload = false
                 }
             }
@@ -91,7 +98,6 @@ export function galleryFileUpload(
                 stopUploading(this)
             }
             const error = (fileKey) => {
-                //delete this.uploadFiles[fileKey]
                 this.uploadFiles[fileKey].progress = 0
                 this.uploadFiles[fileKey].error = true
                 stopUploading(this)

src/JsonMedia/ImageManipulation/Croppa.php

@@ -9,7 +9,6 @@
 use Spatie\Image\Exceptions\InvalidImageDriver;
 use Spatie\Image\Exceptions\InvalidManipulation;
 use Spatie\Image\Image;
-use Spatie\Image\Manipulations;
 
 final class Croppa
 {
@@ -34,28 +33,18 @@ public function url(): string
      */
     public function render(): void
     {
-        $image = Image::load($this->filesystem->path($this->filePath))
-            ->useImageDriver(config('gallery-json-media.images.driver'));
-
-        $manipulations = new Manipulations();
-        $manipulations->quality(config('gallery-json-media.images.quality'));
-
-        if ($this->width and $this->height) {
-            $manipulations->crop(
-                cropMethod: config('gallery-json-media.images.thumbnails-crop-method'),
-                width: $this->width,
-                height: $this->height
-            );
-        } else {
-            if ($this->width) {
-                $manipulations->width($this->width);
-            }
-            if ($this->height) {
-                $manipulations->height($this->height);
-            }
+        $image = Image::useImageDriver(config('gallery-json-media.images.driver'))
+            ->load($this->filesystem->path($this->filePath))
+            ->quality(config('gallery-json-media.images.quality'));
+
+        if ($this->width) {
+            $image->width($this->width);
+        }
+        if ($this->height) {
+            $image->height($this->height);
         }
-        $image->manipulate($manipulations)
-            ->save($this->filesystem->path($this->getPathNameForThumbs()));
+
+        $image->save($this->filesystem->path($this->getPathNameForThumbs()));
     }
 
     protected function getPathNameForThumbs(): string