From 9b8943d847c90313db5b45e06b160b97b73bb568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20J=C3=B8nsson?= <sj@morningtrain.dk>
Date: Thu, 29 Aug 2024 17:27:34 +0200
Subject: [PATCH] Support Laravel 11 (#14)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⬆️ Upgrade morningtrain/economic dependency version

* 🔨 Add lando file

* ⬆️ Upgrade dependencies for Laravel 11 support

* ⬇️ Allow older version of morningtrain/economic

* 👷 Add Laravel 11 checks

* 👷 Remove carbon from test runs

* 👷 Exclude Laravel 11 from php 8.1

* ⬇️ Downgrade morningtrain/economic to v0.8

* 👷 Exclude windows
---
 .github/workflows/run-tests.yml | 18 +++++++++++-------
 composer.json                   | 12 ++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 55152c3..d98e976 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -12,14 +12,18 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        php: [8.2, 8.1]
-        laravel: [10.*]
-        stability: [prefer-lowest, prefer-stable]
+        os: [ubuntu-latest]
+        php: [8.3, 8.2, 8.1]
+        laravel: [11.*, 10.*]
+        stability: [prefer-stable]
         include:
+          - laravel: 11.*
+            testbench: ^9.0
           - laravel: 10.*
-            testbench: ^8.15
-            carbon: ^2.67
+            testbench: ^8.0
+        exclude:
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -41,7 +45,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
       - name: List Installed Dependencies
diff --git a/composer.json b/composer.json
index 42568c6..7c7f617 100644
--- a/composer.json
+++ b/composer.json
@@ -18,15 +18,15 @@
     "require": {
         "php": "^8.1",
         "spatie/laravel-package-tools": "^1.14.0",
-        "illuminate/contracts": "^10.0",
-        "illuminate/http": "^10.0",
-        "morningtrain/economic": "^v0.7.2"
+        "illuminate/contracts": "^10.0|^11.0",
+        "illuminate/http": "^10.0|^11.0",
+        "morningtrain/economic": "^v0.8"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^7.8",
-        "nunomaduro/larastan": "^2.0.1",
-        "orchestra/testbench": "^8.15",
+        "nunomaduro/collision": "^7.8|^8.1",
+        "larastan/larastan": "^2.0",
+        "orchestra/testbench": "^8.0|^v9.0",
         "pestphp/pest": "^2.20",
         "pestphp/pest-plugin-arch": "^2.0",
         "pestphp/pest-plugin-laravel": "^2.0",