Merge pull request #340 from ergebnis/feature/php74

Enhancement: Add support for PHP 7.4
ergebnis · Jan 29, 2024 · 4bd2028 · 4bd2028
2 parents 21f26af + 80be027
commit 4bd2028
Show file tree

Hide file tree

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

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"
@@ -211,7 +211,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -263,7 +263,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -322,7 +322,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -372,7 +372,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -423,6 +423,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
+          - "7.4"
           - "8.0"
           - "8.1"
           - "8.2"

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/.phive/phars.xml b/.phive/phars.xml
@@ -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>
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([
         'strict_comparison' => false,

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ For a full diff see [`3.3.0...main`][3.3.0...main].
 ### Changed
 
 - Added support for PHP 8.0 ([#339]), by [@localheinz]
+- Added support for PHP 7.4 ([#340]), by [@localheinz]
 
 ## [`3.3.0`][3.3.0]
 
@@ -128,5 +129,6 @@ For a full diff see [`a5ba52c...1.0.0`][a5ba52c...1.0.0].
 [#209]: https://github.com/ergebnis/json-pointer/pull/209
 [#271]: https://github.com/ergebnis/json-pointer/pull/271
 [#339]: https://github.com/ergebnis/json-pointer/pull/339
+[#340]: https://github.com/ergebnis/json-pointer/pull/340
 
 [@localheinz]: https://github.com/localheinz
diff --git a/composer-require-checker.json b/composer-require-checker.json
@@ -1,3 +1,11 @@
 {
-  "symbol-whitelist": []
+  "symbol-whitelist": [
+    "array",
+    "bool",
+    "false",
+    "int",
+    "self",
+    "string",
+    "true"
+  ]
 }
diff --git a/composer.json b/composer.json
@@ -22,15 +22,15 @@
     "security": "https://github.com/ergebnis/json-pointer/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"
   },
   "require-dev": {
     "ergebnis/data-provider": "^3.2.0",
     "ergebnis/license": "^2.4.0",
     "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",
@@ -55,7 +55,7 @@
       "abandoned": "report"
     },
     "platform": {
-      "php": "8.0.30"
+      "php": "7.4.33"
     },
     "preferred-install": "dist",
     "sort-packages": true