From 734bd735dc41cf745c3c6f3fb32b8364c918fe34 Mon Sep 17 00:00:00 2001
From: freek <freek@spatie.be>
Date: Wed, 4 Sep 2019 09:42:04 +0200
Subject: [PATCH] make compatible with Laravel 6

---
 .travis.yml   | 45 ++++++++++++++++++++++++++++++++-------------
 CHANGELOG.md  |  4 ++++
 composer.json |  2 +-
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bd1d94e..ce6530a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +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
 
-script:
-  - phpunit --coverage-text --coverage-clover=coverage.clover
+before_install:
+    - travis_retry composer self-update
+    - travis_retry composer require "laravel/framework:${LARAVEL}" "orchestra/testbench:${TESTBENCH}" --no-interaction --no-update
 
-after_script:
-  - php vendor/bin/ocular code-coverage:upload --format=php-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 f47d384..2b95d1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-translatable` will be documented in this file
 
+## 4.2.0 - 2019-09-04
+
+- make compatible with Laravel 6
+
 ## 4.1.4 - 2019-08-28
 
 - re-added the `translatable.fallback_local` config which overrule `app.fallback_local` (see https://github.com/spatie/laravel-translatable/issues/170)
diff --git a/composer.json b/composer.json
index d44501a..2116e9a 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^8.0",
-        "orchestra/testbench": "~3.8.0",
+        "orchestra/testbench": "~3.8.0|^4.0",
         "mockery/mockery": "^1.0"
     },
     "autoload": {