Merge pull request spatie#76 from laravel-shift/l8-compatibility

Laravel 8.x Compatibility
wheesnoza · Sep 8, 2020 · 8733142 · 8733142
2 parents 95ce9dc + db544ef
commit 8733142
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -10,9 +10,11 @@ jobs:
             matrix:
                 os: [ubuntu-latest]
                 php: [7.2, 7.3, 7.4]
-                laravel: [5.8, 6.*, 7.*]
+                laravel: [8.*, 5.8, 6.*, 7.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
+                    -   laravel: 8.*
+                        testbench: 6.*
                     -   laravel: 7.*
                         testbench: 5.*
                     -   laravel: 6.*

diff --git a/composer.json b/composer.json
@@ -23,12 +23,12 @@
     ],
     "require": {
         "php": "^7.2",
-        "laravel/framework": "~5.8.0|^6.0|^7.0"
+        "laravel/framework": "~5.8.0|^6.0|^7.0|^8.0"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.8.0|^4.0|^5.0",
+        "orchestra/testbench": "~3.8.0|^4.0|^5.0|^6.0",
         "larapack/dd": "^1.0",
-        "phpunit/phpunit": "^7.5|^8.0"
+        "phpunit/phpunit": "^7.5|^8.0|^9.3"
     },
     "autoload": {
         "psr-4": {
@@ -43,7 +43,6 @@
     "scripts": {
         "test": "vendor/bin/phpunit",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
-
     },
     "config": {
         "sort-packages": true