From 860b823a2c483d1e9beb874fa26a066724c1ccb6 Mon Sep 17 00:00:00 2001
From: Daniel Mason <danmason@spendology.com>
Date: Wed, 8 Feb 2023 02:45:56 +0000
Subject: [PATCH] Add Laravel 10 support (#25)

---
 .github/workflows/run-tests.yml | 16 +++++++++++-----
 composer.json                   |  6 +++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index c3a0c6b..3e18814 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -7,18 +7,24 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        php: ['8.1', '8.0', '7.4']
-        laravel: [8.*, 9.*]
+        os: [ubuntu-latest]
+        php: ['8.2', '8.1', '8.0', '7.4']
+        laravel: [8.*, 9.*, 10.*]
         dependency-version: [prefer-lowest, prefer-stable]
         exclude:
+          - laravel: 10.*
+            php: 8.0
+          - laravel: 10.*
+            php: 7.4
           - laravel: 9.*
-            php: '7.4'
+            php: 7.4
         include:
           - laravel: 8.*
             testbench: ^6.23
           - laravel: 9.*
             testbench: ^7.0
+          - laravel: 10.*
+            testbench: ^8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
@@ -47,7 +53,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 }}" "symfony/console:>=4.4.0" "nesbot/carbon:>=2.62.1" --no-interaction --no-update
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
       - name: Execute tests
diff --git a/composer.json b/composer.json
index 6a02cb3..b05ceb2 100644
--- a/composer.json
+++ b/composer.json
@@ -19,13 +19,13 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "consoletvs/charts": "^6.5.6",
-        "spatie/laravel-dashboard": "^2.1"
+        "consoletvs/charts": "^6.6.0",
+        "spatie/laravel-dashboard": "^2.1.4"
     },
     "require-dev": {
         "mockery/mockery": "^1.4",
         "nunomaduro/laravel-mojito": "^0.2.6",
-        "orchestra/testbench": "^6.0|^7.0",
+        "orchestra/testbench": "^6.0|^7.0|^8.0",
         "phpunit/phpunit": "^9.3",
         "vimeo/psalm": "^4.3"
     },