Skip to content

Commit

Permalink
Merge pull request #308 from ergebnis/feature/php8
Browse files Browse the repository at this point in the history
Enhancement: Add support for PHP 8.0
  • Loading branch information
localheinz committed Jul 4, 2020
2 parents 7640788 + 9ea777f commit a532e07
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 124 deletions.
3 changes: 3 additions & 0 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ branches:
- "Tests (7.4, highest)"
- "Tests (7.4, locked)"
- "Tests (7.4, lowest)"
- "Tests (8.0, highest)"
- "Tests (8.0, locked)"
- "Tests (8.0, 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 @@ -222,6 +222,7 @@ jobs:
- "7.2"
- "7.3"
- "7.4"
- "8.0"

dependencies:
- "lowest"
Expand Down
15 changes: 13 additions & 2 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 [`0.12.0...main`][0.12.0...main].
For a full diff see [`0.13.0...main`][0.13.0...main].

## [`0.13.0`][0.13.0]

For a full diff see [`0.12.0...0.13.0`][0.12.0...0.13.0].

### Added

* Added support for PHP 8.0 ([#308]), by [@localheinz]

## [`0.12.0`][0.12.0]

Expand Down Expand Up @@ -248,6 +256,7 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0].
[0.10.1]: https://github.com/ergebnis/json-normalizer/releases/tag/0.10.0
[0.11.0]: https://github.com/ergebnis/json-normalizer/releases/tag/0.11.0
[0.12.0]: https://github.com/ergebnis/json-normalizer/releases/tag/0.12.0
[0.13.0]: https://github.com/ergebnis/json-normalizer/releases/tag/0.13.0

[5d8b3e2...0.1.0]: https://github.com/ergebnis/json-normalizer/compare/5d8b3e2...0.1.0
[0.1.0...0.2.0]: https://github.com/ergebnis/json-normalizer/compare/0.1.0...0.2.0
Expand All @@ -264,7 +273,8 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0].
[0.10.0...0.10.1]: https://github.com/ergebnis/json-normalizer/compare/0.10.0...0.10.1
[0.10.1...0.11.0]: https://github.com/ergebnis/json-normalizer/compare/0.10.1...0.11.0
[0.11.0...0.12.0]: https://github.com/ergebnis/json-normalizer/compare/0.11.0...0.12.0
[0.12.0...main]: https://github.com/ergebnis/json-normalizer/compare/0.12.0...main
[0.12.0...0.13.0]: https://github.com/ergebnis/json-normalizer/compare/0.12.0...0.13.0
[0.13.0...main]: https://github.com/ergebnis/json-normalizer/compare/0.13.0...main

[#1]: https://github.com/ergebnis/json-normalizer/pull/1
[#2]: https://github.com/ergebnis/json-normalizer/pull/2
Expand Down Expand Up @@ -323,6 +333,7 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0].
[#203]: https://github.com/ergebnis/json-normalizer/pull/203
[#268]: https://github.com/ergebnis/json-normalizer/pull/268
[#269]: https://github.com/ergebnis/json-normalizer/pull/269
[#308]: https://github.com/ergebnis/json-normalizer/pull/308

[@BackEndTea]: https://github.com/BackEndTea
[@ergebnis]: https://github.com/ergebnis
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"php": "^7.1",
"php": "^7.1 || ^8.0",
"ext-json": "*",
"ergebnis/json-printer": "^3.1.0",
"justinrainbow/json-schema": "^5.2.10"
Expand Down

0 comments on commit a532e07

Please sign in to comment.