From 8cd283bbb998beb3ae220e71bae162e52dfbd1d9 Mon Sep 17 00:00:00 2001
From: Laravel Shift <shift@laravelshift.com>
Date: Fri, 1 Mar 2024 05:20:32 -0500
Subject: [PATCH] Laravel 11.x Compatibility (#205)

* Bump dependencies for Laravel 11

* Update GitHub Actions for Laravel 11

* Update run-tests.yml

---------

Co-authored-by: Freek Van der Herten <freek@spatie.be>
---
 .github/workflows/run-tests.yml | 57 +++++++++++++++++++--------------
 composer.json                   |  8 ++---
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index e4f83c6..bbe73c7 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -1,41 +1,50 @@
 name: run-tests
 
-on: [push, pull_request]
+on:
+  - push
+  - pull_request
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.2, 8.1, 8.0]
-        laravel: [10.*]
+        php: [8.3, 8.2, 8.1, 8.0]
+        laravel: ['10.*', '11.*']
         dependency-version: [prefer-stable]
         include:
-          -   laravel: 10.*
-              testbench: 8.*
+          - laravel: 10.*
+            testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
         exclude:
-          -   laravel: 10.*
-              php: 8.0
+          - laravel: 10.*
+            php: 8.0
+          - laravel: 11.*
+            php: 8.1
+          - laravel: 11.*
+            php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
     steps:
-      -   name: Checkout code
-          uses: actions/checkout@v2
-
-      -   name: Setup PHP
-          uses: shivammathur/setup-php@v2
-          with:
-            php-version: ${{ matrix.php }}
-            extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
-            coverage: none
-
-      -   name: Install dependencies
-          run: |
-            composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-            composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
-
-      -   name: Execute tests
-          run: vendor/bin/pest
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+
+      - name: Execute tests
+        run: vendor/bin/pest
diff --git a/composer.json b/composer.json
index 83e0223..aa1d1dc 100644
--- a/composer.json
+++ b/composer.json
@@ -36,13 +36,13 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^10.0",
-        "illuminate/http": "^10.0",
-        "illuminate/contracts": "^10.0",
+        "illuminate/support": "^10.0|^11.0",
+        "illuminate/http": "^10.0|^11.0",
+        "illuminate/contracts": "^10.0|^11.0",
         "spatie/laravel-package-tools": "^1.15"
     },
     "require-dev": {
-        "orchestra/testbench": "^8.0",
+        "orchestra/testbench": "^8.0|^9.0",
         "spatie/test-time": "^1.2",
         "pestphp/pest": "^2.0",
         "spatie/pest-plugin-snapshots": "^2.0"