From 78dac928cbf352b4ee3108bcbeb64a80d41965bf Mon Sep 17 00:00:00 2001
From: freek <freek@spatie.be>
Date: Wed, 4 Sep 2019 13:30:38 +0200
Subject: [PATCH] wip

---
 .travis.yml      | 45 ++++++++++++++++++++++++++++++++-------------
 CHANGELOG.md     |  4 ++++
 README.md        |  2 +-
 composer.json    |  4 ++--
 phpunit.xml.dist |  7 -------
 5 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c998d34..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:
-  - vendor/bin/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 e4fcdad..5163886 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-searchable` will be documented in this file
 
+## 1.4.0 - 2019-09-04
+
+- add support for Laravel 6
+
 ## 1.3.0 - 2019-02-27
 
 - drop support for Laravel 5.7 and lower
diff --git a/README.md b/README.md
index 865b999..b28313f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# 𝕷𝖆𝖗𝖆𝖛𝖊𝖑 𝕾𝖊𝖆𝖗𝖈𝖍𝖆𝖇𝖑𝖊
+# Laravel Searchable
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/spatie/laravel-searchable.svg?style=flat-square)](https://packagist.org/packages/spatie/laravel-searchable)
 [![Build Status](https://img.shields.io/travis/spatie/laravel-searchable/master.svg?style=flat-square)](https://travis-ci.org/spatie/laravel-searchable)
diff --git a/composer.json b/composer.json
index b3737e7..c3e2fa0 100644
--- a/composer.json
+++ b/composer.json
@@ -23,10 +23,10 @@
     ],
     "require": {
         "php": "^7.2",
-        "laravel/framework": "~5.8.0"
+        "laravel/framework": "~5.8.0|^6.0"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.8.0",
+        "orchestra/testbench": "~3.8.0|^4.0",
         "larapack/dd": "^1.0",
         "phpunit/phpunit": "^7.5|^8.0"
     },
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b631a03..44f3f80 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -19,13 +19,6 @@
             <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
-    <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
     <php>
         <env name="DB_CONNECTION" value="testing"/>
     </php>