From f407182099132871ceb351114c86c79251d7a18d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 28 Jun 2023 08:35:43 +0200 Subject: [PATCH] Fix: Drop support for PHP 8.0 --- .github/settings.yml | 17 +++++++---------- .github/workflows/integrate.yaml | 16 ++++++++-------- .github/workflows/renew.yaml | 2 +- .github/workflows/update.yaml | 2 +- .php-cs-fixer.php | 2 +- CHANGELOG.md | 5 +++++ composer.json | 4 ++-- composer.lock | 6 +++--- rector.php | 2 +- 9 files changed, 29 insertions(+), 27 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index 42a4a5b2..71ff84c4 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -14,16 +14,13 @@ branches: required_approving_review_count: 1 required_status_checks: checks: - - context: "Code Coverage (8.0, locked)" - - context: "Coding Standards (8.0, locked)" - - context: "Dependency Analysis (8.0, locked)" - - context: "Mutation Tests (8.0, locked)" - - context: "Refactoring (8.0, locked)" - - context: "Security Analysis (8.0, locked)" - - context: "Static Code Analysis (8.0, locked)" - - context: "Tests (8.0, highest)" - - context: "Tests (8.0, locked)" - - context: "Tests (8.0, lowest)" + - context: "Code Coverage (8.1, locked)" + - context: "Coding Standards (8.1, locked)" + - context: "Dependency Analysis (8.1, locked)" + - context: "Mutation Tests (8.1, locked)" + - context: "Refactoring (8.1, locked)" + - context: "Security Analysis (8.1, locked)" + - context: "Static Code Analysis (8.1, locked)" - context: "Tests (8.1, highest)" - context: "Tests (8.1, locked)" - context: "Tests (8.1, lowest)" diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index c979b655..24182468 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -17,7 +17,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" dependencies: - "locked" @@ -73,7 +73,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" dependencies: - "locked" @@ -149,7 +149,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" dependencies: - "locked" @@ -200,7 +200,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" dependencies: - "locked" @@ -247,7 +247,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" dependencies: - "locked" @@ -304,7 +304,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" dependencies: - "locked" @@ -337,7 +337,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" dependencies: - "locked" @@ -385,7 +385,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" - "8.1" - "8.2" diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml index aa211ebe..84271082 100644 --- a/.github/workflows/renew.yaml +++ b/.github/workflows/renew.yaml @@ -15,7 +15,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" dependencies: - "locked" diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 38f93c62..2152cedf 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -15,7 +15,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" dependencies: - "locked" diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 63b71589..df0510b7 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -26,7 +26,7 @@ $license->save(); -$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php80($license->header()), [ +$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php81($license->header()), [ 'mb_str_functions' => false, 'no_unset_on_property' => false, 'static_lambda' => false, diff --git a/CHANGELOG.md b/CHANGELOG.md index 41ca1da2..49d8fc94 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 [`4.1.0...main`][4.1.0...main]. +### Changed + +- Dropped support for PHP 8.0 ([#917]), by [@localheinz] + ## [`4.1.0`][4.1.0] For a full diff see [`4.0.2...4.1.0`][4.0.2...4.1.0]. @@ -617,6 +621,7 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0]. [#868]: https://github.com/ergebnis/json-normalizer/pull/868 [#873]: https://github.com/ergebnis/json-normalizer/pull/873 [#889]: https://github.com/ergebnis/json-normalizer/pull/889 +[#917]: https://github.com/ergebnis/json-normalizer/pull/917 [@alexis-saransig-lullabot]: https://github.com/alexis-saransig-lullabot [@BackEndTea]: https://github.com/BackEndTea diff --git a/composer.json b/composer.json index db872a01..da535061 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "source": "https://github.com/ergebnis/json-normalizer" }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~8.1.0 || ~8.2.0", "ext-json": "*", "ergebnis/json": "^1.0.1", "ergebnis/json-pointer": "^3.2.0", @@ -60,7 +60,7 @@ "infection/extension-installer": true }, "platform": { - "php": "8.0.25" + "php": "8.1.20" }, "preferred-install": "dist", "sort-packages": true diff --git a/composer.lock b/composer.lock index eafae106..7604d17f 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": "bfc354e5be2f0d2209db8d4b0cccce6a", + "content-hash": "34958afd2269095090e57c5c6dbad263", "packages": [ { "name": "ergebnis/json", @@ -6174,12 +6174,12 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~8.1.0 || ~8.2.0", "ext-json": "*" }, "platform-dev": [], "platform-overrides": { - "php": "8.0.25" + "php": "8.1.20" }, "plugin-api-version": "2.3.0" } diff --git a/rector.php b/rector.php index d4a2196c..9de0de22 100644 --- a/rector.php +++ b/rector.php @@ -25,7 +25,7 @@ __DIR__ . '/test/', ]); - $rectorConfig->phpVersion(Core\ValueObject\PhpVersion::PHP_80); + $rectorConfig->phpVersion(Core\ValueObject\PhpVersion::PHP_81); $rectorConfig->sets([ PHPUnit\Set\PHPUnitSetList::PHPUNIT_90,