Merge pull request #1279 from ergebnis/feature/php74

Enhancement: Add support for PHP 7.4
ergebnis · Jan 30, 2024 · 3eb078b · 3eb078b
2 parents 9c5a8fe + 7c03d8f
commit 3eb078b
Show file tree

Hide file tree

Showing 24 changed files with 378 additions and 353 deletions.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -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)"

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -80,7 +80,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -155,7 +155,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -231,7 +231,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -287,7 +287,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -339,7 +339,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -398,7 +398,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -448,7 +448,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -499,6 +499,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
+          - "7.4"
           - "8.0"
           - "8.1"
           - "8.2"

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"

diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"

diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
     steps:
       - name: "Checkout"

diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -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>
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -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,

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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]
 
@@ -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

diff --git a/composer-require-checker.json b/composer-require-checker.json
@@ -1,5 +1,6 @@
 {
   "symbol-whitelist": [
+    "array",
     "Composer\\Command\\BaseCommand",
     "Composer\\Composer",
     "Composer\\Console\\Application",
@@ -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"
   ]
 }
diff --git a/composer.json b/composer.json
@@ -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",
@@ -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",
@@ -66,7 +66,7 @@
       "abandoned": "report"
     },
     "platform": {
-      "php": "8.0.30"
+      "php": "7.4.33"
     },
     "preferred-install": "dist",
     "sort-packages": true