diff --git a/.github/settings.yml b/.github/settings.yml index de8b0429..8b168214 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -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: diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 34f82ac7..9380f849 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -257,6 +257,7 @@ jobs: - "7.2" - "7.3" - "7.4" + - "8.0" composer-version: - "1" diff --git a/CHANGELOG.md b/CHANGELOG.md index 24fa2dad..ec05b853 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), For a full diff see [`2.5.1...main`][2.5.1...main]. +### Added + +* Added support for PHP 8.0 ([#465]), by [@core23] + ## [`2.5.1`][2.5.1] For a full diff see [`2.5.0...2.5.1`][2.5.0...2.5.1]. @@ -475,9 +479,11 @@ 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 -[@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 diff --git a/composer.json b/composer.json index fd5c0940..16038daf 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/composer.lock b/composer.lock index 9a4278dd..1dafb6cb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5787e3fe85f9994c13a47350485b22a7", + "content-hash": "0578ba4326440eb256705a1f1fd9c5b3", "packages": [ { "name": "ergebnis/json-normalizer", @@ -3512,7 +3512,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^7.1", + "php": "^7.1 || ^8.0", "composer-plugin-api": "^1.1.0 || ^2.0.0" }, "platform-dev": [],