Merge pull request #651 from ergebnis/feature/phpunit-12

Enhancement: Add support for `phpunit/phpunit:^12.0.0`

Author: localheinz

.github/settings.yml

@@ -83,6 +83,10 @@ branches:
           - context: "Tests (11.0.0, 8.3, lowest)"
           - context: "Tests (11.3.6, 8.4, highest)"
           - context: "Tests (11.3.6, 8.4, lowest)"
+          - context: "Tests (12.0.0, 8.3, highest)"
+          - context: "Tests (12.0.0, 8.3, lowest)"
+          - context: "Tests (12.0.0, 8.4, highest)"
+          - context: "Tests (12.0.0, 8.4, lowest)"
         strict: false
       restrictions:
 

.github/workflows/integrate.yaml

@@ -679,6 +679,22 @@ jobs:
             php-version: "8.4"
             dependencies: "highest"
 
+          - phpunit-version: "12.0.0"
+            php-version: "8.3"
+            dependencies: "lowest"
+
+          - phpunit-version: "12.0.0"
+            php-version: "8.3"
+            dependencies: "highest"
+
+          - phpunit-version: "12.0.0"
+            php-version: "8.4"
+            dependencies: "lowest"
+
+          - phpunit-version: "12.0.0"
+            php-version: "8.4"
+            dependencies: "highest"
+
     env:
       PHPUNIT_SLOW_TEST_DETECTOR_PHAR: ".build/phar/phpunit-slow-test-detector.phar"
 
@@ -772,6 +788,10 @@ jobs:
         if: "matrix.phpunit-version == '11.0.0'"
         run: "vendor/bin/phpunit --colors=always --configuration=test/EndToEnd/Version11/phpunit.xml"
 
+      - name: "Run end-to-end tests with phpunit/phpunit:12.0.0"
+        if: "matrix.phpunit-version == '12.0.0'"
+        run: "vendor/bin/phpunit --colors=always --configuration=test/EndToEnd/Version12/phpunit.xml"
+
       - name: "Download Phar"
         uses: "actions/[email protected]"
         with:
@@ -809,3 +829,7 @@ jobs:
       - name: "Run phar tests with phpunit/phpunit:11.0.0"
         if: "matrix.phpunit-version == '11.0.0'"
         run: "vendor/bin/phpunit --colors=always --configuration=test/Phar/Version11/phpunit.xml"
+
+      - name: "Run phar tests with phpunit/phpunit:12.0.0"
+        if: "matrix.phpunit-version == '12.0.0'"
+        run: "vendor/bin/phpunit --colors=always --configuration=test/Phar/Version12/phpunit.xml"

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.17.0...main`][2.17.0...main].
 
+### Added
+
+- Added support for `phpunit/phpunit:^12.0.0` ([#651]), by [@localheinz]
+
 ## [`2.17.0`][2.17.0]
 
 For a full diff see [`2.16.1...2.17.0`][2.16.1...2.17.0].
@@ -380,6 +384,7 @@ For a full diff see [`7afa59c...1.0.0`][7afa59c...1.0.0].
 [#598]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/598
 [#604]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/604
 [#635]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/635
+[#651]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/651
 
 [@dantleech]: https://github.com/dantleech
 [@HypeMC]: https://github.com/HypeMC

README.md

@@ -21,6 +21,7 @@ The extension is compatible with the following versions of `phpunit/phpunit`:
 - [`phpunit/phpunit:^9.0.0`](https://github.com/sebastianbergmann/phpunit/tree/9.0.0)
 - [`phpunit/phpunit:^10.0.0`](https://github.com/sebastianbergmann/phpunit/tree/10.0.0)
 - [`phpunit/phpunit:^11.0.0`](https://github.com/sebastianbergmann/phpunit/tree/11.0.0)
+- [`phpunit/phpunit:^12.0.0`](https://github.com/sebastianbergmann/phpunit/tree/12.0.0)
 
 ## Installation
 
@@ -104,11 +105,13 @@ To bootstrap the extension as a `composer` package when using
 
 - `phpunit/phpunit:^10.0.0`
 - `phpunit/phpunit:^11.0.0`
+- `phpunit/phpunit:^12.0.0`
 
 adjust your `phpunit.xml` configuration file and configure the
 
 - [`extensions` element](https://docs.phpunit.de/en/10.5/configuration.html#the-extensions-element) on [`phpunit/phpunit:^10.0.0`](https://docs.phpunit.de/en/10.5/)
 - [`extensions` element](https://docs.phpunit.de/en/11.0/configuration.html#the-extensions-element) on [`phpunit/phpunit:^11.0.0`](https://docs.phpunit.de/en/11.0/)
+- [`extensions` element](https://docs.phpunit.de/en/12.0/configuration.html#the-extensions-element) on [`phpunit/phpunit:^12.0.0`](https://docs.phpunit.de/en/12.0/)
 
 ```diff
  <phpunit
