Skip to content

Commit

Permalink
Merge pull request #236 from localheinz/feature/php80
Browse files Browse the repository at this point in the history
Enhancement: Allow installation with PHP 8.0
  • Loading branch information
localheinz committed Oct 24, 2020
2 parents 09ae5ca + f3ac79e commit f01ca47
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
14 changes: 12 additions & 2 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.8.0...master`][0.8.0...master].
For a full diff see [`0.8.1...master`][0.8.1...master].

## [`0.8.1`][0.8.1]

For a full diff see [`0.8.0...0.8.1`][0.8.0...0.8.1].

### Changed

* Allowed installation with PHP 8.0 ([#236]), by [@localheinz]

## [`0.8.0`][0.8.0]

Expand Down Expand Up @@ -143,7 +151,8 @@ For a full diff see [`afd6fd9...0.1`][afd6fd9...0.1].
[0.6.1...0.6.2]: https://github.com/Jan0707/phpstan-prophecy/compare/0.6.1...0.6.2
[0.6.2...0.7.0]: https://github.com/Jan0707/phpstan-prophecy/compare/0.6.2...0.7.0
[0.7.0...0.8.0]: https://github.com/Jan0707/phpstan-prophecy/compare/0.7.0...0.8.0
[0.8.0...master]: https://github.com/Jan0707/phpstan-prophecy/compare/0.8.0...master
[0.8.0...0.8.1]: https://github.com/Jan0707/phpstan-prophecy/compare/0.8.0...0.8.1
[0.8.1...master]: https://github.com/Jan0707/phpstan-prophecy/compare/0.8.1...master

[#67]: https://github.com/Jan0707/phpstan-prophecy/pull/67
[#79]: https://github.com/Jan0707/phpstan-prophecy/pull/79
Expand All @@ -157,6 +166,7 @@ For a full diff see [`afd6fd9...0.1`][afd6fd9...0.1].
[#153]: https://github.com/Jan0707/phpstan-prophecy/pull/153
[#165]: https://github.com/Jan0707/phpstan-prophecy/pull/165
[#182]: https://github.com/Jan0707/phpstan-prophecy/pull/182
[#236]: https://github.com/Jan0707/phpstan-prophecy/pull/236

[@Jean85]: https://github.com/Jean85
[@localheinz]: https://github.com/localheinz
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -10,7 +10,7 @@
}
],
"require": {
"php": "^7.1",
"php": "^7.1 || ^8.0",
"phpstan/phpstan": "^0.12.6"
},
"conflict": {
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

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

0 comments on commit f01ca47

Please sign in to comment.