Skip to content

Commit

Permalink
Merge pull request #567 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 26, 2023
2 parents 550025b + 7b163d2 commit 68ec411
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 26 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 @@ -146,7 +146,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

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

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

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

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

dependencies:
- "locked"
Expand Down Expand Up @@ -388,7 +388,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 .php-cs-fixer.fixture.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

use Ergebnis\PhpCsFixer;

$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php80(''), [
$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php81(''), [
'constant_case' => false,
'declare_strict_types' => false,
'error_suppression' => false,
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()));

$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 [`2.0.0...main`][2.0.0...main].

### Changed

- Dropped support for PHP 8.0 ([#567]), by [@localheinz]

## [`2.0.0`][2.0.0]

For a full diff see [`1.0.0...2.0.0`][1.0.0...2.0.0].
Expand Down Expand Up @@ -478,6 +482,7 @@ For a full diff see [`362c7ea...0.1.0`][362c7ea...0.1.0].
[#541]: https://github.com/ergebnis/phpstan-rules/pull/541
[#542]: https://github.com/ergebnis/phpstan-rules/pull/542
[#543]: https://github.com/ergebnis/phpstan-rules/pull/543
[#567]: https://github.com/ergebnis/phpstan-rules/pull/567

[@enumag]: https://github.com/enumag
[@ergebnis]: https://github.com/ergebnis
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"source": "https://github.com/ergebnis/phpstan-rules"
},
"require": {
"php": "~8.0.0 || ~8.1.0 || ~8.2.0",
"php": "~8.1.0 || ~8.2.0",
"ext-mbstring": "*",
"nikic/php-parser": "^4.2.3",
"phpstan/phpstan": "^1.7.15"
Expand Down Expand Up @@ -56,7 +56,7 @@
"infection/extension-installer": true
},
"platform": {
"php": "8.0.27"
"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.

0 comments on commit 68ec411

Please sign in to comment.