Enhancement: Add support for PHP 8.0

Co-authored-by: Andreas Möller <am@localheinz.com> Co-authored-by: Michael Voříšek <mvorisek@mvorisek.cz>
ergebnis · Dec 1, 2023 · 62dd0b4 · 62dd0b4
1 parent f475e8b
commit 62dd0b4
Show file tree

Hide file tree

Showing 23 changed files with 711 additions and 554 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.1, 9.6.0, locked)"
-          - context: "Coding Standards (8.1, locked)"
+          - context: "Code Coverage (8.0, 9.6.0, locked)"
+          - context: "Coding Standards (8.0, locked)"
           - context: "Compile Phar (8.1, locked)"
-          - context: "Dependency Analysis (8.1, locked)"
-          - context: "Refactoring (8.1, locked)"
-          - context: "Security Analysis (8.1, locked)"
-          - context: "Static Code Analysis (8.1, 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: "Tests (8.0, 9.6.0, highest)"
+          - context: "Tests (8.0, 9.6.0, locked)"
+          - context: "Tests (8.0, 9.6.0, lowest)"
           - context: "Tests (8.1, 10.4.0, highest)"
           - context: "Tests (8.1, 10.4.0, locked)"
           - context: "Tests (8.1, 10.4.0, 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"
 
         phpunit-version:
           - "9.6.0"
@@ -86,7 +86,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -230,7 +230,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -286,7 +286,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -348,7 +348,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -398,7 +398,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.0"
 
         dependencies:
           - "locked"
@@ -464,6 +464,19 @@ jobs:
           - "locked"
           - "highest"
 
+        include:
+          - php-version: "8.0"
+            phpunit-version: "9.6.0"
+            dependencies: "lowest"
+
+          - php-version: "8.0"
+            phpunit-version: "9.6.0"
+            dependencies: "locked"
+
+          - php-version: "8.0"
+            phpunit-version: "9.6.0"
+            dependencies: "highest"
+
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v4.1.1"
@@ -494,6 +507,9 @@ jobs:
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-phpunit-${{ matrix.phpunit-version }}-${{ hashFiles('composer.lock') }}"
           restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-phpunit-${{ matrix.phpunit-version }}-"
 
+      - name: "Remove incompatible dependencies with composer"
+        run: "composer remove ergebnis/composer-normalize --ansi --dev --no-interaction --no-progress"
+
       - name: "Require phpunit/phpunit:^${{ matrix.phpunit-version }}"
         run: "composer require phpunit/phpunit:^${{ matrix.phpunit-version }} --ansi --no-interaction --no-progress --update-with-all-dependencies"
 

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

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,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
     <phar name="humbug/box" version="^4.4.0" installed="4.4.0" location="./.phive/box" copy="false"/>
-    <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="~4.4.0" installed="4.4.0" location="./.phive/composer-require-checker" copy="false"/>
     <phar name="phpunit" version="^10.4.1" installed="10.4.1" location="./.phive/phpunit" 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\Php81::create()
+$ruleSet = PhpCsFixer\Config\RuleSet\Php80::create()
     ->withHeader($license->header())
     ->withRules(PhpCsFixer\Config\Rules::fromArray([
         'mb_str_functions' => false,

diff --git a/composer-require-checker.json b/composer-require-checker.json
@@ -1,7 +1,16 @@
 {
   "symbol-whitelist": [
-    "PHPUnit\\Runner\\AfterLastTestHook",
-    "PHPUnit\\Runner\\AfterSuccessfulTestHook",
-    "PHPUnit\\Runner\\BeforeFirstTestHook"
+    "PHPUnit\\Event\\Code\\Test",
+    "PHPUnit\\Event\\Test\\Passed",
+    "PHPUnit\\Event\\Test\\PassedSubscriber",
+    "PHPUnit\\Event\\Test\\Prepared",
+    "PHPUnit\\Event\\Test\\PreparedSubscriber",
+    "PHPUnit\\Event\\TestRunner\\ExecutionFinished",
+    "PHPUnit\\Event\\TestRunner\\ExecutionFinishedSubscriber",
+    "PHPUnit\\Metadata\\Annotation\\Parser\\Registry",
+    "PHPUnit\\Runner\\Extension\\Extension",
+    "PHPUnit\\Runner\\Extension\\Facade",
+    "PHPUnit\\Runner\\Extension\\ParameterCollection",
+    "PHPUnit\\TextUI\\Configuration\\Configuration"
   ]
 }
diff --git a/composer.json b/composer.json
@@ -24,11 +24,11 @@
     "security": "https://github.com/ergebnis/phpunit-slow-test-detector/blob/main/.github/SECURITY.md"
   },
   "require": {
-    "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+    "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
     "phpunit/phpunit": "^9.6.0 || ^10.4.0"
   },
   "require-dev": {
-    "ergebnis/composer-normalize": "^2.39.0",
+    "ergebnis/composer-normalize": "^2.31.0",
     "ergebnis/data-provider": "^3.2.0",
     "ergebnis/license": "^2.4.0",
     "ergebnis/php-cs-fixer-config": "^6.13.0",