Skip to content

Commit 28fa0f0

Browse files
authored
Merge pull request #80 from joedixon/develop
Merge develop into master
2 parents 2d448e8 + d61c196 commit 28fa0f0

File tree

12 files changed

+2787
-1617
lines changed

12 files changed

+2787
-1617
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/vendor/
22
/node_modules
3+
.phpunit.result.cache

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ language: php
33
sudo: false
44

55
php:
6-
- 7.1
76
- 7.2
7+
- 7.3
88

99
env:
1010
matrix:
11-
- COMPOSER_FLAGS="--prefer-lowest"
1211
- COMPOSER_FLAGS=""
1312

1413
before_script:

composer.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99
"email": "[email protected]"
1010
}
1111
],
12-
"require": {
13-
},
12+
"require": {},
1413
"require-dev": {
15-
"orchestra/testbench": "^3.6",
16-
"phpunit/phpunit": "^7.0",
14+
"orchestra/testbench": "^4.0",
15+
"phpunit/phpunit": "^8.0",
1716
"mockery/mockery": "^1.0.0"
1817
},
1918
"autoload": {
@@ -37,4 +36,4 @@
3736
]
3837
}
3938
}
40-
}
39+
}

0 commit comments

Comments
 (0)