From a1ba730c514b0ca65cb54f0123e4d1b3e5d4676a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sun, 30 Aug 2020 13:39:23 +0200 Subject: [PATCH] Enhancement: Add support for PHP 8.0 --- .github/settings.yml | 3 +++ .github/workflows/integrate.yaml | 1 + CHANGELOG.md | 15 +++++++++++++-- composer.json | 2 +- composer.lock | 4 ++-- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index be5678ca..6af12c8e 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -28,6 +28,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: diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 76c7df7d..985c8052 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -198,6 +198,7 @@ jobs: - "7.2" - "7.3" - "7.4" + - "8.0" dependencies: - "lowest" diff --git a/CHANGELOG.md b/CHANGELOG.md index d3205ec1..08a5d3b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 [`1.0.1...main`][1.0.1...main]. +For a full diff see [`1.1.0...main`][1.1.0...main]. + +## [`1.1.0`][1.1.0] + +For a full diff see [`1.0.1...1.1.0`][1.0.1...1.1.0]. + +## Changed + +* Added support for PHP 7.1 ([#177]), by [@localheinz] ## [`1.0.1`][1.0.1] @@ -38,11 +46,13 @@ For a full diff see [`675601b...0.1.0`][675601b...0.1.0]. [0.1.0]: https://github.com/ergebnis/license/releases/tag/0.1.0 [1.0.0]: https://github.com/ergebnis/license/releases/tag/1.0.0 [1.0.1]: https://github.com/ergebnis/license/releases/tag/1.0.1 +[1.1.0]: https://github.com/ergebnis/license/releases/tag/1.1.0 [675601b...0.1.0]: https://github.com/ergebnis/license/compare/675601b...0.1.0 [0.1.0...1.0.0]: https://github.com/ergebnis/license/compare/0.1.0...1.0.0 [1.0.0...1.0.1]: https://github.com/ergebnis/license/compare/1.0.0...1.0.1 -[1.0.1...main]: https://github.com/ergebnis/license/compare/1.0.1...main +[1.0.1...1.1.0]: https://github.com/ergebnis/license/compare/1.0.1...1.1.0 +[1.1.0...main]: https://github.com/ergebnis/license/compare/1.1.0...main [#7]: https://github.com/ergebnis/license/pull/7 [#10]: https://github.com/ergebnis/license/pull/10 @@ -53,5 +63,6 @@ For a full diff see [`675601b...0.1.0`][675601b...0.1.0]. [#34]: https://github.com/ergebnis/license/pull/34 [#38]: https://github.com/ergebnis/license/pull/38 [#171]: https://github.com/ergebnis/license/pull/171 +[#177]: https://github.com/ergebnis/license/pull/177 [@localheinz]: https://github.com/localheinz diff --git a/composer.json b/composer.json index cefebcd6..c9b318f5 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2", + "php": "^7.2 || ^8.0", "ext-filter": "*" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 9e245ffb..91aff87a 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": "c1d3777c8fe8ca375ed3b733486c03ee", + "content-hash": "c4da637206b777179d76c73269c5c2a2", "packages": [], "packages-dev": [ { @@ -5577,7 +5577,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.2", + "php": "^7.2 || ^8.0", "ext-filter": "*" }, "platform-dev": [],