Merge branch 'release/3.1.0'

verschuur · Sep 30, 2020 · 4f845a2 · 4f845a2
2 parents f89ac7f + 153083d
commit 4f845a2
Show file tree

Hide file tree

Showing 4 changed files with 2,510 additions and 742 deletions.
diff --git a/.github/workflows/php-unittest.yml b/.github/workflows/php-unittest.yml
@@ -5,15 +5,17 @@ on:
 
 jobs:
   php-tests:
-      runs-on: ${{ matrix.os }}
+      runs-on: ubuntu-latest
 
       strategy:
           matrix:
-              php: [7.4, 7.3, 7.2]
-              laravel: [7.*, 6.*, 5.8.*, 5.7.*, 5.6.*]
+              php: [7.4, 7.3]
+              laravel: [8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*]
               dependency-version: [prefer-lowest, prefer-stable]
-              os: [ubuntu-latest, windows-latest]
               include:
+                  - laravel: 8.*
+                    testbench: 6.*
+                    phpunit: ^8.5
                   - laravel: 7.*
                     testbench: 5.*
                     phpunit: ^8.5
@@ -29,9 +31,6 @@ jobs:
                   - laravel: 5.6.*
                     testbench: 3.6.*
                     phpunit: 7.*
-                  #- laravel: 5.5.*
-                  #  testbench: 3.5.*
-                  #  phpunit: 6.*
               exclude:
                   - laravel: 5.7.*
                     php: 7.4

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.1.0] - 2020-09-30
+
+### Added
+
+- Added Laravel 8 support thanks to @annejan
+
 ## [3.0.0] - 2020-03-05
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
         }
     ],
     "require": {
-        "laravel/framework": "^5.6|^6.0|^7.0"
+        "laravel/framework": "^5.6|^6.0|^7.0|^8.0"
     },
     "autoload": {
         "psr-4": {
@@ -24,7 +24,7 @@
     "license": "MIT",
     "require-dev": {
         "phpunit/phpunit": "^9.0",
-        "orchestra/testbench": "^5.0",
+        "orchestra/testbench": "^6.0",
         "phpstan/phpstan": "^0.12"
     },
     "scripts": {