Merge pull request #37 from olssonm/laravel-6

Laravel 6
olssonm · Sep 5, 2019 · 3a23285 · 3a23285
2 parents b38c92a + 33fd2ac
commit 3a23285
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 composer.lock
 src/config.php
 .DS_Store
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -11,31 +11,19 @@ script:
 
 matrix:
   include:
-    - php: 7.0
-      env:
-        - ILLUMINATE_VERSION=5.4.*
-        - PHPUNIT_VERSION=~5.7
-    - php: 7.1
-      env:
-        - ILLUMINATE_VERSION=5.5.*
-        - PHPUNIT_VERSION=~6.0
     - php: 7.1
       env:
-        - ILLUMINATE_VERSION=5.6.*
-        - PHPUNIT_VERSION=7.1
-    - php: 7.2
-      env:
-        - ILLUMINATE_VERSION=5.6.*
-        - PHPUNIT_VERSION=7.1
+        - ILLUMINATE_VERSION=5.8.*
+        - PHPUNIT_VERSION=7.5
     - php: 7.2
       env:
-        - ILLUMINATE_VERSION=5.7.*
-        - PHPUNIT_VERSION=7.1
+        - ILLUMINATE_VERSION=5.8.*
+        - PHPUNIT_VERSION=7.5
     - php: 7.2
       env:
-        - ILLUMINATE_VERSION=5.8.*
-        - PHPUNIT_VERSION=~7.5
+        - ILLUMINATE_VERSION=^6.0
+        - PHPUNIT_VERSION=^8.0
     - php: 7.3
       env:
-        - ILLUMINATE_VERSION=5.8.*
-        - PHPUNIT_VERSION=~7.5
+        - ILLUMINATE_VERSION=^6.0
+        - PHPUNIT_VERSION=^8.0
diff --git a/README.jp.md b/README.jp.md
@@ -29,9 +29,8 @@ Basic認証は望まないユーザーからのアクセスを排除すること
 
 Laravel                                | l5-very-basic-auth
 :--------------------------------------|:----------
-`5.1.*/5.2.*`                          | `1.*`
-`5.3.*`                                | `2.*`
 `^5.4`                                 | `5.*`
+`^6`                                   | `6.*`
 
 #### Laravel4.xを使っている場合
 

diff --git a/README.md b/README.md
@@ -29,9 +29,8 @@ While HTTP Basic Auth does give you a protection layer against unwanted visitors
 
 Laravel                                | l5-very-basic-auth
 :--------------------------------------|:----------
-`5.1.*/5.2.*`                          | `1.*`
-`5.3.*`                                | `2.*`
 `^5.4`                                 | `5.*`
+`^6`                                   | `6.*`
 
 *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.*
 

diff --git a/composer.json b/composer.json
@@ -17,12 +17,13 @@
         }
     ],
     "require": {
-        "illuminate/support": ">=5.4",
-        "php" : "^7.0"
+        "illuminate/support": ">=5.8 || ^6.0",
+        "php" : "^7.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5 || ^7.5",
-        "orchestra/testbench": ">=3.4.0"
+        "phpunit/phpunit": "^7.5 || ^8.0",
+        "orchestra/testbench": ">=3.4.0",
+        "laravel/helpers": "^1.1"
     },
     "autoload": {
         "psr-4": {