Merge pull request #8 from olssonm/dev

New Travis matrix. Version bump for Laravel 5.6.
This commit is contained in:
Marcus Olsson 2018-02-14 10:12:03 +01:00 committed by GitHub
commit 2a2473f84c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 10 deletions

View File

@ -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.*
- 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.*

View File

@ -21,12 +21,12 @@
],
"require": {
"php" : ">=5.6.0|>=7.0",
"illuminate/support": "~5.3.28|~5.4|~5.5",
"illuminate/support": "~5.3|~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": {
@ -43,7 +43,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "3.x-dev"
"dev-master": "4.x-dev"
},
"laravel": {
"providers": [