From cc66427a6baa2d34d5335974fd44019b8fe7ca3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 26 Jun 2023 13:41:26 +0200 Subject: [PATCH] Fix: Drop support for PHP 8.0 --- .github/settings.yml | 17 +++++++---------- .github/workflows/integrate.yaml | 15 +++++++-------- .github/workflows/renew.yaml | 2 +- .phive/phars.xml | 2 +- .php-cs-fixer.php | 2 +- CHANGELOG.md | 5 +++++ composer.json | 4 ++-- composer.lock | 6 +++--- rector.php | 2 +- 9 files changed, 28 insertions(+), 27 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index 98fa8125..661c3868 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 4f830f73..eb99ab3a 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" @@ -76,7 +76,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" dependencies: - "locked" @@ -146,7 +146,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" @@ -250,7 +250,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" dependencies: - "locked" @@ -310,7 +310,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" dependencies: - "locked" @@ -358,7 +358,7 @@ jobs: strategy: matrix: php-version: - - "8.0" + - "8.1" dependencies: - "locked" @@ -409,7 +409,6 @@ jobs: strategy: matrix: php-version: - - "8.0" - "8.1" - "8.2" diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml index da34c8a1..b4f06703 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/.phive/phars.xml b/.phive/phars.xml index a30ffc0e..b195d717 100644 --- a/.phive/phars.xml +++ b/.phive/phars.xml @@ -1,4 +1,4 @@ - + diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index bf248128..6132ac94 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())); $config->getFinder() ->exclude([ diff --git a/CHANGELOG.md b/CHANGELOG.md index f685af5c..148adaf9 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 [`5.9.2...main`][5.9.2...main]. +## Changed + +- Dropped support for PHP 8.0 ([#805]), by [@localheinz] + ## [`5.9.2`][5.9.2] For a full diff see [`5.9.1...5.9.2`][5.9.1...5.9.2]. @@ -1023,6 +1027,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#802]: https://github.com/ergebnis/php-cs-fixer-config/pull/802 [#803]: https://github.com/ergebnis/php-cs-fixer-config/pull/803 [#804]: https://github.com/ergebnis/php-cs-fixer-config/pull/804 +[#805]: https://github.com/ergebnis/php-cs-fixer-config/pull/805 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler diff --git a/composer.json b/composer.json index 6dc00898..4afb7312 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "source": "https://github.com/ergebnis/php-cs-fixer-config" }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~8.1.0 || ~8.2.0", "ext-filter": "*", "friendsofphp/php-cs-fixer": "~3.19.2" }, @@ -48,7 +48,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 44eb05be..fb49ffca 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": "a0f9a892e23d43c4ab975612a6dbf333", + "content-hash": "143b547f3724d4c3c5151f829ecdd8cf", "packages": [ { "name": "composer/pcre", @@ -6255,12 +6255,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-filter": "*" }, "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 cdf411e1..16edd679 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_91,