Enhancement: Add support for phpunit/phpunit:^9.6.13

ergebnis · Nov 5, 2023 · a55e345 · a55e345
1 parent 9774914
commit a55e345
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 39 deletions.
diff --git a/Makefile b/Makefile
@@ -59,8 +59,11 @@ 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
+	composer require phpunit/phpunit:10.4.2 --no-interaction --no-progress
 	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
+	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>

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(),
+    ));
 }