Enhancement: Add support for phpunit/phpunit:^9.6.13

ergebnis · Nov 6, 2023 · c8561ae · c8561ae
1 parent 0a8e2b1
commit c8561ae
Show file tree

Hide file tree

Showing 21 changed files with 196 additions and 151 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -449,6 +449,10 @@ jobs:
           - "8.2"
           - "8.3"
 
+        phpunit-version:
+          - "9.6.13"
+          - "10.4.2"
+
         dependencies:
           - "lowest"
           - "locked"
@@ -481,16 +485,25 @@ jobs:
         uses: "actions/[email protected]"
         with:
           path: "${{ env.COMPOSER_CACHE_DIR }}"
-          key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
+          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: "Require phpunit/phpunit:^${{ matrix.phpunit-version }}"
+        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:
           dependencies: "${{ matrix.dependencies }}"
 
-      - name: "Run unit tests with phpunit/phpunit"
+      - name: "Run unit tests with phpunit/phpunit:10.4.2"
+        if: "matrix.phpunit-version == '10.4.2'"
         run: "vendor/bin/phpunit --colors=always --configuration=test/Unit/phpunit.xml"
 
-      - name: "Run end-to-end tests with phpunit/phpunit"
-        run: "vendor/bin/phpunit --colors=always --configuration=test/EndToEnd/phpunit.xml"
+      - name: "Run end-to-end tests with phpunit/phpunit:10.4.2"
+        if: "matrix.phpunit-version == '10.4.2'"
+        run: "vendor/bin/phpunit --colors=always --configuration=test/EndToEnd/Version10/phpunit.xml"
+
+      - name: "Run end-to-end tests with phpunit/phpunit:9.6.13"
+        if: "matrix.phpunit-version == '9.6.13'"
+        run: "vendor/bin/phpunit --colors=always --configuration=test/EndToEnd/Version9/phpunit.xml"
diff --git a/Makefile b/Makefile
@@ -59,8 +59,8 @@ static-code-analysis-baseline: vendor ## Generates a baseline for static code an
 .PHONY: tests
 tests: vendor ## Runs unit and end-to-end tests with phpunit/phpunit
 	mkdir -p .build/phpunit
