Skip to content

Commit

Permalink
Merge pull request #31 from olssonm/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
olssonm authored Sep 5, 2018
2 parents f2e3c6e + 38df62e commit 9d5690d
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@ matrix:
env: ILLUMINATE_VERSION=5.6.*
- php: 7.2
env: ILLUMINATE_VERSION=5.6.*
- php: 7.2
env: ILLUMINATE_VERSION=5.7.*
- php: nightly
env: ILLUMINATE_VERSION=5.6.*
env: ILLUMINATE_VERSION=5.7.*
10 changes: 5 additions & 5 deletions README.jp.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ Basic認証は望まないユーザーからのアクセスを排除すること

## 対応バージョン

Laravel | l5-very-basic-auth
:--------------------------------|:----------
`5.1.*/5.2.*` | `1.*`
`5.3.*` | `2.*`
`5.4.*`/`5.5.*`/`5.6.*` | `5.*`
Laravel | l5-very-basic-auth
:--------------------------------------|:----------
`5.1.*/5.2.*` | `1.*`
`5.3.*` | `2.*`
`5.4.*`/`5.5.*`/`5.6.*/5.7.*` | `5.*`

#### Laravel4.xを使っている場合

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ While HTTP Basic Auth does give you a protection layer against unwanted visitors

## Version Compatibility

Laravel | l5-very-basic-auth
:--------------------------------|:----------
`5.1.*/5.2.*` | `1.*`
`5.3.*` | `2.*`
`5.4.*`/`5.5.*`/`5.6.*` | `5.*`
Laravel | l5-very-basic-auth
:--------------------------------------|:----------
`5.1.*/5.2.*` | `1.*`
`5.3.*` | `2.*`
`5.4.*`/`5.5.*`/`5.6.*/5.7.*` | `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.*

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
}
],
"require": {
"illuminate/support": "~5.4.0|~5.5.0|~5.6.0",
"illuminate/support": ">=5.4.0",
"php" : "^7.0"
},
"require-dev": {
"phpunit/phpunit": "^6.5 || 7.1",
"orchestra/testbench": "~3.4.0|~3.5.0|~3.6.0"
"orchestra/testbench": ">=3.4.0"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 9d5690d

Please sign in to comment.