Skip to content

Commit 99618dc

Browse files
authored
Merge pull request #30 from studio-net/f-laravel57
Laravel 5.7
2 parents c87eb06 + af20c12 commit 99618dc

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.travis.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
language : php
2-
php : [7.1, 7.2]
3-
cache : { directories : [$COMPOSER_CACHE_DIR, $HOME/.composer/cache, vendor] }
4-
install : composer update --no-interaction --prefer-dist
1+
language : php
2+
php : [7.1, 7.2]
3+
cache : { directories : [$COMPOSER_CACHE_DIR, $HOME/.composer/cache, vendor] }
4+
install : composer update --no-interaction --prefer-dist
55
notifications :
66
email : false
77

@@ -18,8 +18,7 @@ before_install :
1818
jobs :
1919
include :
2020
- stage : lint
21-
php : 7.2
22-
env : TESTBENCH_VERSION=3.6.* LARAVEL_VERSION=5.6.*
21+
php : 7.2
2322
before_install :
2423
- composer global require hirak/prestissimo --update-no-dev
2524
- composer require phpmd/phpmd --no-update --prefer-dist

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
}
1010
],
1111
"require": {
12-
"laravel/framework": "5.6.*",
12+
"laravel/framework": "~5.6.0|~5.7.0",
1313
"webonyx/graphql-php": "^0.11.0",
1414
"doctrine/dbal": "^2.5",
1515
"cache/array-adapter": "^1.0"
1616
},
1717
"require-dev": {
1818
"phpunit/phpunit": "^7.0",
19-
"orchestra/testbench-browser-kit": "3.6.*",
19+
"orchestra/testbench-browser-kit": "~3.6.0|~3.7.0@dev",
2020
"codeception/specify": "^1.1",
2121
"phpmd/phpmd" : "@stable",
2222
"phpstan/phpstan": "^0.9.2",

0 commit comments

Comments
 (0)