Merge pull request #877 from ergebnis/feature/php80

Enhancement: Add support for PHP 8.0
ergebnis · Dec 1, 2024 · 3dc5fde · 3dc5fde
2 parents bdcdb2d + 3a27c7d
commit 3dc5fde
Show file tree

Hide file tree

Showing 44 changed files with 1,094 additions and 797 deletions.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -14,11 +14,14 @@ branches:
         required_approving_review_count: 1
       required_status_checks:
         checks:
-          - context: "Code Coverage (8.1, locked)"
-          - context: "Coding Standards (8.1, locked)"
-          - context: "Dependency Analysis (8.1, locked)"
-          - context: "Security Analysis (8.1, locked)"
-          - context: "Static Code Analysis (8.1, locked)"
+          - context: "Code Coverage (8.0, locked)"
+          - context: "Coding Standards (8.0, locked)"
+          - context: "Dependency Analysis (8.0, locked)"
+          - context: "Security Analysis (8.0, locked)"
+          - context: "Static Code Analysis (8.0, locked)"
+          - context: "Tests (8.0, highest)"
+          - context: "Tests (8.0, locked)"
+          - context: "Tests (8.0, lowest)"
           - context: "Tests (8.1, highest)"
           - context: "Tests (8.1, locked)"
           - context: "Tests (8.1, lowest)"

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -80,7 +80,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -152,7 +152,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -208,7 +208,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -258,7 +258,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -309,6 +309,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
+          - "8.0"
           - "8.1"
           - "8.2"
           - "8.3"

diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         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.7.1" installed="4.7.1" 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.fixture.php b/.php-cs-fixer.fixture.php
@@ -13,7 +13,7 @@
 
 use Ergebnis\PhpCsFixer;
 
-$ruleSet = PhpCsFixer\Config\RuleSet\Php81::create()
+$ruleSet = PhpCsFixer\Config\RuleSet\Php80::create()
     ->withHeader('')
     ->withRules(PhpCsFixer\Config\Rules::fromArray([
         'constant_case' => false,

diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -26,7 +26,7 @@
 
 $license->save();
 
-$ruleSet = PhpCsFixer\Config\RuleSet\Php81::create()->withHeader($license->header());
+$ruleSet = PhpCsFixer\Config\RuleSet\Php80::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 [`2.4.0...main`][2.4.0...main].
 ### Added
 
 - Added rule error identifiers ([#875]), by [@localheinz]
+- Added support for PHP 8.4 ([#877]), by [@localheinz]
 
 ### Changed
 
@@ -532,6 +533,7 @@ For a full diff see [`362c7ea...0.1.0`][362c7ea...0.1.0].
 [#862]: https://github.com/ergebnis/phpstan-rules/pull/862
 [#872]: https://github.com/ergebnis/phpstan-rules/pull/872
 [#875]: https://github.com/ergebnis/phpstan-rules/pull/875
+[#877]: https://github.com/ergebnis/phpstan-rules/pull/877
 [#878]: https://github.com/ergebnis/phpstan-rules/pull/878
 
 [@enumag]: https://github.com/enumag

diff --git a/composer-require-checker.json b/composer-require-checker.json
@@ -1,5 +1,9 @@
 {
   "symbol-whitelist": [
+    "array",
+    "bool",
+    "false",
+    "null",
     "PhpParser\\Comment\\Doc",
     "PhpParser\\Node",
     "PhpParser\\Node\\Expr\\Closure",
@@ -27,6 +31,9 @@
     "PHPStan\\Rules\\Rule",
     "PHPStan\\Rules\\RuleError",
     "PHPStan\\Rules\\RuleErrorBuilder",
-    "PHPStan\\ShouldNotHappenException"
+    "PHPStan\\ShouldNotHappenException",
+    "self",
+    "string",
+    "true"
   ]
 }
diff --git a/composer.json b/composer.json
@@ -21,21 +21,23 @@
     "security": "https://github.com/ergebnis/phpstan-rules/blob/main/.github/SECURITY.md"
   },
   "require": {
-    "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+    "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
     "ext-mbstring": "*",
     "phpstan/phpstan": "^1.10.21"
   },
   "require-dev": {
-    "doctrine/orm": "^3.3.0",
+    "doctrine/orm": "^2.20.0 || ^3.3.0",
     "ergebnis/composer-normalize": "^2.44.0",
     "ergebnis/license": "^2.6.0",
     "ergebnis/php-cs-fixer-config": "^6.39.0",
     "ergebnis/phpunit-slow-test-detector": "^2.17.0",
-    "nette/di": "^3.2.3",
+    "nette/di": "^3.1.10",
+    "nikic/php-parser": "^4.19.4",
     "phpstan/phpstan-deprecation-rules": "^1.2.1",
     "phpstan/phpstan-strict-rules": "^1.6.1",
-    "phpunit/phpunit": "^10.5.26",
-    "psr/container": "^2.0.2"
+    "phpunit/phpunit": "^9.6.21",
+    "psr/container": "^2.0.2",
+    "symfony/process": "^5.4.47"
   },
   "autoload": {
     "psr-4": {
@@ -56,7 +58,7 @@
       "abandoned": "report"
     },
     "platform": {
-      "php": "8.1.26"
+      "php": "8.0.30"
     },
     "preferred-install": "dist",
     "sort-packages": true