From 31742d282ebbc56154c9c5c1d9e490bffce993a7 Mon Sep 17 00:00:00 2001
From: Marcus Olsson <hello@marcusolsson.me>
Date: Fri, 9 Feb 2018 09:02:58 +0100
Subject: [PATCH] New testing procedure. Cleanup. Version bump.

---
 .travis.yml   | 24 +++++++++++++++++++-----
 CHANGELOG.md  | 20 --------------------
 README.jp.md  | 11 +++++------
 README.md     | 13 +++++++------
 composer.json | 10 +++++-----
 5 files changed, 36 insertions(+), 42 deletions(-)
 delete mode 100644 CHANGELOG.md

diff --git a/.travis.yml b/.travis.yml
index 54f447e..04f9657 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,24 @@
 language: php
-php:
-  - 7.0
-  - nightly
 
-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: 7.0
+      env: ILLUMINATE_VERSION=5.4.*
+    - php: 7.1
+      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.4.*
+    - php: nightly
+      env: ILLUMINATE_VERSION=5.6.*
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 881c4a1..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Changelog
-
-All Notable changes to `:package_name` will be documented in this file
-
-## NEXT - YYYY-MM-DD
-
-### Added
-- Nothing
-
-### Deprecated
-- Nothing
-
-### Fixed
-- Nothing
-
-### Removed
-- Nothing
-
-### Security
-- Nothing
diff --git a/README.jp.md b/README.jp.md
index d573755..bd62874 100644
--- a/README.jp.md
+++ b/README.jp.md
@@ -24,12 +24,11 @@ Basic認証は望まないユーザーからのアクセスを排除すること
 
 ## 対応バージョン
 
- Laravel        | l5-very-basic-auth
-:---------------|:----------
- 5.1.x/5.2.x    | 1.x
- 5.3.x          | 2.x
- 5.4.x          | 3.x
- 5.5.x          | 4.x
+Laravel                          | l5-very-basic-auth
+:--------------------------------|:----------
+`5.1.*/5.2.*`                    | `1.*`
+`5.3.*`                          | `2.*`
+`5.4.*`/`5.5.*`/`5.6.*`          | `5.*`
 
 #### Laravel4.xを使っている場合
 
diff --git a/README.md b/README.md
index adeb162..9c32540 100644
--- a/README.md
+++ b/README.md
@@ -24,12 +24,13 @@ While HTTP Basic Auth does give you a protection layer against unwanted visitors
 
 ## Version Compatibility
 
- Laravel        | l5-very-basic-auth
-:---------------|:----------
- 5.1.x/5.2.x    | 1.x
- 5.3.x          | 2.x
- 5.4.x          | 3.x
- 5.5.x          | 4.x
+Laravel                          | l5-very-basic-auth
+:--------------------------------|:----------
+`5.1.*/5.2.*`                    | `1.*`
+`5.3.*`                          | `2.*`
+`5.4.*`/`5.5.*`/`5.6.*`          | `5.*`
+
+*The odd versioning is due to breaking changes in the testing framework and PHP versions. Else, `3.x` is usable for Laravel 5.4 (PHP 5.6 and up) and `4.x` for Laravel 5.5.*
 
 #### Using Laravel 4.x?
 
diff --git a/composer.json b/composer.json
index 00f8934..4188ffe 100644
--- a/composer.json
+++ b/composer.json
@@ -17,12 +17,12 @@
         }
     ],
     "require": {
-        "illuminate/support": "~5.5",
-        "php" : ">=7.0"
+        "illuminate/support": ">=5.4",
+        "php" : "7.*"
     },
     "require-dev": {
-        "phpunit/phpunit" : "~6.0",
-        "orchestra/testbench": "~3.5"
+        "phpunit/phpunit" : ">=5.0",
+        "orchestra/testbench": "3.*"
     },
     "autoload": {
         "psr-4": {
@@ -39,7 +39,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "4.x-dev"
+            "dev-master": "5.x-dev"
         },
         "laravel": {
             "providers": [