From 8fedb189923f0b38476f13bf08cdb22330ef8313 Mon Sep 17 00:00:00 2001
From: freek <freek@spatie.be>
Date: Wed, 4 Sep 2019 13:07:57 +0200
Subject: [PATCH] add support for Laravel 6

---
 .travis.yml   | 44 +++++++++++++++++++++++++++++++++-----------
 CHANGELOG.md  |  4 ++++
 composer.json |  6 +++---
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6a8cfe7..ce6530a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,39 @@
-language: php
+cache:
+    directories:
+        - $HOME/.composer/cache
 
-php:
-  - 7.2
-  - 7.3
+language: php
 
 env:
-  matrix:
-    - COMPOSER_FLAGS="--prefer-lowest"
-    - COMPOSER_FLAGS=""
+    global:
+        - COVERAGE=0
+
+matrix:
+    include:
+        - php: 7.2
+          env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
+        - php: 7.2
+          env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
+        - php: 7.3
+          env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
+        - php: 7.3
+          env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
+        - php: 7.2
+          env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
+        - php: 7.2
+          env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
+        - php: 7.3
+          env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
+        - php: 7.3
+          env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
+    fast_finish: true
 
 before_script:
-  - travis_retry composer self-update
-  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
+    - composer config discard-changes true
+
+before_install:
+    - travis_retry composer self-update
+    - travis_retry composer require "laravel/framework:${LARAVEL}" "orchestra/testbench:${TESTBENCH}" --no-interaction --no-update
 
-script:
-  - phpunit --coverage-text --coverage-clover=coverage.clover
+install:
+    - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction --no-suggest
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 731a91c..37fda5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-varnish` will be documented in this file
 
+## 2.3.0 - 2019-09-04
+
+- add support for Laravel 6
+
 ## 2.2.0 - 2019-02-27
 
 - drop support for Laravel 5.7 and below
diff --git a/composer.json b/composer.json
index 0c7e957..87a4d9d 100644
--- a/composer.json
+++ b/composer.json
@@ -17,12 +17,12 @@
     ],
     "require": {
         "php": "^7.2",
-        "illuminate/console": "~5.8.0",
-        "illuminate/http": "~5.8.0"
+        "illuminate/console": "~5.8.0|^6.0",
+        "illuminate/http": "~5.8.0|^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.0",
-        "orchestra/testbench": "~3.8.0"
+        "orchestra/testbench": "~3.8.0|^4.0"
     },
     "autoload": {
         "psr-4": {