Skip to content

Commit 369638d

Browse files
authored
Merge pull request #1 from jshayes/master
Merge main repository back into fork
2 parents 3d19dcb + 48df47e commit 369638d

File tree

2 files changed

+7
-20
lines changed

2 files changed

+7
-20
lines changed

.travis.yml

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

3-
matrix:
4-
include:
5-
- php: 7.1
6-
env: ILLUMINATE_VERSION=5.5.*
7-
- php: 7.1
8-
env: ILLUMINATE_VERSION=5.6.*
9-
- php: 7.1
10-
env: ILLUMINATE_VERSION=5.7.*
11-
- php: 7.2
12-
env: ILLUMINATE_VERSION=5.5.*
13-
- php: 7.2
14-
env: ILLUMINATE_VERSION=5.6.*
15-
- php: 7.2
16-
env: ILLUMINATE_VERSION=5.7.*
17-
18-
before_install:
19-
- composer require "illuminate/support:${ILLUMINATE_VERSION}" --no-update
3+
php:
4+
- 7.2
5+
- 7.3
6+
- 7.4
207

218
before_script:
229
- composer update --prefer-source --no-interaction

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
],
1111
"require": {
1212
"datadog/php-datadogstatsd": "^1.3",
13-
"illuminate/support": "^5.5"
13+
"illuminate/support": "^6.0"
1414
},
1515
"autoload": {
1616
"psr-4": {
@@ -23,8 +23,8 @@
2323
}
2424
},
2525
"require-dev": {
26-
"phpunit/phpunit": "^6.0|^7.0",
27-
"orchestra/testbench": "^3.0",
26+
"phpunit/phpunit": "^8.0",
27+
"orchestra/testbench": "^4.0",
2828
"mockery/mockery": "^1.2"
2929
},
3030
"extra": {

0 commit comments

Comments
 (0)