Merge pull request #81 from spatie/laravel-10

Laravel 10 ✨
spatie · Jan 10, 2023 · 9964e65 · 9964e65
2 parents 10db3e1 + 71c7b67
commit 9964e65
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,12 +9,17 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.0, 8.1, 8.2, 8.2]
-        laravel: [9.*]
+        php: [8.0, 8.1, 8.2]
+        laravel: [10.*, 9.*]
         stability: [prefer-lowest, prefer-stable]
         include:
           - laravel: 9.*
             testbench: 7.*
+          - laravel: 10.*
+            testbench: 8.*
+        exclude:
+          - laravel: 10.*
+            php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -36,7 +41,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:^2.62.1" --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:^2.64.1" --no-interaction --no-update
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
       - name: Execute tests

diff --git a/composer.json b/composer.json
@@ -16,11 +16,11 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/contracts": "^9.28"
+        "illuminate/contracts": "^9.28|^10.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.5",
-        "orchestra/testbench": "^7.7",
+        "orchestra/testbench": "^7.7|^8.0",
         "pestphp/pest": "^1.22",
         "phpunit/phpunit": "^9.5.24",
         "spatie/pest-plugin-test-time": "^1.1"