Skip to content

Commit

Permalink
Merge pull request #19 from olssonm/L56
Browse files Browse the repository at this point in the history
New testing procedure. Cleanup. Version bump.
  • Loading branch information
olssonm authored Feb 9, 2018
2 parents ede0f0c + 31742d2 commit 2848e9d
Showing 5 changed files with 36 additions and 42 deletions.
24 changes: 19 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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.*
20 changes: 0 additions & 20 deletions CHANGELOG.md

This file was deleted.

11 changes: 5 additions & 6 deletions README.jp.md
Original file line number Diff line number Diff line change
@@ -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を使っている場合

13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -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?

10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -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": [

0 comments on commit 2848e9d

Please sign in to comment.