Skip to content

Commit 1e06e50

Browse files
committed
Merge branch 'master' into 5.6
2 parents 3b23a59 + 38dae95 commit 1e06e50

File tree

3 files changed

+156
-3
lines changed

3 files changed

+156
-3
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: php
22

33
php:
4-
- 7.0
54
- 7.1
65
- 7.2
76

composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
},
2222
"require-dev": {
2323
"phpunit/phpunit": "^7.0",
24-
"mockery/mockery": "^1.0"
24+
"mockery/mockery": "^1.0",
25+
"illuminated/testing-tools": "5.6.*"
2526
},
2627
"autoload": {
2728
"files": ["src/autoload.php"],

composer.lock

+154-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)