[TASK] Allow laravel 11

advoor · Mar 25, 2024 · 76d1202 · 76d1202
1 parent c7921ad
commit 76d1202
Show file tree

Hide file tree

Showing 6 changed files with 1,412 additions and 1,574 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,25 +16,18 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - '8.1'
           - '8.2'
-          - 'nightly'
+          - '8.3'
 
         laravel:
-          - '9.0'
           - '10.0'
+          - '11.0'
 
         include:
-          - php: '8.2'
-            laravel: '10.0'
-            stable: true
-          - php: 'nightly'
-            experimental: true
-
-          - laravel: '9.0'
-            testbench: '7.0'
           - laravel: '10.0'
             testbench: '8.0'
+          - laravel: '11.0'
+            testbench: '9.0'
 
     steps:
       - name: Checkout
@@ -48,8 +41,13 @@ jobs:
           coverage: pcov
 
       - name: Remove platform from Composer file
+        if: ${{ matrix.php }} == 'nightly'
         run: composer config --unset platform
 
+      - name: Set platform
+        if: ${{ matrix.php }} != 'nightly'
+        run: composer config platform.php ${{ matrix.php }}
+
       - name: Configure to use Laravel ${{ matrix.laravel }} with Testbench ${{ matrix.testbench }}
         run: |
           composer require --no-update laravel/laravel:^${{ matrix.laravel }}
@@ -61,7 +59,6 @@ jobs:
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
         with:
-          composer-options: "--ignore-platform-req=php"
           dependency-versions: highest # We're installing additional packages, and cannot use the lockfile
 
       - name: Run unit tests with coverage and printer

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added `EditorJsImageUploaded` event that triggers when an image is uploaded. Via #98 by @woeler.
 - Added `EditorJsThumbnailCreated` event that triggers when a thumbnail is generated. Via #98 by @woeler.
+- Added Laravel 11 support. Via #104 by @woeler.
+- Dropped Laravel 9 support. Via #104 by @woeler.
 
 ## [3.3.0]
 

diff --git a/composer.json b/composer.json
@@ -10,19 +10,19 @@
         "wysiwyg"
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-exif": "*",
         "ext-json": "*",
         "codex-team/editor.js": "*",
-        "guzzlehttp/guzzle": "^6.0 || ^7.0",
-        "illuminate/support": "^8.0 || ^9.0 || ^10.0",
-        "illuminate/events": "^8.0 || ^9.0 || ^10.0",
+        "guzzlehttp/guzzle": "^7.0",
+        "illuminate/support": "^10.0 || ^11.0",
+        "illuminate/events": "^10.0 || ^11.0",
         "laravel/nova": "^4.0",
-        "spatie/image": "^1.7 || ^2.0"
+        "spatie/image": "^3.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.9",
-        "orchestra/testbench": "^6.0 || ^7.0 || ^8.0",
+        "orchestra/testbench": "^8.0 || ^9.0",
         "php-parallel-lint/php-parallel-lint": "^1.3"
     },
     "autoload": {
@@ -60,10 +60,7 @@
         }
     },
     "config": {
-        "sort-packages": true,
-        "platform": {
-            "php": "8.1.25"
-        }
+        "sort-packages": true
     },
     "minimum-stability": "dev",
     "prefer-stable": true,