-	vendor/bin/phpunit --configuration=test/Unit/phpunit.xml
-	vendor/bin/phpunit --configuration=test/EndToEnd/phpunit.xml
+	composer require phpunit/phpunit:10.4.2 --no-interaction --no-progress --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/Unit/phpunit.xml; git checkout HEAD -- composer.json composer.lock
+	composer require phpunit/phpunit:10.4.2 --no-interaction --no-progress --update-with-all-dependencies; vendor/bin/phpunit --configuration=test/EndToEnd/Version10/phpunit.xml; git checkout HEAD -- composer.json composer.lock
 
 vendor: composer.json composer.lock
 	composer validate --strict

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
   },
   "require": {
     "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
-    "phpunit/phpunit": "^10.4.2"
+    "phpunit/phpunit": "^9.6.13 || ^10.4.2"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.39.0",

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -30,6 +30,19 @@
     <MixedAssignment>
       <code>$maximumDuration</code>
     </MixedAssignment>
+    <UnusedClass>
+      <code>TestPassedSubscriber</code>
+    </UnusedClass>
+  </file>
+  <file src="src/Subscriber/TestPreparedSubscriber.php">
+    <UnusedClass>
+      <code>TestPreparedSubscriber</code>
+    </UnusedClass>
+  </file>
+  <file src="src/Subscriber/TestRunnerExecutionFinishedSubscriber.php">
+    <UnusedClass>
+      <code>TestRunnerExecutionFinishedSubscriber</code>
+    </UnusedClass>
   </file>
   <file src="test/Double/Collector/AppendingCollector.php">
     <UnusedClass>
@@ -46,12 +59,12 @@
       <code>NullReporter</code>
     </UnusedClass>
   </file>
-  <file src="test/EndToEnd/Default/SleeperTest.php">
+  <file src="test/EndToEnd/Version10/Default/SleeperTest.php">
     <PossiblyUnusedMethod>
       <code>provideMillisecondsGreaterThanDefaultMaximumDuration</code>
     </PossiblyUnusedMethod>
   </file>
-  <file src="test/EndToEnd/MaximumCount/Three/SleeperTest.php">
+  <file src="test/EndToEnd/Version10/MaximumCount/Three/SleeperTest.php">
     <PossiblyUnusedMethod>
       <code>provideMillisecondsGreaterThanDefaultMaximumDuration</code>
     </PossiblyUnusedMethod>

diff --git a/src/Extension.php b/src/Extension.php
@@ -16,50 +16,69 @@
 use PHPUnit\Runner;
 use PHPUnit\TextUI;
 
-final class Extension implements Runner\Extension\Extension
-{
-    public function bootstrap(
-        TextUI\Configuration\Configuration $configuration,
-        Runner\Extension\Facade $facade,
-        Runner\Extension\ParameterCollection $parameters,
-    ): void {
-        if ($configuration->noOutput()) {
-            return;
-        }
+if (1 !== \preg_match('/(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)/', Runner\Version::id(), $matches)) {
+    throw new \RuntimeException(\sprintf(
+        'Unable to determine PHPUnit version from version identifier "%s".',
+        Runner\Version::id(),
+    ));
+}
 
-        $maximumCount = Count::fromInt(10);
+$major = (int) $matches['major'];
 
-        if ($parameters->has('maximum-count')) {
-            $maximumCount = Count::fromInt((int) $parameters->get('maximum-count'));
-        }
+if (10 <= $major) {
+    /**
+     * @internal
+     */
+    final class Extension implements Runner\Extension\Extension
+    {
+        public function bootstrap(
+            TextUI\Configuration\Configuration $configuration,
+            Runner\Extension\Facade $facade,
+            Runner\Extension\ParameterCollection $parameters,
+        ): void {
+            if ($configuration->noOutput()) {
+                return;
+            }
 
-        $maximumDuration = Duration::fromMilliseconds(500);
+            $maximumCount = Count::fromInt(10);
 
-        if ($parameters->has('maximum-duration')) {
-            $maximumDuration = Duration::fromMilliseconds((int) $parameters->get('maximum-duration'));
-        }
+            if ($parameters->has('maximum-count')) {
+                $maximumCount = Count::fromInt((int) $parameters->get('maximum-count'));
+            }
 
-        $collector = new Collector\DefaultCollector();
+            $maximumDuration = Duration::fromMilliseconds(500);
 
-        $reporter = new Reporter\DefaultReporter(
-            new Formatter\DefaultDurationFormatter(),
-            $maximumDuration,
-            $maximumCount,
-        );
+            if ($parameters->has('maximum-duration')) {
+                $maximumDuration = Duration::fromMilliseconds((int) $parameters->get('maximum-duration'));
+            }
 
-        $timeKeeper = new TimeKeeper();
+            $collector = new Collector\DefaultCollector();
 
-        $facade->registerSubscribers(
-            new Subscriber\TestPreparedSubscriber($timeKeeper),
-            new Subscriber\TestPassedSubscriber(
+            $reporter = new Reporter\DefaultReporter(
+                new Formatter\DefaultDurationFormatter(),
                 $maximumDuration,
-                $timeKeeper,
-                $collector,
-            ),
-            new Subscriber\TestRunnerExecutionFinishedSubscriber(
-                $collector,
-                $reporter,
-            ),
-        );
+                $maximumCount,
+            );
+
+            $timeKeeper = new TimeKeeper();
+
+            $facade->registerSubscribers(
+                new Subscriber\TestPreparedSubscriber($timeKeeper),
+                new Subscriber\TestPassedSubscriber(
+                    $maximumDuration,
+                    $timeKeeper,
+                    $collector,
+                ),
+                new Subscriber\TestRunnerExecutionFinishedSubscriber(
+                    $collector,
+                    $reporter,
+                ),
+            );
+        }
     }
+} else {
+    throw new \RuntimeException(\sprintf(
+        'Unable to select extension for PHPUnit version with version identifier "%s".',
+        Runner\Version::id(),
+    ));
 }
diff --git a/test/EndToEnd/Default/test.phpt b/test/EndToEnd/Default/test.phpt
diff --git a/test/EndToEnd/MaximumDuration/Fifty/test.phpt b/test/EndToEnd/MaximumDuration/Fifty/test.phpt
diff --git a/test/EndToEnd/Default/SleeperTest.php → ...ndToEnd/Version10/Default/SleeperTest.php b/test/EndToEnd/Default/SleeperTest.php → ...ndToEnd/Version10/Default/SleeperTest.php
@@ -11,7 +11,7 @@
  * @see https://github.com/ergebnis/phpunit-slow-test-detector
  */
 
-namespace Ergebnis\PHPUnit\SlowTestDetector\Test\EndToEnd\Default;
+namespace Ergebnis\PHPUnit\SlowTestDetector\Test\EndToEnd\Version10\Default;
 
 use Ergebnis\PHPUnit\SlowTestDetector\Test;
 use PHPUnit\Framework;

diff --git a/test/EndToEnd/Default/phpunit.xml → test/EndToEnd/Version10/Default/phpunit.xml b/test/EndToEnd/Default/phpunit.xml → test/EndToEnd/Version10/Default/phpunit.xml
@@ -1,11 +1,11 @@
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../../vendor/phpunit/phpunit/phpunit.xsd"
     beStrictAboutChangesToGlobalState="true"
     beStrictAboutOutputDuringTests="true"
     beStrictAboutTestsThatDoNotTestAnything="true"
     beStrictAboutTodoAnnotatedTests="true"
-    bootstrap="../../../vendor/autoload.php"
+    bootstrap="../../../../vendor/autoload.php"
     cacheResult="false"
     colors="true"
     columns="max"

diff --git a/test/EndToEnd/Version10/Default/test.phpt b/test/EndToEnd/Version10/Default/test.phpt
@@ -0,0 +1,43 @@
+--TEST--
+With default configuration of extension
+--FILE--
+<?php
+
+declare(strict_types=1);
+
+use PHPUnit\TextUI;
+
+$_SERVER['argv'][] = '--configuration=test/EndToEnd/Version10/Default/phpunit.xml';
+
+require_once __DIR__ . '/../../../../vendor/autoload.php';
+
+$application = new TextUI\Application();
+
+$application->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+Configuration: %Stest/EndToEnd/Version10/Default/phpunit.xml
+Random Seed:   %s
+
+............                                                      12 / 12 (100%)
+
+Detected 11 tests that took longer than expected.
+
+ 1. 1.0%s (0.500) Ergebnis\PHPUnit\SlowTestDetector\Test\EndToEnd\Version10\Default\SleeperTest::testSleeperSleepsLongerThanDefaultMaximumDurationWithDataProvider#10
+ 2. 1.0%s (0.500) Ergebnis\PHPUnit\SlowTestDetector\Test\EndToEnd\Version10\Default\SleeperTest::testSleeperSleepsLongerThanDefaultMaximumDurationWithDataProvider#9
+ 3. 0.9%s (0.500) Ergebnis\PHPUnit\SlowTestDetector\Test\EndToEnd\Version10\Default\SleeperTest::testSleeperSleepsLongerThanDefaultMaximumDurationWithDataProvider#8
+ 4. 0.9%s (0.500) Ergebnis\PHPUnit\SlowTestDetector\Test\EndToEnd\Version10\Default\SleeperTest::testSleeperSleepsLongerThanDefaultMaximumDurationWithDataProvider#7
+ 5. 0.8%s (0.500) Ergebnis\PHPUnit\SlowTestDetector\Test\EndToEnd\Version10\Default\SleeperTest::testSleeperSleepsLongerThanDefaultMaximumDurationWithDataProvider#6
+ 6. 0.8%s (0.500) Ergebnis\PHPUnit\SlowTestDetector\Test\EndToEnd\Version10\Default\SleeperTest::testSleeperSleepsLongerThanDefaultMaximumDurationWithDataProvider#5
+ 7. 0.7%s (0.500) Ergebnis\PHPUnit\SlowTestDetector\Test\EndToEnd\Version10\Default\SleeperTest::testSleeperSleepsLongerThanDefaultMaximumDurationWithDataProvider#4
+ 8. 0.7%s (0.500) Ergebnis\PHPUnit\SlowTestDetector\Test\EndToEnd\Version10\Default\SleeperTest::testSleeperSleepsLongerThanDefaultMaximumDurationWithDataProvider#3
+ 9. 0.6%s (0.500) Ergebnis\PHPUnit\SlowTestDetector\Test\EndToEnd\Version10\Default\SleeperTest::testSleeperSleepsLongerThanDefaultMaximumDurationWithDataProvider#2
+10. 0.6%s (0.500) Ergebnis\PHPUnit\SlowTestDetector\Test\EndToEnd\Version10\Default\SleeperTest::testSleeperSleepsLongerThanDefaultMaximumDurationWithDataProvider#1
+
+There is 1 additional slow test that is not listed here.
+
+Time: %s, Memory: %s
+
+OK (12 tests, 12 assertions)
diff --git a/...dToEnd/MaximumCount/Three/SleeperTest.php → ...sion10/MaximumCount/Three/SleeperTest.php b/...dToEnd/MaximumCount/Three/SleeperTest.php → ...sion10/MaximumCount/Three/SleeperTest.php
@@ -11,7 +11,7 @@
  * @see https://github.com/ergebnis/phpunit-slow-test-detector
  */
 
-namespace Ergebnis\PHPUnit\SlowTestDetector\Test\EndToEnd\MaximumCount\Three;
+namespace Ergebnis\PHPUnit\SlowTestDetector\Test\EndToEnd\Version10\MaximumCount\Three;
 
 use Ergebnis\PHPUnit\SlowTestDetector\Test;
 use PHPUnit\Framework;

diff --git a/test/EndToEnd/MaximumCount/Three/phpunit.xml → .../Version10/MaximumCount/Three/phpunit.xml b/test/EndToEnd/MaximumCount/Three/phpunit.xml → .../Version10/MaximumCount/Three/phpunit.xml
@@ -1,11 +1,11 @@
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../../vendor/phpunit/phpunit/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../../../vendor/phpunit/phpunit/phpunit.xsd"
     beStrictAboutChangesToGlobalState="true"
     beStrictAboutOutputDuringTests="true"
     beStrictAboutTestsThatDoNotTestAnything="true"
     beStrictAboutTodoAnnotatedTests="true"
-    bootstrap="../../../../vendor/autoload.php"
+    bootstrap="../../../../../vendor/autoload.php"
     cacheResult="false"
     colors="true"
     columns="max"