Skip to content

Commit

Permalink
Merge pull request #753 from ergebnis/feature/php74
Browse files Browse the repository at this point in the history
Enhancement: Add support for PHP 7.4
  • Loading branch information
localheinz authored Jan 29, 2024
2 parents c269464 + d194ebc commit 1662466
Show file tree
Hide file tree
Showing 12 changed files with 434 additions and 330 deletions.
17 changes: 10 additions & 7 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@ 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: "Code Coverage (7.4, locked)"
- context: "Coding Standards (7.4, locked)"
- context: "Dependency Analysis (7.4, locked)"
- context: "Mutation Tests (7.4, locked)"
- context: "Refactoring (7.4, locked)"
- context: "Security Analysis (7.4, locked)"
- context: "Static Code Analysis (7.4, locked)"
- context: "Tests (7.4, highest)"
- context: "Tests (7.4, locked)"
- context: "Tests (7.4, lowest)"
- context: "Tests (8.0, highest)"
- context: "Tests (8.0, locked)"
- context: "Tests (8.0, lowest)"
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "7.4"

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

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

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

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

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

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

dependencies:
- "locked"
Expand Down Expand Up @@ -423,6 +423,7 @@ jobs:
fail-fast: false
matrix:
php-version:
- "7.4"
- "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 @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "7.4"

dependencies:
- "locked"
Expand Down
4 changes: 2 additions & 2 deletions .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="composer-normalize" version="^2.31.0" installed="2.31.0" location="./.phive/composer-normalize" copy="false"/>
<phar name="composer-require-checker" version="^4.4.0" installed="4.4.0" location="./.phive/composer-require-checker" copy="false"/>
<phar name="composer-normalize" version="^2.28.3" installed="2.28.3" location="./.phive/composer-normalize" copy="false"/>
<phar name="composer-require-checker" version="^3.8.0" installed="3.8.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();

$ruleSet = PhpCsFixer\Config\RuleSet\Php80::create()
$ruleSet = PhpCsFixer\Config\RuleSet\Php74::create()
->withHeader($license->header())
->withRules(PhpCsFixer\Config\Rules::fromArray([
'escape_implicit_backslashes' => false,
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ For a full diff see [`3.4.0...main`][3.4.0...main].
### Changed

- Added support for PHP 8.0 ([#752]), by [@localheinz]
- Added support for PHP 7.4 ([#753]), by [@localheinz]

## [`3.4.0`][3.4.0]

Expand Down Expand Up @@ -182,6 +183,7 @@ For a full diff see [`8849fc6...1.0.0`][8849fc6...1.0.0].
[#625]: https://github.com/ergebnis/json-printer/pull/625
[#682]: https://github.com/ergebnis/json-printer/pull/682
[#752]: https://github.com/ergebnis/json-printer/pull/752
[#753]: https://github.com/ergebnis/json-printer/pull/753

[@ergebnis]: https://github.com/ergebnis
[@localheinz]: https://github.com/localheinz
6 changes: 5 additions & 1 deletion composer-require-checker.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
{
"symbol-whitelist": []
"symbol-whitelist": [
"false",
"string",
"true"
]
}
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"security": "https://github.com/ergebnis/json-printer/blob/main/.github/SECURITY.md"
},
"require": {
"php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"ext-json": "*",
"ext-mbstring": "*"
},
Expand All @@ -32,7 +32,7 @@
"ergebnis/php-cs-fixer-config": "^6.20.0",
"ergebnis/phpunit-slow-test-detector": "^2.9.0",
"fakerphp/faker": "^1.23.1",
"infection/infection": "~0.26.19",
"infection/infection": "~0.26.6",
"phpunit/phpunit": "^9.6.16",
"psalm/plugin-phpunit": "~0.18.4",
"rector/rector": "~0.19.2",
Expand All @@ -57,7 +57,7 @@
"abandoned": "report"
},
"platform": {
"php": "8.0.30"
"php": "7.4.33"
},
"preferred-install": "dist",
"sort-packages": true
Expand Down
Loading

0 comments on commit 1662466

Please sign in to comment.