Skip to content

Commit 9f3422f

Browse files
authored
Merge pull request #124 from localheinz/fix/phpunit
Fix: Allow installation with phpunit/phpunit:^9
2 parents 3e3d3c8 + dca2851 commit 9f3422f

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

Diff for: CHANGELOG.md

+14-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## Unreleased
88

9-
For a full diff see [`0.6.1...master`][0.6.1...master].
9+
For a full diff see [`0.6.2...master`][0.6.2...master].
10+
11+
## [`0.6.2`][0.6.2]
12+
13+
For a full diff see [`0.6.1...0.6.2`][0.6.1...0.6.2].
14+
15+
### Fixed
16+
17+
* Allowed installation with `phpunit/phpunit:^9` ([#124]), by [@localheinz]
1018

1119
## [`0.6.1`][0.6.1]
1220

@@ -86,6 +94,7 @@ For a full diff see [`afd6fd9...0.1`][afd6fd9...0.1].
8694
[0.5.1]: https://github.com/Jan0707/phpstan-prophecy/releases/tag/0.5.1
8795
[0.6.0]: https://github.com/Jan0707/phpstan-prophecy/releases/tag/0.6.0
8896
[0.6.1]: https://github.com/Jan0707/phpstan-prophecy/releases/tag/0.6.1
97+
[0.6.2]: https://github.com/Jan0707/phpstan-prophecy/releases/tag/0.6.2
8998

9099
[afd6fd9...0.1]: https://github.com/Jan0707/phpstan-prophecy/compare/afd6fd9...0.1
91100
[0.1...0.1.1]: https://github.com/Jan0707/phpstan-prophecy/compare/0.1...0.1.1
@@ -98,15 +107,17 @@ For a full diff see [`afd6fd9...0.1`][afd6fd9...0.1].
98107
[0.4.2...0.5.0]: https://github.com/Jan0707/phpstan-prophecy/compare/0.4.2...0.5.0
99108
[0.5.0...0.5.1]: https://github.com/Jan0707/phpstan-prophecy/compare/0.5.0...0.5.1
100109
[0.5.1...0.6.0]: https://github.com/Jan0707/phpstan-prophecy/compare/0.5.1...0.6.0
101-
[0.6.0...0.6.1]: https://github.com/Jan0707/phpstan-prophecy/compare/0.6.0...0.6.0
102-
[0.6.1...master]: https://github.com/Jan0707/phpstan-prophecy/compare/0.6.1...master
110+
[0.6.0...0.6.1]: https://github.com/Jan0707/phpstan-prophecy/compare/0.6.0...0.6.1
111+
[0.6.1...0.6.2]: https://github.com/Jan0707/phpstan-prophecy/compare/0.6.1...0.6.2
112+
[0.6.2...master]: https://github.com/Jan0707/phpstan-prophecy/compare/0.6.2...master
103113

104114
[#67]: https://github.com/Jan0707/phpstan-prophecy/pull/67
105115
[#79]: https://github.com/Jan0707/phpstan-prophecy/pull/79
106116
[#92]: https://github.com/Jan0707/phpstan-prophecy/pull/92
107117
[#94]: https://github.com/Jan0707/phpstan-prophecy/pull/94
108118
[#118]: https://github.com/Jan0707/phpstan-prophecy/pull/118
109119
[#119]: https://github.com/Jan0707/phpstan-prophecy/pull/119
120+
[#124]: https://github.com/Jan0707/phpstan-prophecy/pull/124
110121

111122
[@localheinz]: https://github.com/localheinz
112123
[@PedroTroller]: https://github.com/PedroTroller

Diff for: composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"conflict": {
1717
"phpspec/prophecy": "<1.7,>=2.0",
18-
"phpunit/phpunit": "<6.0,>=9.0"
18+
"phpunit/phpunit": "<6.0,>=10.0"
1919
},
2020
"require-dev": {
2121
"ergebnis/composer-normalize": "^2.1.1",

Diff for: composer.lock

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

0 commit comments

Comments
 (0)