From be468e44be3aca33d07bbed41939c90a6e7234fc Mon Sep 17 00:00:00 2001
From: Marcus Olsson <hello@marcusolsson.me>
Date: Wed, 14 Feb 2018 09:51:05 +0100
Subject: [PATCH 1/2] New Travis matrix. Version bump for Laravel 5.6.

---
 .travis.yml   | 25 +++++++++++++++++++------
 composer.json |  6 +++---
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9987532..dd4e7db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,24 @@
 language: php
-php:
-  - 5.6
-  - 7.0
-  - 7.1
 
-before_script:
+before_install:
   - travis_retry composer self-update
-  - travis_retry composer install --prefer-dist --no-interaction
+  - composer require "illuminate/support:${ILLUMINATE_VERSION}" --no-update
+
+install: composer update --prefer-source --no-interaction --dev
 
 script: composer test
+
+matrix:
+  include:
+    - php: 5.6
+      env: ILLUMINATE_VERSION=5.3.7
+    - 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.*
+    - php: nightly
+      env: ILLUMINATE_VERSION=5.6.*
diff --git a/composer.json b/composer.json
index 93b2ccd..662e140 100644
--- a/composer.json
+++ b/composer.json
@@ -21,12 +21,12 @@
     ],
     "require": {
         "php" : ">=5.6.0|>=7.0",
-        "illuminate/support": "~5.3.28|~5.4|~5.5",
+        "illuminate/support": "~5.3.28|~5.4|~5.5|~5.6",
         "bjeavons/zxcvbn-php": "0.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit" : "5.7.*|~6.0",
-        "orchestra/testbench": "~3.3|~3.4|~3.5"
+        "phpunit/phpunit" : "5.7.*|~6.0|~7.0",
+        "orchestra/testbench": "~3.3|~3.4|~3.5|~3.6"
     },
     "autoload": {
         "psr-4": {

From 53861eb975943efe49804a5dcaa0f3d7f9294e7a Mon Sep 17 00:00:00 2001
From: Marcus Olsson <hello@marcusolsson.me>
Date: Wed, 14 Feb 2018 09:56:59 +0100
Subject: [PATCH 2/2] Missmatch in illuminate/support-version.

---
 .travis.yml   | 2 +-
 composer.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd4e7db..423b2b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ script: composer test
 matrix:
   include:
     - php: 5.6
-      env: ILLUMINATE_VERSION=5.3.7
+      env: ILLUMINATE_VERSION=5.3.*
     - php: 5.6
       env: ILLUMINATE_VERSION=5.4.*
     - php: 7.0
diff --git a/composer.json b/composer.json
index 662e140..c157267 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
     ],
     "require": {
         "php" : ">=5.6.0|>=7.0",
-        "illuminate/support": "~5.3.28|~5.4|~5.5|~5.6",
+        "illuminate/support": "~5.3|~5.4|~5.5|~5.6",
         "bjeavons/zxcvbn-php": "0.3.0"
     },
     "require-dev": {
@@ -43,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.x-dev"
+            "dev-master": "4.x-dev"
         },
         "laravel": {
             "providers": [