From e52f517cf31c1d179ffafdbd1d18db9771002c1d Mon Sep 17 00:00:00 2001
From: Laravel Shift <shift@laravelshift.com>
Date: Wed, 14 Feb 2024 19:37:22 -0500
Subject: [PATCH] Laravel 11.x Compatibility (#667)

---
 .github/workflows/build.yml | 15 ++++++++++-----
 .github/workflows/demo.yml  |  7 +++++--
 .github/workflows/lint.yml  |  2 +-
 composer.json               |  6 +++---
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2bc808b6..fad3ad32 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,15 +13,20 @@ env:
 
 jobs:
   tests:
+    name: PHP ${{ matrix.php-version }} - L${{ matrix.laravel-version }} - ${{ matrix.os }}
+
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1', '8.2']
+        php-version: ['8.1', '8.2', '8.3']
+        laravel-version: [10, 11]
         os: [ubuntu-latest, windows-latest, macos-latest]
         dependencies: [locked]
         experimental: [false]
+        exclude:
+          - laravel-version: 11
+            php-version: 8.1
 
-    name: PHP ${{ matrix.php-version }} - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
 
@@ -37,8 +42,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ steps.determine-composer-cache-directory.outputs.directory }}
-          key: dependencies-os-${{ matrix.os }}-php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: dependencies-os-${{ matrix.os }}-php-${{ matrix.php-version }}-composer-
+          key: dependencies-os-${{ matrix.os }}-php-${{ matrix.php-version }}-laravel-${{ matrix.laravel-version }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: dependencies-os-${{ matrix.os }}-php-${{ matrix.php-version }}-laravel-${{ matrix.laravel-version }}-composer-
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -79,7 +84,7 @@ jobs:
           command: composer install ${{ env.COMPOSER_FLAGS }}
 
       - name: Install Laravel
-        run: composer require laravel/framework --no-update
+        run: composer require laravel/framework:${{ matrix.laravel-version }}.* --no-update
 
       - name: Run tests
         run: vendor/bin/phpunit
diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml
index 0965164b..65f30039 100644
--- a/.github/workflows/demo.yml
+++ b/.github/workflows/demo.yml
@@ -25,9 +25,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1', '8.2']
-        laravel-version: [10]
+        php-version: ['8.1', '8.2', '8.3']
+        laravel-version: [10, 11]
         os: [ubuntu-latest]
+        exclude:
+          - laravel: 11.*
+            php-version: 8.1
 
     runs-on: ${{ matrix.os }}
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index c4007120..2a540a9e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.2'
           tools: phplint, laravel/pint
       - name: Check syntax
         run: phplint .
diff --git a/composer.json b/composer.json
index c9f031aa..98a334bd 100644
--- a/composer.json
+++ b/composer.json
@@ -10,9 +10,9 @@
     "license": "MIT",
     "require": {
         "doctrine/dbal": "^3.3",
-        "illuminate/console": "^10.0",
-        "illuminate/filesystem": "^10.0",
-        "illuminate/support": "^10.0",
+        "illuminate/console": "^10.0|^11.0",
+        "illuminate/filesystem": "^10.0|^11.0",
+        "illuminate/support": "^10.0|^11.0",
         "laravel-shift/faker-registry": "^0.3.0",
         "symfony/yaml": ">=6.2"
     },