From 7e94b7c4533f80f6e45fddf86b300c6ed6db4213 Mon Sep 17 00:00:00 2001
From: Luke Downing <lukeraymonddowning@gmail.com>
Date: Wed, 1 Feb 2023 12:03:15 +0000
Subject: [PATCH] chore(deps): Laravel 10 support

Adds support for the upcoming release of Laravel 10.
---
 .github/workflows/run-tests.yml | 10 ++++++++--
 composer.json                   | 11 +++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 4ba9787..d332689 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -14,8 +14,13 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest]
         php: [8.2]
-        laravel: [9.*]
+        laravel: [9.*, 10.*]
         stability: [prefer-stable]
+        include:
+          - laravel: 9.*
+            testbench: 7.*
+          - laravel: 10.*
+            testbench: 8.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -35,8 +40,9 @@ jobs:
           echo "::add-matcher::${{ runner.tool_cache }}/php.json"
           echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-      - name: Install dependencies
+      - name: Install Composer dependencies
         run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
       - name: Execute tests
diff --git a/composer.json b/composer.json
index 6b194e4..b5370c1 100644
--- a/composer.json
+++ b/composer.json
@@ -17,19 +17,18 @@
     ],
     "require": {
         "php": "^8.2",
-        "illuminate/contracts": "^9.46",
+        "illuminate/contracts": "^9.46|^10.0",
         "nikic/php-parser": "^4.15",
         "nunomaduro/termwind": "^1.15",
-        "spatie/laravel-package-tools": "^1.13.8",
+        "spatie/laravel-package-tools": "^1.14.1",
         "thecodingmachine/safe": "^2.4"
     },
     "require-dev": {
         "nunomaduro/collision": "^6.4",
-        "nunomaduro/larastan": "^2.3.4",
-        "orchestra/testbench": "^7.17",
+        "nunomaduro/larastan": "^2.4.0",
+        "orchestra/testbench": "^7.17|^8.0",
         "pestphp/pest": "^1.22",
-        "pestphp/pest-plugin-laravel": "^1.3",
-        "spatie/laravel-ray": "^1.31",
+        "pestphp/pest-plugin-laravel": "^1.4",
         "worksome/coding-style": "^2.3.2"
     },
     "autoload": {