Merge pull request #952 from ergebnis/feature/php74

Enhancement: Add support for PHP 7.4
ergebnis · Nov 30, 2023 · af2a04f · af2a04f
2 parents 1bef208 + 4e29d24
commit af2a04f
Show file tree

Hide file tree

Showing 18 changed files with 640 additions and 598 deletions.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -14,12 +14,15 @@ 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: "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: "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"
@@ -152,7 +152,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -208,7 +208,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -270,7 +270,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -320,7 +320,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "7.4"
 
         dependencies:
           - "locked"
@@ -373,6 +373,7 @@ jobs:
     strategy:
       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,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-    <phar name="composer-require-checker" version="~4.4.0" installed="4.4.0" location="./.phive/composer-require-checker" 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()->withHeader($license->header());
+$ruleSet = PhpCsFixer\Config\RuleSet\Php74::create()->withHeader($license->header());
 
 $config = PhpCsFixer\Config\Factory::fromRuleSet($ruleSet);
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ For a full diff see [`6.12.0...main`][6.12.0...main].
 ### Added
 
 - Added support for PHP 8.0 ([#951]), by [@localheinz]
+- Added support for PHP 7.4 ([#952]), by [@localheinz]
 
 ## [`6.12.0`][6.12.0]
 
@@ -1384,6 +1385,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [#930]: https://github.com/ergebnis/php-cs-fixer-config/pull/930
 [#942]: https://github.com/ergebnis/php-cs-fixer-config/pull/942
 [#951]: https://github.com/ergebnis/php-cs-fixer-config/pull/951
+[#952]: https://github.com/ergebnis/php-cs-fixer-config/pull/952
 
 [@dependabot]: https://github.com/apps/dependabot
 [@linuxjuggler]: https://github.com/linuxjuggler

diff --git a/composer-require-checker.json b/composer-require-checker.json
@@ -1,3 +1,12 @@
 {
-  "symbol-whitelist": []
+  "symbol-whitelist": [
+    "array",
+    "bool",
+    "false",
+    "int",
+    "null",
+    "self",
+    "string",
+    "true"
+  ]
 }
diff --git a/composer.json b/composer.json
@@ -17,24 +17,24 @@
     "security": "https://github.com/ergebnis/php-cs-fixer-config/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-filter": "*",
     "erickskrauch/php-cs-fixer-custom-fixers": "~1.2.1",
     "friendsofphp/php-cs-fixer": "~3.40.0",
     "kubawerlos/php-cs-fixer-custom-fixers": "~3.17.0"
   },
   "require-dev": {
-    "ergebnis/composer-normalize": "^2.31.0",
-    "ergebnis/data-provider": "^1.3.0",
-    "ergebnis/license": "^2.1.0",
+    "ergebnis/composer-normalize": "^2.28.3",
+    "ergebnis/data-provider": "^1.2.0",
+    "ergebnis/license": "^2.0.0",
     "ergebnis/rector-rules": "~0.3.0",
     "fakerphp/faker": "^1.23.0",
-    "infection/infection": "~0.26.19",
+    "infection/infection": "~0.26.6",
     "phpunit/phpunit": "^9.6.13",
     "psalm/plugin-phpunit": "~0.18.4",
     "rector/rector": "~0.18.11",
-    "symfony/filesystem": "^6.0.0",
-    "symfony/process": "^6.0.0",
+    "symfony/filesystem": "^5.0.0 || ^6.0.0",
+    "symfony/process": "^5.0.0 || ^6.0.0",
     "vimeo/psalm": "^5.16.0"
   },
   "autoload": {