Skip to content

Commit 591a7a5

Browse files
committed
Merge branch 'master' into master-envVarDisable
2 parents eeb2098 + 8c0e149 commit 591a7a5

File tree

3 files changed

+24
-5
lines changed

3 files changed

+24
-5
lines changed

.travis.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,26 @@ php:
44
- 7.1
55
- 7.2
66
- 7.3
7-
- 7.4snapshot
7+
- 7.4
88
- nightly
99

1010
env:
1111
- PHPUNIT=7.*
1212
- PHPUNIT=8.*
13+
- PHPUNIT=9.*
1314
- PHPUNIT=dev-master MIN_STABILITY=dev
1415

1516
matrix:
1617
exclude:
1718
- php: 7.1
1819
env: PHPUNIT=8.*
1920
- php: 7.1
21+
env: PHPUNIT=9.*
22+
- php: 7.1
23+
env: PHPUNIT=dev-master MIN_STABILITY=dev
24+
- php: 7.2
25+
env: PHPUNIT=9.*
26+
- php: 7.2
2027
env: PHPUNIT=dev-master MIN_STABILITY=dev
2128
allow_failures:
2229
- php: nightly

CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,19 @@ View diff for a specific commit:
55
https://github.com/johnkary/phpunit-speedtrap/commit/XXX where XXX is the commit hash
66

77
View diff between two versions:
8-
https://github.com/johnkary/phpunit-speedtrap/compare/v2.0.0...v3.0.0
8+
https://github.com/johnkary/phpunit-speedtrap/compare/v3.1.0...v3.2.0
9+
10+
## 3.2.0 (2020-02-12)
11+
12+
Version 3.2 introduces supports for PHPUnit 9.0+.
13+
If your use of SpeedTrap depends on specific text output from SpeedTrap slowness
14+
report, see below wording changes that may require updating your implementation.
15+
16+
* [PR #57](https://github.com/johnkary/phpunit-speedtrap/pull/57) Wording change to slowness report in renderHeader()
17+
18+
## 3.1.0 (2019-02-23)
19+
20+
Version 3.1 introduces support for PHPUnit 8.0+.
921

1022
## 3.0.0 (2018-02-24)
1123

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "johnkary/phpunit-speedtrap",
33
"type": "library",
4-
"description": "Find slow tests in your PHPUnit test suite",
4+
"description": "Find and report on slow tests in your PHPUnit test suite",
55
"keywords": [
66
"PHPUnit",
77
"slow",
@@ -17,11 +17,11 @@
1717
],
1818
"require": {
1919
"php": ">=7.1",
20-
"phpunit/phpunit": "^7.0 || ^8.0"
20+
"phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
2121
},
2222
"extra": {
2323
"branch-alias": {
24-
"dev-master": "3.1-dev"
24+
"dev-master": "3.2-dev"
2525
}
2626
},
2727
"autoload": {

0 commit comments

Comments
 (0)