Enhancement: Add support for phpunit/phpunit:^8.5.0

ergebnis · Dec 3, 2023 · 966f5b9 · 966f5b9
1 parent 5415da3
commit 966f5b9
Show file tree

Hide file tree

Showing 19 changed files with 1,289 additions and 3,935 deletions.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -14,34 +14,49 @@ branches:
         required_approving_review_count: 1
       required_status_checks:
         checks:
-          - context: "Code Coverage (7.4, 9.6.0, locked)"
+          - context: "Code Coverage (7.4, 8.5.0, locked)"
           - context: "Coding Standards (7.4, locked)"
           - context: "Compile Phar (8.1, 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, 9.6.0, highest)"
-          - context: "Tests (7.4, 9.6.0, locked)"
-          - context: "Tests (7.4, 9.6.0, lowest)"
-          - 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 (7.4, 8.5.0, highest)"
+          - context: "Tests (7.4, 8.5.0, highest)"
+          - context: "Tests (7.4, 8.5.0, locked)"
+          - context: "Tests (7.4, 8.5.0, locked)"
+          - context: "Tests (7.4, 8.5.0, lowest)"
+          - context: "Tests (7.4, 8.5.0, lowest)"
+          - context: "Tests (8.0, 8.5.0, highest)"
+          - context: "Tests (8.0, 8.5.0, highest)"
+          - context: "Tests (8.0, 8.5.0, locked)"
+          - context: "Tests (8.0, 8.5.0, locked)"
+          - context: "Tests (8.0, 8.5.0, lowest)"
+          - context: "Tests (8.0, 8.5.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)"
+          - context: "Tests (8.1, 8.5.0, highest)"
+          - context: "Tests (8.1, 8.5.0, locked)"
+          - context: "Tests (8.1, 8.5.0, lowest)"
           - context: "Tests (8.1, 9.6.0, highest)"
           - context: "Tests (8.1, 9.6.0, locked)"
           - context: "Tests (8.1, 9.6.0, lowest)"
           - context: "Tests (8.2, 10.4.0, highest)"
           - context: "Tests (8.2, 10.4.0, locked)"
           - context: "Tests (8.2, 10.4.0, lowest)"
+          - context: "Tests (8.2, 8.5.0, highest)"
+          - context: "Tests (8.2, 8.5.0, locked)"
+          - context: "Tests (8.2, 8.5.0, lowest)"
           - context: "Tests (8.2, 9.6.0, highest)"
           - context: "Tests (8.2, 9.6.0, locked)"
           - context: "Tests (8.2, 9.6.0, lowest)"
           - context: "Tests (8.3, 10.4.0, highest)"
           - context: "Tests (8.3, 10.4.0, locked)"
           - context: "Tests (8.3, 10.4.0, lowest)"
+          - context: "Tests (8.3, 8.5.0, highest)"
+          - context: "Tests (8.3, 8.5.0, locked)"
+          - context: "Tests (8.3, 8.5.0, lowest)"
           - context: "Tests (8.3, 9.6.0, highest)"
           - context: "Tests (8.3, 9.6.0, locked)"
           - context: "Tests (8.3, 9.6.0, lowest)"

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -22,7 +22,7 @@ jobs:
           - "7.4"
 
         phpunit-version:
-          - "9.6.0"
+          - "8.5.0"
 
         dependencies:
           - "locked"
@@ -454,42 +454,56 @@ jobs:
     strategy:
       matrix:
         php-version:
+          - "7.4"
+          - "8.0"
           - "8.1"
           - "8.2"
           - "8.3"
 
         phpunit-version:
+          - "8.5.0"
           - "9.6.0"
-          - "10.4.0"
 
         dependencies:
           - "lowest"
           - "locked"
           - "highest"
 
         include:
-          - php-version: "7.4"
-            phpunit-version: "9.6.0"
+          - php-version: "8.1"
+            phpunit-version: "10.4.0"
             dependencies: "lowest"
 
-          - php-version: "7.4"
-            phpunit-version: "9.6.0"
+          - php-version: "8.1"
+            phpunit-version: "10.4.0"
             dependencies: "locked"
 
-          - php-version: "7.4"
-            phpunit-version: "9.6.0"
+          - php-version: "8.1"
+            phpunit-version: "10.4.0"
             dependencies: "highest"
 
