Skip to content

Commit

Permalink
Enhancement: Add support for PHP 7.4
Browse files Browse the repository at this point in the history
  • Loading branch information
localheinz committed Jan 30, 2024
1 parent 9c5a8fe commit 7619ca8
Show file tree
Hide file tree
Showing 12 changed files with 304 additions and 321 deletions.
19 changes: 11 additions & 8 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,17 @@ branches:
required_approving_review_count: 1
required_status_checks:
checks:
- context: "Code Coverage (8.0, locked)"
- context: "Coding Standards (8.0, locked)"
- context: "Compile Phar (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: "Compile Phar (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
17 changes: 9 additions & 8 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 @@ -231,7 +231,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "7.4"

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

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

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

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

dependencies:
- "locked"
Expand Down Expand Up @@ -499,6 +499,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/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "7.4"

dependencies:
- "locked"
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
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"
- "7.4"

steps:
- name: "Checkout"
Expand Down
4 changes: 2 additions & 2 deletions .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?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"/>
<phar name="humbug/box" version="^3.16.0" installed="3.16.0" location="./.phive/box" 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([
'no_useless_concat_operator' => false,
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ For a full diff see [`2.41.1...main`][2.41.1...main].
- Required `ergebnis/json-printer:^3.5.0` ([#1275]), by [@dependabot]
- Required `ergebnis/json-normalizer:^4.5.0` ([#1277]), by [@localheinz]
- Added support for PHP 8.0 ([#1278]), by [@localheinz]
- Added support for PHP 7.4 ([#1279]), by [@localheinz]

## [`2.41.1`][2.41.1]

Expand Down Expand Up @@ -1213,6 +1214,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#1275]: https://github.com/ergebnis/composer-normalize/pull/1275
[#1277]: https://github.com/ergebnis/composer-normalize/pull/1277
[#1278]: https://github.com/ergebnis/composer-normalize/pull/1278
[#1279]: https://github.com/ergebnis/composer-normalize/pull/1279

[@core23]: https://github.com/core23
[@dependabot]: https://github.com/dependabot
Expand Down
11 changes: 10 additions & 1 deletion composer-require-checker.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"symbol-whitelist": [
"array",
"Composer\\Command\\BaseCommand",
"Composer\\Composer",
"Composer\\Console\\Application",
Expand All @@ -11,11 +12,19 @@
"Composer\\Plugin\\Capability\\CommandProvider",
"Composer\\Plugin\\Capable",
"Composer\\Plugin\\PluginInterface",
"false",
"int",
"null",
"parent",
"self",
"string",
"Symfony\\Component\\Console\\Application",
"Symfony\\Component\\Console\\Input\\ArrayInput",
"Symfony\\Component\\Console\\Input\\InputArgument",
"Symfony\\Component\\Console\\Input\\InputInterface",
"Symfony\\Component\\Console\\Input\\InputOption",
"Symfony\\Component\\Console\\Output\\OutputInterface"
"Symfony\\Component\\Console\\Output\\OutputInterface",
"true",
"void"
]
}
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"security": "https://github.com/ergebnis/composer-normalize/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": "*",
"composer-plugin-api": "^2.0.0",
"ergebnis/json": "^1.2.0",
Expand All @@ -38,11 +38,11 @@
"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",
"symfony/filesystem": "^6.0.19",
"symfony/filesystem": "^5.4.25",
"vimeo/psalm": "^5.20.0"
},
"minimum-stability": "dev",
Expand All @@ -66,7 +66,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 7619ca8

Please sign in to comment.