Add support for Laravel 9 (#5)

marcreichel · Feb 11, 2022 · 354aeb2 · 354aeb2
1 parent 79e5a28
commit 354aeb2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml
@@ -11,12 +11,14 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.0]
-        laravel: [8.*]
-        stability: [prefer-lowest, prefer-stable]
+        php: [8.1, 8.0]
+        laravel: [9.*, 8.*]
+        stability: [prefer-stable]
         include:
+          - laravel: 9.*
+            testbench: 7.*
           - laravel: 8.*
-            testbench: ^6.6
+            testbench: 6.*
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
     steps:
       - name: Checkout code

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,12 +11,14 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.0]
-        laravel: [8.*]
-        stability: [prefer-lowest, prefer-stable]
+        php: [8.1, 8.0]
+        laravel: [9.*, 8.*]
+        stability: [prefer-stable]
         include:
+          - laravel: 9.*
+            testbench: 7.*
           - laravel: 8.*
-            testbench: ^6.6
+            testbench: 6.*
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
     steps:
       - name: Checkout code

diff --git a/composer.json b/composer.json
@@ -42,14 +42,14 @@
     "require-dev": {
         "gajus/dindent": "^2.0",
         "phpunit/phpunit": "^9.5",
-        "orchestra/testbench": "^6.0",
-        "nunomaduro/collision": "^5.10",
+        "orchestra/testbench": "^6.0|^7.0",
+        "nunomaduro/collision": "^5.10|^6.1",
         "roave/security-advisories": "dev-latest",
-        "nunomaduro/larastan": "^0.7.15"
+        "nunomaduro/larastan": "^1.0|^2.0"
     },
     "require": {
-        "php": "^8.0",
-        "illuminate/support": "^8.68",
+        "php": "^8.0.2",
+        "illuminate/support": "^8.0|^9.0",
         "guzzlehttp/guzzle": "~6.0|~7.0"
     }
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -16,3 +16,4 @@ parameters:
   excludePaths:
     # - ./*/*/FileToBeExcluded.php
   checkMissingIterableValueType: false
+  checkGenericClassInNonGenericObjectType: false