Skip to content

Commit 94b1802

Browse files
authored
Merge pull request #25 from swisnl/feature-laravel-56-support
Laravel 5.6 support and testing Fixes #24
2 parents 3b0b74a + bea0f75 commit 94b1802

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

.travis.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
language: php
22

3-
php:
4-
- '7.0'
5-
- '7.1'
6-
- '7.2'
3+
matrix:
4+
include:
5+
- php: "7.0"
6+
env: LARAVEL_VERSION="5.3.*"
7+
- php: "7.0"
8+
env: LARAVEL_VERSION="5.4.*"
9+
- php: "7.0"
10+
env: LARAVEL_VERSION="5.5.*"
11+
- php: "7.1"
12+
env: LARAVEL_VERSION="5.5.*"
13+
- php: "7.2"
14+
env: LARAVEL_VERSION="5.5.*"
15+
- php: "7.2"
16+
env: LARAVEL_VERSION="5.6.*" RUN_CS_FIXER=1
717

818
sudo: false
919

1020
install:
21+
- composer require "illuminate/support:${LARAVEL_VERSION}" --no-update --no-interaction
1122
- travis_retry composer install --no-interaction --prefer-dist
1223

1324
script:
14-
- vendor/bin/php-cs-fixer fix -v --dry-run --using-cache=no
25+
- if [ "$RUN_CS_FIXER" ] ; then vendor/bin/php-cs-fixer fix -v --dry-run --using-cache=no ; fi
1526
- vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml
1627

1728
after_script:

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
"require": {
66
"php": ">=7.0",
77
"art4/json-api-client": "^0.9.1",
8-
"illuminate/support": "5.3.*|5.4.*|5.5.*",
8+
"illuminate/support": "5.3.*|5.4.*|5.5.*|5.6.*",
99
"jenssegers/model": "^1.1",
1010
"php-http/client-implementation": "^1.0",
1111
"php-http/discovery": "^1.0"
1212
},
1313
"require-dev": {
1414
"fzaninotto/faker": "^1.6",
1515
"friendsofphp/php-cs-fixer": "^2.0",
16-
"graham-campbell/testbench": "^4.0",
17-
"phpunit/phpunit": "^6.1",
16+
"graham-campbell/testbench": "^4.0|^5.1",
17+
"phpunit/phpunit": "^6.1|^7.0",
1818
"php-http/guzzle6-adapter": "^1.1",
1919
"php-http/mock-client": "^1.1"
2020
},

0 commit comments

Comments
 (0)