Skip to content

Commit c36a779

Browse files
Merge pull request #82 from dingo/chore/laravel-7-compat
Laravel 7 related compat changes
2 parents 0a02c03 + bbf1596 commit c36a779

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

.travis.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
language: php
22

3-
dist: trusty
4-
5-
php:
6-
- 7.1
7-
- 7.2
8-
93
sudo: false
104

115
env:
126
global:
137
- setup=basic
148
matrix:
159
include:
16-
- php: 7.1
17-
env: setup=lowest
1810
- php: 7.2
1911
env: setup=stable
12+
- php: 7.3
13+
env: setup=stable
14+
- php: 7.4
15+
env: setup=stable
2016

2117
install:
2218
- if [[ $setup = 'basic' ]]; then travis_retry composer install --no-interaction --prefer-source; fi

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^7.1",
13+
"php": "^7.2.5",
1414
"illuminate/support": "^5.5 || ^6.0 || ^7.0",
1515
"illuminate/filesystem": "^5.5 || ^6.0 || ^7.0",
1616
"doctrine/annotations": "~1.2",
1717
"phpdocumentor/reflection-docblock": "^3.1|^4.1"
1818
},
1919
"require-dev": {
2020
"squizlabs/php_codesniffer": "~2.0",
21-
"phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.5"
21+
"phpunit/phpunit": "^6.5"
2222
},
2323
"autoload": {
2424
"psr-4": {

0 commit comments

Comments
 (0)