Skip to content

Commit 2a2473f

Browse files
authored
Merge pull request #8 from olssonm/dev
New Travis matrix. Version bump for Laravel 5.6.
2 parents 99cb118 + 53861eb commit 2a2473f

File tree

2 files changed

+23
-10
lines changed

2 files changed

+23
-10
lines changed

.travis.yml

+19-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
language: php
2-
php:
3-
- 5.6
4-
- 7.0
5-
- 7.1
62

7-
before_script:
3+
before_install:
84
- travis_retry composer self-update
9-
- travis_retry composer install --prefer-dist --no-interaction
5+
- composer require "illuminate/support:${ILLUMINATE_VERSION}" --no-update
6+
7+
install: composer update --prefer-source --no-interaction --dev
108

119
script: composer test
10+
11+
matrix:
12+
include:
13+
- php: 5.6
14+
env: ILLUMINATE_VERSION=5.3.*
15+
- php: 5.6
16+
env: ILLUMINATE_VERSION=5.4.*
17+
- php: 7.0
18+
env: ILLUMINATE_VERSION=5.4.*
19+
- php: 7.1
20+
env: ILLUMINATE_VERSION=5.5.*
21+
- php: 7.1
22+
env: ILLUMINATE_VERSION=5.6.*
23+
- php: nightly
24+
env: ILLUMINATE_VERSION=5.6.*

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
],
2222
"require": {
2323
"php" : ">=5.6.0|>=7.0",
24-
"illuminate/support": "~5.3.28|~5.4|~5.5",
24+
"illuminate/support": "~5.3|~5.4|~5.5|~5.6",
2525
"bjeavons/zxcvbn-php": "0.3.0"
2626
},
2727
"require-dev": {
28-
"phpunit/phpunit" : "5.7.*|~6.0",
29-
"orchestra/testbench": "~3.3|~3.4|~3.5"
28+
"phpunit/phpunit" : "5.7.*|~6.0|~7.0",
29+
"orchestra/testbench": "~3.3|~3.4|~3.5|~3.6"
3030
},
3131
"autoload": {
3232
"psr-4": {
@@ -43,7 +43,7 @@
4343
},
4444
"extra": {
4545
"branch-alias": {
46-
"dev-master": "3.x-dev"
46+
"dev-master": "4.x-dev"
4747
},
4848
"laravel": {
4949
"providers": [

0 commit comments

Comments
 (0)