Merge pull request #31 from bilfeldt/updates/laravel11

Laravel 11 support
bilfeldt · Feb 28, 2024 · a53b19f · a53b19f
2 parents 26ad651 + b04836f
commit a53b19f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,24 +1,36 @@
 name: run-tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
         php: [8.3, 8.2, 8.1]
-        laravel: [10.*, 9.*]
-        stability: [prefer-stable]
+        laravel: ['9.*', '10.*', '11.*']
+        dependency-version: [prefer-stable]
         include:
-          - laravel: 10.*
-            testbench: 8.*
           - laravel: 9.*
             testbench: 7.*
+          - laravel: 10.*
+            testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
+        exclude:
+          - laravel: 11.*
+            php: 8.1
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
     steps:
       - name: Checkout code
@@ -39,7 +51,7 @@ jobs:
       - name: Install dependencies
         run: |
           composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-          composer update --${{ matrix.stability }} --prefer-dist --no-interaction --dev
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
       - name: Execute tests
-        run: vendor/bin/phpunit
+        run: composer run-script test
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -55,9 +55,13 @@ The following changes are required when updating:
 
 ## Changes
 
+### 2.2.0
+
+- Add Laravel 11 support
+
 ### 2.1.0
 
-- Add PHP 8.2 support
+- Add PHP 8.3 support
 
 ### 2.0.0
 

diff --git a/composer.json b/composer.json
@@ -23,13 +23,13 @@
         "php": "~8.3.0 | ~8.2.0 | ~8.1.0",
         "ext-json": "*",
         "guzzlehttp/guzzle": "^7.2",
-        "illuminate/http": "^9.0 || ^10.0",
-        "illuminate/support": "^9.0 || ^10.0",
+        "illuminate/http": "^9.0 || ^10.0 || ^11.0",
+        "illuminate/support": "^9.0 || ^10.0 || ^11.0",
         "spatie/laravel-package-tools": "^1.1"
     },
     "require-dev": {
-        "orchestra/testbench": "^7.0",
-        "phpunit/phpunit": "^9.5.10",
+        "orchestra/testbench": "^7.0 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^9.5.10 || ^10.0",
         "spatie/laravel-ray": "^1.29",
         "timacdonald/log-fake": "^2.0",
         "vimeo/psalm": "^4.20"