From 59430e3c434897fd564caf66137ed0b47696cc96 Mon Sep 17 00:00:00 2001
From: saibotk <git@saibotk.de>
Date: Wed, 18 Jan 2023 23:38:59 +0100
Subject: [PATCH 1/2] Support Laravel 10 & test on PHP 8.2

---
 .github/workflows/fix-styling.yml |  2 +-
 .github/workflows/phpstan.yml     |  5 +++--
 .github/workflows/run-tests.yml   |  6 ++++--
 CHANGELOG.md                      |  4 ++++
 composer.json                     | 12 ++++++------
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/fix-styling.yml b/.github/workflows/fix-styling.yml
index bcde309..22c29f3 100644
--- a/.github/workflows/fix-styling.yml
+++ b/.github/workflows/fix-styling.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           tools: composer:v2
           coverage: none
 
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index 9d41c0c..22bedfd 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -16,11 +16,12 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: 8.2
+          tools: composer:v2
           coverage: none
 
       - name: Install composer dependencies
-        uses: ramsey/composer-install@v2
+        run: composer install -n --prefer-dist
 
       - name: Run PHPStan
         run: ./vendor/bin/phpstan --error-format=github
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 39ff7ee..2aba704 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -13,10 +13,12 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.1]
-        laravel: [9.*]
+        php: [8.2, 8.1]
+        laravel: [9.*, 10.*]
         stability: [prefer-lowest, prefer-stable]
         include:
+          - laravel: 10.*
+            testbench: 8.*
           - laravel: 9.*
             testbench: 7.*
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index faf9fe5..d532591 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+- Laravel 10 support
+- PHP 8.2 support
+
 ## [1.0.2](https://github.com/clickbar/laravel-magellan/tree/1.0.2) - 2023-01-05
 
 ### Fixed
diff --git a/composer.json b/composer.json
index fd18c98..be46cee 100644
--- a/composer.json
+++ b/composer.json
@@ -23,19 +23,19 @@
     ],
     "require": {
         "php": "^8.1",
-        "illuminate/console": "^9.0",
-        "illuminate/contracts": "^9.28",
-        "illuminate/database": "^9.0",
-        "illuminate/support": "^9.0",
+        "illuminate/console": "^9.0|^10.0",
+        "illuminate/contracts": "^9.28|^10.0",
+        "illuminate/database": "^9.0|^10.0",
+        "illuminate/support": "^9.0|^10.0",
         "spatie/invade": "^1.1",
-        "spatie/laravel-package-tools": "^1.9.2"
+        "spatie/laravel-package-tools": "^1.14.0"
     },
     "require-dev": {
         "doctrine/dbal": "^3.5",
         "laravel/pint": "^1.2.1",
         "nunomaduro/collision": "^6.0",
         "nunomaduro/larastan": "^2.0.1",
-        "orchestra/testbench": "^7.15",
+        "orchestra/testbench": "^7.15|^8.0",
         "pestphp/pest": "^1.22",
         "pestphp/pest-plugin-laravel": "^1.1",
         "phpstan/extension-installer": "^1.2",

From 769311c058b3ddd9e44bb3a5c66c7a1762d5eb32 Mon Sep 17 00:00:00 2001
From: saibotk <git@saibotk.de>
Date: Wed, 18 Jan 2023 23:50:48 +0100
Subject: [PATCH 2/2] test: Fix carbon version on prefer lowest

---
 .github/workflows/run-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 2aba704..1979a57 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -42,7 +42,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:>=2.62.1" --no-interaction --no-update
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
       - name: Execute tests