Merge pull request #4 from swisnl/feature/laravel-6-support

Add support for Laravel 6
swisnl · Oct 1, 2019 · 97f49c9 · 97f49c9
2 parents a1f5fa8 + 87d5f5a
commit 97f49c9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ composer.lock
 # Tooling
 /.php_cs
 /.php_cs.cache
+/.phpunit.result.cache
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -20,7 +20,7 @@ checks:
 tools:
     external_code_coverage:
         timeout: 600
-        runs: 6
+        runs: 7
 
 build:
     nodes:

diff --git a/.travis.yml b/.travis.yml
@@ -11,9 +11,11 @@ matrix:
   - php: "7.2"
     env: LARAVEL_VERSION="5.7.*"
   - php: "7.2"
-    env: LARAVEL_VERSION="5.8.*" RUN_CS_FIXER=1
-  - php: "7.3"
     env: LARAVEL_VERSION="5.8.*"
+  - php: "7.2"
+    env: LARAVEL_VERSION="^6.0" RUN_CS_FIXER=1
+  - php: "7.3"
+    env: LARAVEL_VERSION="^6.0"
 
 sudo: false
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,8 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## [Unreleased]
 
-- Nothing
+### Added
+- Added support for Laravel 6.
 
 ## 1.1.0 - 2019-04-08
 

diff --git a/composer.json b/composer.json
@@ -19,14 +19,14 @@
     "require": {
         "php" : ">=7.1.3",
         "ext-json": "*",
-        "illuminate/http": "5.5.*|5.6.*|5.7.*|5.8.*",
-        "illuminate/routing": "5.5.*|5.6.*|5.7.*|5.8.*",
-        "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*"
+        "illuminate/http": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0",
+        "illuminate/routing": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0",
+        "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.0",
-        "graham-campbell/testbench": "^5.1",
-        "phpunit/phpunit": "^6.1|^7.0|^8.0"
+        "graham-campbell/testbench": "^5.3",
+        "phpunit/phpunit": "^6.5|^7.0|^8.0"
     },
     "autoload": {
         "psr-4": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ checks: @@
     tools:
         external_code_coverage:
             timeout: 600
-            runs: 6
+            runs: 7
     build:
         nodes:
@@ Expand Down @@