Skip to content

Commit

Permalink
Merge pull request #917 from ergebnis/fix/php80
Browse files Browse the repository at this point in the history
Fix: Drop support for PHP 8.0
  • Loading branch information
localheinz authored Jun 28, 2023
2 parents 1bbe80f + f312eb5 commit 8b592b1
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 27 deletions.
17 changes: 7 additions & 10 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down Expand Up @@ -304,7 +304,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down Expand Up @@ -337,7 +337,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down Expand Up @@ -385,7 +385,6 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"
- "8.2"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renew.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down
2 changes: 1 addition & 1 deletion .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -60,7 +60,7 @@
"infection/extension-installer": true
},
"platform": {
"php": "8.0.25"
"php": "8.1.20"
},
"preferred-install": "dist",
"sort-packages": true
Expand Down
6 changes: 3 additions & 3 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 8b592b1

Please sign in to comment.