Skip to content

Commit

Permalink
Merge pull request #124 from localheinz/fix/phpunit
Browse files Browse the repository at this point in the history
Fix: Allow installation with phpunit/phpunit:^9
  • Loading branch information
localheinz committed Feb 17, 2020
2 parents 3e3d3c8 + dca2851 commit 9f3422f
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
17 changes: 14 additions & 3 deletions CHANGELOG.md
Expand Up @@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

For a full diff see [`0.6.1...master`][0.6.1...master].
For a full diff see [`0.6.2...master`][0.6.2...master].

## [`0.6.2`][0.6.2]

For a full diff see [`0.6.1...0.6.2`][0.6.1...0.6.2].

### Fixed

* Allowed installation with `phpunit/phpunit:^9` ([#124]), by [@localheinz]

## [`0.6.1`][0.6.1]

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

[afd6fd9...0.1]: https://github.com/Jan0707/phpstan-prophecy/compare/afd6fd9...0.1
[0.1...0.1.1]: https://github.com/Jan0707/phpstan-prophecy/compare/0.1...0.1.1
Expand All @@ -98,15 +107,17 @@ For a full diff see [`afd6fd9...0.1`][afd6fd9...0.1].
[0.4.2...0.5.0]: https://github.com/Jan0707/phpstan-prophecy/compare/0.4.2...0.5.0
[0.5.0...0.5.1]: https://github.com/Jan0707/phpstan-prophecy/compare/0.5.0...0.5.1
[0.5.1...0.6.0]: https://github.com/Jan0707/phpstan-prophecy/compare/0.5.1...0.6.0
[0.6.0...0.6.1]: https://github.com/Jan0707/phpstan-prophecy/compare/0.6.0...0.6.0
[0.6.1...master]: https://github.com/Jan0707/phpstan-prophecy/compare/0.6.1...master
[0.6.0...0.6.1]: https://github.com/Jan0707/phpstan-prophecy/compare/0.6.0...0.6.1
[0.6.1...0.6.2]: https://github.com/Jan0707/phpstan-prophecy/compare/0.6.1...0.6.2
[0.6.2...master]: https://github.com/Jan0707/phpstan-prophecy/compare/0.6.2...master

[#67]: https://github.com/Jan0707/phpstan-prophecy/pull/67
[#79]: https://github.com/Jan0707/phpstan-prophecy/pull/79
[#92]: https://github.com/Jan0707/phpstan-prophecy/pull/92
[#94]: https://github.com/Jan0707/phpstan-prophecy/pull/94
[#118]: https://github.com/Jan0707/phpstan-prophecy/pull/118
[#119]: https://github.com/Jan0707/phpstan-prophecy/pull/119
[#124]: https://github.com/Jan0707/phpstan-prophecy/pull/124

[@localheinz]: https://github.com/localheinz
[@PedroTroller]: https://github.com/PedroTroller
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -15,7 +15,7 @@
},
"conflict": {
"phpspec/prophecy": "<1.7,>=2.0",
"phpunit/phpunit": "<6.0,>=9.0"
"phpunit/phpunit": "<6.0,>=10.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.1.1",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9f3422f

Please sign in to comment.