@@ -163,11 +166,13 @@ To bootstrap the extension as a PHAR when using
 
 - `phpunit/phpunit:^10.0.0`
 - `phpunit/phpunit:^11.0.0`
+- `phpunit/phpunit:^12.0.0`
 
 adjust your `phpunit.xml` configuration file and configure the
 
 - [`extensionsDirectory` attribute](https://docs.phpunit.de/en/10.5/configuration.html#the-extensionsdirectory-attribute) and the [`extensions` element](https://docs.phpunit.de/en/10.5/configuration.html#the-extensions-element) on [`phpunit/phpunit:^10.0.0`](https://docs.phpunit.de/en/10.5/)
 - [`extensionsDirectory` attribute](https://docs.phpunit.de/en/11.0/configuration.html#the-extensionsdirectory-attribute) and the [`extensions` element](https://docs.phpunit.de/en/11.0/configuration.html#the-extensions-element) on [`phpunit/phpunit:^11.0.0`](https://docs.phpunit.de/en/11.0/)
+- [`extensionsDirectory` attribute](https://docs.phpunit.de/en/12.0/configuration.html#the-extensionsdirectory-attribute) and the [`extensions` element](https://docs.phpunit.de/en/12.0/configuration.html#the-extensions-element) on [`phpunit/phpunit:^12.0.0`](https://docs.phpunit.de/en/12.0/)
 
 ```diff
  <phpunit
@@ -284,11 +289,13 @@ To configure the extension when using
 
 - `phpunit/phpunit:^10.0.0`
 - `phpunit/phpunit:^11.0.0`
+- `phpunit/phpunit:^12.0.0`
 
 adjust your `phpunit.xml` configuration file and configure one or more
 
 - [`parameter` elements](https://docs.phpunit.de/en/10.5/configuration.html#the-parameter-element) on [`phpunit/phpunit:^10.0.0`](https://docs.phpunit.de/en/10.5/)
 - [`parameter` elements](https://docs.phpunit.de/en/11.0/configuration.html#the-parameter-element) on [`phpunit/phpunit:^11.0.0`](https://docs.phpunit.de/en/11.0/)
+- [`parameter` elements](https://docs.phpunit.de/en/12.0/configuration.html#the-parameter-element) on [`phpunit/phpunit:^12.0.0`](https://docs.phpunit.de/en/12.0/)
 
 The following example configures the maximum count of slow tests to three, and the maximum duration for all tests to 250 milliseconds:
 
@@ -320,6 +327,7 @@ You can configure the maximum duration for a single test case with
 - an `Attribute\MaximumDuration` attribute when using
   - `phpunit/phpunit:^10.0.0`
   - `phpunit/phpunit:^11.0.0`
+  - `phpunit/phpunit:^12.0.0`
 - a `@maximumDuration` annotation in the DocBlock when using
   - `phpunit/phpunit:^6.5.0`
   - `phpunit/phpunit:^7.5.0`
@@ -450,6 +458,7 @@ When using
 
 - `phpunit/phpunit:^10.0.0`
 - `phpunit/phpunit:^11.0.0`
+- `phpunit/phpunit:^12.0.0`
 
 the extension uses the new event system of `phpunit/phpunit`.
 

composer.json

@@ -25,7 +25,7 @@
   },
   "require": {
     "php": "~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
-    "phpunit/phpunit": "^6.5.0 || ^7.5.0 || ^8.5.19 || ^9.0.0 || ^10.0.0 || ^11.0.0"
+    "phpunit/phpunit": "^6.5.0 || ^7.5.0 || ^8.5.19 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.45.0",

composer.lock

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <phar xmlns="https://phar.io/xml/manifest/1.0">
     <contains name="ergebnis/phpunit-slow-test-detector" version="2.17.0" type="extension">
-        <extension for="phpunit/phpunit" compatible="^7.5 || 8.5 || ^9.0 || ^10.0 || ^11.0"/>
+        <extension for="phpunit/phpunit" compatible="^7.5 || 8.5 || ^9.0 || ^10.0 || ^11.0 || ^12.0"/>
     </contains>
 
     <copyright>

manifest.xml

@@ -380,6 +380,21 @@ parameters:
 			count: 1
 			path: test/Unit/Version/MajorTest.php
 
+		-
+			message: "#^Method Ergebnis\\\\PHPUnit\\\\SlowTestDetector\\\\Test\\\\Unit\\\\Version\\\\MajorTest\\:\\:testIsLessThanReturnsFalseWhenValueIsGreater\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: test/Unit/Version/MajorTest.php
+
+		-
+			message: "#^Method Ergebnis\\\\PHPUnit\\\\SlowTestDetector\\\\Test\\\\Unit\\\\Version\\\\MajorTest\\:\\:testIsLessThanReturnsFalseWhenValueIsSame\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: test/Unit/Version/MajorTest.php
+
+		-
+			message: "#^Method Ergebnis\\\\PHPUnit\\\\SlowTestDetector\\\\Test\\\\Unit\\\\Version\\\\MajorTest\\:\\:testIsLessThanReturnsTrueWhenValueIsLess\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: test/Unit/Version/MajorTest.php
+
 		-
 			message: "#^Method Ergebnis\\\\PHPUnit\\\\SlowTestDetector\\\\Test\\\\Unit\\\\Version\\\\MajorTest\\:\\:testIsOneOfReturnsFalseWhenAllValuesAreDifferent\\(\\) has no return type specified\\.$#"
 			count: 1

phpstan-baseline.neon

@@ -13,6 +13,7 @@
 
 namespace Ergebnis\PHPUnit\SlowTestDetector;
 
+use Ergebnis\PHPUnit;
 use PHPUnit\Framework;
 use PHPUnit\Runner;
 use PHPUnit\TextUI;
@@ -406,7 +407,7 @@ private function resolveMaximumDuration(string $test): Duration
     return;
 }
 
-if ($phpUnitVersionSeries->major()->isOneOf(Version\Major::fromInt(10), Version\Major::fromInt(11))) {
+if ($phpUnitVersionSeries->major()->isOneOf(Version\Major::fromInt(10), Version\Major::fromInt(11), Version\Major::fromInt(12))) {
     /**
      * @internal
      */
@@ -446,7 +447,8 @@ public function bootstrap(
                 new Subscriber\Test\FinishedSubscriber(
                     $maximumDuration,
                     $timeKeeper,
-                    $collector
+                    $collector,
+                    Version\Series::fromString(Runner\Version::series())
                 ),
                 new Subscriber\TestRunner\ExecutionFinishedSubscriber(
                     $collector,

src/Extension.php

@@ -22,6 +22,7 @@
 use Ergebnis\PHPUnit\SlowTestDetector\TestIdentifier;
 use Ergebnis\PHPUnit\SlowTestDetector\Time;
 use Ergebnis\PHPUnit\SlowTestDetector\TimeKeeper;
+use Ergebnis\PHPUnit\SlowTestDetector\Version;
 use PHPUnit\Event;
 use PHPUnit\Framework;
 use PHPUnit\Metadata;
@@ -46,14 +47,21 @@ final class FinishedSubscriber implements Event\Test\FinishedSubscriber
      */
     private $collector;
 
+    /**
+     * @var Version\Series
+     */
+    private $versionSeries;
+
     public function __construct(
         Duration $maximumDuration,
         TimeKeeper $timeKeeper,
-        Collector\Collector $collector
+        Collector\Collector $collector,
+        Version\Series $versionSeries
     ) {
         $this->maximumDuration = $maximumDuration;
         $this->timeKeeper = $timeKeeper;
         $this->collector = $collector;
+        $this->versionSeries = $versionSeries;
     }
 
     /**
@@ -152,10 +160,12 @@ private function resolveMaximumDuration(Event\Code\Test $test): Duration
             return $maximumDurationFromAttribute;
         }
 
-        $maximumDurationFromAnnotation = self::resolveMaximumDurationFromAnnotation($test);
+        if ($this->versionSeries->major()->isLessThan(Version\Major::fromInt(12))) {
+            $maximumDurationFromAnnotation = self::resolveMaximumDurationFromAnnotation($test);
 
-        if ($maximumDurationFromAnnotation instanceof Duration) {
-            return $maximumDurationFromAnnotation;
+            if ($maximumDurationFromAnnotation instanceof Duration) {
+                return $maximumDurationFromAnnotation;
+            }
         }
 
         return $this->maximumDuration;