add support for laravel 10

okaufmann · Feb 15, 2023 · f13c171 · f13c171
1 parent abbd1b3
commit f13c171
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -13,18 +13,20 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [
-#          8.2,
-          8.1,
-          8.0
-        ]
-        laravel: [8.*, 9.*]
-        stability: [prefer-lowest, prefer-stable]
-#        include:
-#          - laravel: 9.*
-#            testbench: 7.*
-#          - laravel: 8.*
-#            testbench: 6.*
+        php: [8.2, 8.1, 8.0]
+        laravel: [10.*, 9.*, 8.*]
+        stability: [prefer-stable]
+        include:
+          - laravel: 10.*
+            testbench: 8.*
+          - laravel: 9.*
+            testbench: 7.*
+          - laravel: 8.*
+            testbench: 6.*
+
+        exclude:
+          - laravel: 10.*
+            php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -46,7 +48,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" --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
@@ -18,13 +18,13 @@
     "require": {
         "php": "^8.0",
         "spatie/laravel-package-tools": "^1.6.3",
-        "illuminate/config": "^8.0 || ^9.0",
+        "illuminate/config": "^8.0|^9.0|^10.0",
         "laravel/horizon": "^5.0"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^6.0 || ^5.0",
-        "orchestra/testbench": "^6.23 || ^7.0",
+        "nunomaduro/collision": "^6.0|^5.0",
+        "orchestra/testbench": "^6.23|^7.0|^8.0",
         "pestphp/pest": "^1.20",
         "spatie/laravel-ray": "^1.26"
     },
@@ -46,7 +46,8 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "pestphp/pest-plugin": true
+            "pestphp/pest-plugin": true,
+            "phpstan/extension-installer": true
         }
     },
     "extra": {