Skip to content

Commit

Permalink
Merge pull request #465 from core23/php8
Browse files Browse the repository at this point in the history
Add support for PHP 8.0
  • Loading branch information
localheinz authored Jul 3, 2020
2 parents 6a2a311 + 0c5cb91 commit ad7a078
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 6 deletions.
6 changes: 6 additions & 0 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ branches:
- "Tests (7.4, 2, highest)"
- "Tests (7.4, 2, locked)"
- "Tests (7.4, 2, lowest)"
- "Tests (8.0, 1, highest)"
- "Tests (8.0, 1, locked)"
- "Tests (8.0, 1, lowest)"
- "Tests (8.0, 2, highest)"
- "Tests (8.0, 2, locked)"
- "Tests (8.0, 2, lowest)"
strict: false
restrictions:

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ jobs:
- "7.2"
- "7.3"
- "7.4"
- "8.0"

composer-version:
- "1"
Expand Down
18 changes: 15 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
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 [`2.5.2...main`][2.5.2...main].
For a full diff see [`2.6.0...main`][2.6.0...main].

## [`2.6.0`][2.6.0]

For a full diff see [`2.5.2...2.6.0`][2.5.2...2.6.0].

### Added

* Added support for PHP 8.0 ([#465]), by [@core23]

## [`2.5.2`][2.5.2]

Expand Down Expand Up @@ -394,6 +402,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.5.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.5.0
[2.5.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.5.1
[2.5.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.5.2
[2.6.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.6.0

[81bc3a8...0.1.0]: https://github.com/ergebnis/composer-normalize/compare/81bc3a8...0.1.0
[0.1.0...0.2.0]: https://github.com/ergebnis/composer-normalize/compare/0.1.0...0.2.0
Expand Down Expand Up @@ -431,7 +440,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[2.4.0...2.5.0]: https://github.com/ergebnis/composer-normalize/compare/2.4.0...2.5.0
[2.5.0...2.5.1]: https://github.com/ergebnis/composer-normalize/compare/2.5.0...2.5.1
[2.5.1...2.5.2]: https://github.com/ergebnis/composer-normalize/compare/2.5.1...2.5.2
[2.5.2...main]: https://github.com/ergebnis/composer-normalize/compare/2.5.2...main
[2.5.2...2.6.0]: https://github.com/ergebnis/composer-normalize/compare/2.5.2...2.6.0
[2.6.0...main]: https://github.com/ergebnis/composer-normalize/compare/2.6.0...main

[#1]: https://github.com/ergebnis/composer-normalize/pull/1
[#2]: https://github.com/ergebnis/composer-normalize/pull/2
Expand Down Expand Up @@ -485,10 +495,12 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#420]: https://github.com/ergebnis/composer-normalize/pull/420
[#422]: https://github.com/ergebnis/composer-normalize/pull/422
[#424]: https://github.com/ergebnis/composer-normalize/pull/424
[#465]: https://github.com/ergebnis/composer-normalize/pull/465
[#481]: https://github.com/ergebnis/composer-normalize/pull/481

[@ergebnis]: https://github.com/ergebnis
[@core23]: https://github.com/core23
[@ergebnis-bot]: https://github.com/ergebnis-bot
[@ergebnis]: https://github.com/ergebnis
[@localheinz]: https://github.com/localheinz
[@svenluijten]: https://github.com/svenluijten
[@TravisCarden]: https://github.com/TravisCarden
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}
],
"require": {
"php": "^7.1",
"php": "^7.1 || ^8.0",
"composer-plugin-api": "^1.1.0 || ^2.0.0",
"ergebnis/json-normalizer": "~0.12.0",
"ergebnis/json-printer": "^3.0.2",
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 ad7a078

Please sign in to comment.