-          - php-version: "8.0"
-            phpunit-version: "9.6.0"
+          - php-version: "8.2"
+            phpunit-version: "10.4.0"
             dependencies: "lowest"
 
-          - php-version: "8.0"
-            phpunit-version: "9.6.0"
+          - php-version: "8.2"
+            phpunit-version: "10.4.0"
             dependencies: "locked"
 
-          - php-version: "8.0"
-            phpunit-version: "9.6.0"
+          - php-version: "8.2"
+            phpunit-version: "10.4.0"
+            dependencies: "highest"
+
+          - php-version: "8.3"
+            phpunit-version: "10.4.0"
+            dependencies: "lowest"
+
+          - php-version: "8.3"
+            phpunit-version: "10.4.0"
+            dependencies: "locked"
+
+          - php-version: "8.3"
+            phpunit-version: "10.4.0"
             dependencies: "highest"
 
     steps:
@@ -537,6 +551,10 @@ jobs:
         if: "matrix.phpunit-version == '9.6.0'"
         run: "vendor/bin/phpunit --colors=always --configuration=test/Unit/phpunit.xml"
 
+      - name: "Run end-to-end tests with phpunit/phpunit:8.5.0"
+        if: "matrix.phpunit-version == '8.5.0'"
+        run: "vendor/bin/phpunit --colors=always --configuration=test/EndToEnd/Version8/phpunit.xml"
+
       - name: "Run end-to-end tests with phpunit/phpunit:9.6.0"
         if: "matrix.phpunit-version == '9.6.0'"
         run: "vendor/bin/phpunit --colors=always --configuration=test/EndToEnd/Version9/phpunit.xml"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 For a full diff see [`2.5.0...main`][2.5.0...main].
 
+### Added
+
+- Added support for `phpunit/phpunit:^8.5.0` ([#394]), by [@localheinz]
+
 ## [`2.5.0`][2.5.0]
 
 For a full diff see [`2.4.0...2.5.0`][2.4.0...2.5.0].

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ it: refactoring coding-standards security-analysis static-code-analysis tests ##
 .PHONY: code-coverage
 code-coverage: ## Collects coverage from running unit tests with phpunit/phpunit
 	mkdir -p .build/phpunit/
-	composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^9.6.0 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/Unit/phpunit.xml --coverage-text; git checkout HEAD -- composer.json composer.lock
+	composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^8.5.0 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/Unit/phpunit.xml --coverage-text; git checkout HEAD -- composer.json composer.lock
 
 .PHONY: coding-standards
 coding-standards: vendor ## Lints YAML files with yamllint, normalizes composer.json with ergebnis/composer-normalize, and fixes code style issues with friendsofphp/php-cs-fixer
@@ -60,7 +60,8 @@ static-code-analysis-baseline: vendor ## Generates a baseline for static code an
 .PHONY: tests
 tests: ## Runs unit and end-to-end tests with phpunit/phpunit
 	mkdir -p .build/phpunit
-	composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^9.6.0 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/Unit/phpunit.xml; git checkout HEAD -- composer.json composer.lock
+	composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^8.5.0 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/Unit/phpunit.xml; git checkout HEAD -- composer.json composer.lock
+	composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^8.5.0 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/EndToEnd/Version8/phpunit.xml; git checkout HEAD -- composer.json composer.lock
 	composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^9.6.0 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/EndToEnd/Version9/phpunit.xml; git checkout HEAD -- composer.json composer.lock
 	composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --dev --no-interaction --no-progress; composer require phpunit/phpunit:^10.4.0 --no-interaction --quiet --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/EndToEnd/Version10/phpunit.xml; git checkout HEAD -- composer.json composer.lock
 

diff --git a/composer.json b/composer.json
@@ -25,17 +25,14 @@
   },
   "require": {
     "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
-    "phpunit/phpunit": "^9.6.0 || ^10.4.0"
+    "phpunit/phpunit": "^8.5.0 || ^9.6.0 || ^10.4.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.28.3",
     "ergebnis/data-provider": "^3.2.0",
     "ergebnis/license": "^2.4.0",
-    "ergebnis/php-cs-fixer-config": "^6.13.0",
     "fakerphp/faker": "^1.23.0",
-    "psalm/plugin-phpunit": "~0.18.4",
-    "rector/rector": "~0.18.11",
-    "vimeo/psalm": "^5.16.0"
+    "rector/rector": "~0.18.11"
   },
   "autoload": {
     "psr-4": {