From bd55b32fdd6bc44ec2e07ff3954445fae53aecbf Mon Sep 17 00:00:00 2001
From: Marcus Olsson <hello@marcusolsson.me>
Date: Fri, 8 Mar 2019 19:38:45 +0100
Subject: [PATCH] Compat-check for Laravel 5.8.

Fixed issue with testing via newer versions of PHPunit and orchestra/testbench.
---
 .travis.yml          | 18 +++---------------
 composer.json        | 10 +++++-----
 tests/ZxcvbnTest.php |  2 +-
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad6d782..e828992 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,23 +7,11 @@ before_script:
   - travis_retry composer require "illuminate/support:${ILLUMINATE_VERSION}"
 
 script:
-  - phpunit
+  - composer test
 
 matrix:
   include:
-    - php: 5.6
-      env: ILLUMINATE_VERSION=5.3.*
-    - php: 5.6
-      env: ILLUMINATE_VERSION=5.4.*
-    - php: 7.0
-      env: ILLUMINATE_VERSION=5.4.*
     - php: 7.1
-      env: ILLUMINATE_VERSION=5.5.*
-    - php: 7.1
-      env: ILLUMINATE_VERSION=5.6.*
+      env: ILLUMINATE_VERSION=5.8.*
     - php: 7.2
-      env: ILLUMINATE_VERSION=5.6.*
-    - php: 7.2
-      env: ILLUMINATE_VERSION=5.7.*
-    - php: nightly
-      env: ILLUMINATE_VERSION=5.7.*
+      env: ILLUMINATE_VERSION=5.8.*
diff --git a/composer.json b/composer.json
index f2aed6a..f161f20 100644
--- a/composer.json
+++ b/composer.json
@@ -20,13 +20,13 @@
         }
     ],
     "require": {
-        "php" : ">=5.6.0|>=7.0",
-        "illuminate/support": ">=5.3.0",
-        "bjeavons/zxcvbn-php": "0.3.0|0.4.0"
+        "php" : ">=7.1.3",
+        "illuminate/support": "^5.8",
+        "bjeavons/zxcvbn-php": "0.4.0"
     },
     "require-dev": {
-        "phpunit/phpunit" : "5.7.*|~6.0|~7.0",
-        "orchestra/testbench": ">=3.3.0"
+        "phpunit/phpunit" : "~7.0",
+        "orchestra/testbench": "^3.8.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/tests/ZxcvbnTest.php b/tests/ZxcvbnTest.php
index f539c8f..8a11ada 100644
--- a/tests/ZxcvbnTest.php
+++ b/tests/ZxcvbnTest.php
@@ -6,7 +6,7 @@ use Zxcvbn;
 
 class ZxcvbnTest extends \Orchestra\Testbench\TestCase {
 
-	public function setUp() {
+	public function setUp(): void {
         parent::setUp();
     }