Skip to content

Commit 4c8d21c

Browse files
committed
Merge pull request dingo#676 from orchestral/feature/support-5
Add support for Laravel and Lumen ~5.1
2 parents 73292b6 + 4586731 commit 4c8d21c

File tree

2 files changed

+25
-12
lines changed

2 files changed

+25
-12
lines changed

.travis.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,21 @@ php:
88

99
sudo: false
1010

11+
env:
12+
global:
13+
- setup=basic
14+
15+
matrix:
16+
include:
17+
- php: 5.5.9
18+
env: setup=lowest
19+
- php: 5.5.9
20+
env: setup=stable
21+
1122
install:
12-
- travis_retry composer install --no-interaction --prefer-source
23+
- if [[ $setup = 'basic' ]]; then travis_retry composer install --no-interaction --prefer-source; fi
24+
- if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-source --no-interaction --prefer-stable; fi
25+
- if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-source --no-interaction --prefer-lowest --prefer-stable; fi
1326

1427
script:
1528
- vendor/bin/phpunit

composer.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
],
1212
"require": {
1313
"php": ">=5.5.9",
14-
"illuminate/routing": "5.1.*",
15-
"illuminate/support": "5.1.*",
14+
"illuminate/routing": "~5.1",
15+
"illuminate/support": "~5.1",
1616
"dingo/blueprint": "0.1.*",
1717
"league/fractal": "0.12.*",
1818
"doctrine/annotations": "1.2.*",
@@ -21,15 +21,15 @@
2121
"require-dev": {
2222
"lucadegasperi/oauth2-server-laravel": "5.0.*",
2323
"tymon/jwt-auth": "0.5.*",
24-
"laravel/lumen-framework": "5.1.*",
25-
"illuminate/auth": "5.1.*",
26-
"illuminate/cache": "5.1.*",
27-
"illuminate/events": "5.1.*",
28-
"illuminate/database": "5.1.*",
29-
"illuminate/pagination": "5.1.*",
30-
"illuminate/console": "5.1.*",
31-
"illuminate/filesystem": "5.1.*",
32-
"illuminate/log": "5.1.*",
24+
"laravel/lumen-framework": "~5.1",
25+
"illuminate/auth": "~5.1",
26+
"illuminate/cache": "~5.1",
27+
"illuminate/events": "~5.1",
28+
"illuminate/database": "~5.1",
29+
"illuminate/pagination": "~5.1",
30+
"illuminate/console": "~5.1",
31+
"illuminate/filesystem": "~5.1",
32+
"illuminate/log": "~5.1",
3333
"phpunit/phpunit": "~4.0",
3434
"mockery/mockery": "~0.9",
3535
"squizlabs/php_codesniffer": "~2.0"

0 commit comments

Comments
 (0)