Skip to content

Commit

Permalink
Merge pull request #805 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 committed Jun 26, 2023
2 parents 98fbbd3 + cc66427 commit 1432102
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 @@ -76,7 +76,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down Expand Up @@ -146,7 +146,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 @@ -250,7 +250,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

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

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

dependencies:
- "locked"
Expand Down Expand Up @@ -409,7 +409,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 .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="composer-require-checker" version="^4.4.0" installed="4.4.0" location="./.phive/composer-require-checker" copy="false"/>
<phar name="composer-require-checker" version="^4.6.0" installed="4.6.0" location="./.phive/composer-require-checker" copy="false"/>
</phive>
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()));

$config->getFinder()
->exclude([
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 [`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].
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -48,7 +48,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_91,
Expand Down

0 comments on commit 1432102

Please sign in to comment.