Merge pull request #485 from ergebnis/feature/phpunit-11

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

Author: localheinz

.github/settings.yml

@@ -49,8 +49,10 @@ branches:
           - context: "Tests (10.0.0, 8.2, lowest)"
           - context: "Tests (10.0.0, 8.3, highest)"
           - context: "Tests (10.0.0, 8.3, lowest)"
-          - context: "Tests (11.0.x-dev, 8.2, highest)"
-          - context: "Tests (11.0.x-dev, 8.3, highest)"
+          - context: "Tests (11.0.0, 8.2, lowest)"
+          - context: "Tests (11.0.0, 8.2, highest)"
+          - context: "Tests (11.0.0, 8.3, highest)"
+          - context: "Tests (11.0.0, 8.3, lowest)"
         strict: false
       restrictions:
 

.github/workflows/integrate.yaml

@@ -504,11 +504,19 @@ jobs:
             php-version: "8.3"
             dependencies: "highest"
 
-          - phpunit-version: "11.0.x-dev"
+          - phpunit-version: "11.0.0"
+            php-version: "8.2"
+            dependencies: "lowest"
+
+          - phpunit-version: "11.0.0"
             php-version: "8.2"
             dependencies: "highest"
 
-          - phpunit-version: "11.0.x-dev"
+          - phpunit-version: "11.0.0"
+            php-version: "8.3"
+            dependencies: "lowest"
+
+          - phpunit-version: "11.0.0"
             php-version: "8.3"
             dependencies: "highest"
 
@@ -554,13 +562,9 @@ jobs:
         run: "composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --ansi --dev --no-interaction --no-progress"
 
       - name: "Require phpunit/phpunit:^${{ matrix.phpunit-version }}"
-        if: "matrix.dependencies != 'locked' && matrix.phpunit-version != '11.0.x-dev'"
+        if: "matrix.dependencies != 'locked'"
         run: "composer require phpunit/phpunit:^${{ matrix.phpunit-version }} --ansi --no-interaction --no-progress --update-with-all-dependencies"
 
-      - name: "Require phpunit/phpunit:${{ matrix.phpunit-version }}"
-        if: "matrix.dependencies != 'locked' && matrix.phpunit-version == '11.0.x-dev'"
-        run: "composer require phpunit/phpunit:${{ matrix.phpunit-version }} --ansi --no-interaction --no-progress --update-with-all-dependencies"
-
       - name: "Install ${{ matrix.dependencies }} dependencies with composer"
         uses: "ergebnis/.github/actions/composer/[email protected]"
         with:
@@ -593,8 +597,8 @@ jobs:
         if: "matrix.phpunit-version == '10.0.0'"
         run: "vendor/bin/phpunit --colors=always --configuration=test/EndToEnd/Version10/phpunit.xml"
 
-      - name: "Run end-to-end tests with phpunit/phpunit:11.0.x-dev"
-        if: "matrix.phpunit-version == '11.0.x-dev'"
+      - name: "Run end-to-end tests with phpunit/phpunit:11.0.0"
+        if: "matrix.phpunit-version == '11.0.0'"
         run: "vendor/bin/phpunit --colors=always --configuration=test/EndToEnd/Version11/phpunit.xml"
 
       - name: "Download Phar"
@@ -621,3 +625,7 @@ jobs:
       - name: "Run phar tests with phpunit/phpunit:10.0.0"
         if: "matrix.phpunit-version == '10.0.0'"
         run: "vendor/bin/phpunit --colors=always --configuration=test/Phar/Version10/phpunit.xml"
+
+      - 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"

CHANGELOG.md

@@ -10,6 +10,7 @@ For a full diff see [`2.9.0...main`][2.9.0...main].
 
 ### Changed
 
+- Added support for `phpunit/phpunit:^11.0.0` ([#485]), by [@localheinz]
 - Added support for using `phpunit-slow-test-detector.phar` with `phpunit/phpunit:^9.0.0` ([#491]), by [@localheinz]
 - Added support for using `phpunit-slow-test-detector.phar` with `phpunit/phpunit:^8.5.19` ([#494]), by [@localheinz]
 - Added support for using `phpunit-slow-test-detector.phar` with `phpunit/phpunit:^7.5.0` ([#495]), by [@localheinz]
@@ -269,6 +270,7 @@ For a full diff see [`7afa59c...1.0.0`][7afa59c...1.0.0].
 [#396]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/396
 [#447]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/447
 [#448]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/448
+[#485]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/485
 [#491]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/491
 [#494]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/494
 [#495]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/495

README.md

@@ -20,6 +20,7 @@ The extension is compatible with the following versions of `phpunit/phpunit`:
 - [`phpunit/phpunit:^8.5.19`](https://github.com/sebastianbergmann/phpunit/tree/8.5.19)
 - [`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)
 
 ## Installation
 
@@ -214,10 +215,12 @@ The following example configures the maximum count of slow tests to three, and t
 To configure the extension when using
 
 - `phpunit/phpunit:^10.0.0`
+- `phpunit/phpunit:^11.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/)
 
 The following example configures the maximum count of slow tests to three, and the maximum duration for all tests to 250 milliseconds:
 
@@ -248,6 +251,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`
 - a `@maximumDuration` annotation in the DocBlock when using
   - `phpunit/phpunit:^7.5.0`
   - `phpunit/phpunit:^8.5.19`
@@ -376,6 +380,7 @@ When phpunit/phpunit invokes `PHPUnit\Framework\TestCase::runBare()`, it will in
 When using
 
 - `phpunit/phpunit:^10.0.0`
+- `phpunit/phpunit:^11.0.0`
 
 the extension uses the new event system of `phpunit/phpunit`.
 

composer.json

@@ -25,7 +25,7 @@
   },
   "require": {
     "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
-    "phpunit/phpunit": "^7.5.0 || ^8.5.19 || ^9.0.0 || ^10.0.0"
+    "phpunit/phpunit": "^7.5.0 || ^8.5.19 || ^9.0.0 || ^10.0.0 || ^11.0.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.42.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.9.0" type="extension">
-        <extension for="phpunit/phpunit" compatible="^7.5 || 8.5 || ^9.0 || ^10.0"/>
+        <extension for="phpunit/phpunit" compatible="^7.5 || 8.5 || ^9.0 || ^10.0 || ^11.0"/>
     </contains>
 
     <copyright>

manifest.xml

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2021-2024 Andreas Möller
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE.md file that was distributed with this source code.
+ *
+ * @see https://github.com/ergebnis/phpunit-slow-test-detector
+ */
+
+namespace Ergebnis\PHPUnit\SlowTestDetector\Test\Phar\Version11;
+
+use Ergebnis\PHPUnit\SlowTestDetector\Test;
+use PHPUnit\Framework;
+
+#[Framework\Attributes\CoversClass(Test\Fixture\Sleeper::class)]
+final class SleeperTest extends Framework\TestCase
+{
+    public function testSleeperDoesNotSleepAtAll(): void
+    {
+        $milliseconds = 0;
+
+        $sleeper = Test\Fixture\Sleeper::fromMilliseconds($milliseconds);
+
+        $sleeper->sleep();
+
+        self::assertSame($milliseconds, $sleeper->milliseconds());
+    }
+
+    public function testSleeperSleepsJustAboveDefaultMaximumDuration(): void
+    {
+        $milliseconds = 600;
+
+        $sleeper = Test\Fixture\Sleeper::fromMilliseconds($milliseconds);
+
+        $sleeper->sleep();
+
+        self::assertSame($milliseconds, $sleeper->milliseconds());
+    }
+}

test/Phar/Version11/SleeperTest.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2021-2024 Andreas Möller
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE.md file that was distributed with this source code.
+ *
+ * @see https://github.com/ergebnis/phpunit-slow-test-detector
+ */
+
+require_once __DIR__ . '/../../Fixture/Sleeper.php';

test/Phar/Version11/bootstrap.php

@@ -0,0 +1,33 @@
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.0/phpunit.xsd"
+    beStrictAboutChangesToGlobalState="true"
+    beStrictAboutOutputDuringTests="true"
+    beStrictAboutTestsThatDoNotTestAnything="true"
+    beStrictAboutTodoAnnotatedTests="true"
+    bootstrap="bootstrap.php"
+    cacheResult="false"
+    colors="true"
+    columns="max"
+    displayDetailsOnIncompleteTests="true"
+    displayDetailsOnSkippedTests="true"
+    displayDetailsOnTestsThatTriggerDeprecations="true"
+    displayDetailsOnTestsThatTriggerErrors="true"
+    displayDetailsOnTestsThatTriggerNotices="true"
+    displayDetailsOnTestsThatTriggerWarnings="true"
+    executionOrder="random"
+    extensionsDirectory="../../../.build/phar/"
+    stopOnError="false"
+    stopOnFailure="false"
+    stopOnIncomplete="false"
+    stopOnSkipped="false"
+>
+    <extensions>
+        <bootstrap class="Ergebnis\PHPUnit\SlowTestDetector\Extension"/>
+    </extensions>
+    <testsuites>
+        <testsuite name="Unit Tests">
+            <directory>.</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>