Hook on finished instead of passed test event

ergebnis · Dec 1, 2023 · f38752b · f38752b
1 parent e0c27d6
commit f38752b
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 42 deletions.
diff --git a/composer-require-checker.json b/composer-require-checker.json
@@ -7,8 +7,8 @@
     "int",
     "null",
     "PHPUnit\\Event\\Code\\Test",
-    "PHPUnit\\Event\\Test\\Passed",
-    "PHPUnit\\Event\\Test\\PassedSubscriber",
+    "PHPUnit\\Event\\Test\\Finished",
+    "PHPUnit\\Event\\Test\\FinishedSubscriber",
     "PHPUnit\\Event\\Test\\Prepared",
     "PHPUnit\\Event\\Test\\PreparedSubscriber",
     "PHPUnit\\Event\\TestRunner\\ExecutionFinished",

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -7,11 +7,6 @@
     <UnusedClass>
       <code>Extension</code>
     </UnusedClass>
-    <UnusedParam>
-      <code>$configuration</code>
-      <code>$facade</code>
-      <code>$parameters</code>
-    </UnusedParam>
   </file>
   <file src="src/Formatter/DefaultDurationFormatter.php">
     <InvalidOperand>
@@ -23,44 +18,34 @@
       <code>($durationInMilliseconds - $hoursInMilliseconds - $minutesInMilliseconds) / 1_000</code>
     </InvalidOperand>
   </file>
-  <file src="src/Subscriber/TestPassedSubscriber.php">
-    <UndefinedClass>
-      <code>Event\Test\PassedSubscriber</code>
-    </UndefinedClass>
+  <file src="src/Subscriber/TestFinishedSubscriber.php">
+    <InternalClass>
+      <code>Metadata\Annotation\Parser\Registry::getInstance()</code>
+    </InternalClass>
+    <InternalMethod>
+      <code>Metadata\Annotation\Parser\Registry::getInstance()</code>
+      <code>forMethod</code>
+      <code>symbolAnnotations</code>
+    </InternalMethod>
+    <MixedArgument>
+      <code>$maximumDuration</code>
+    </MixedArgument>
+    <MixedAssignment>
+      <code>$maximumDuration</code>
+    </MixedAssignment>
     <UnusedClass>
-      <code>TestPassedSubscriber</code>
+      <code>TestFinishedSubscriber</code>
     </UnusedClass>
-    <UnusedParam>
-      <code>$collector</code>
-      <code>$event</code>
-      <code>$maximumDuration</code>
-      <code>$timeKeeper</code>
-    </UnusedParam>
   </file>
   <file src="src/Subscriber/TestPreparedSubscriber.php">
-    <UndefinedClass>
-      <code>Event\Test\PreparedSubscriber</code>
-    </UndefinedClass>
     <UnusedClass>
       <code>TestPreparedSubscriber</code>
     </UnusedClass>
-    <UnusedParam>
-      <code>$event</code>
-      <code>$timeKeeper</code>
-    </UnusedParam>
   </file>
   <file src="src/Subscriber/TestRunnerExecutionFinishedSubscriber.php">
-    <UndefinedClass>
-      <code>Event\TestRunner\ExecutionFinishedSubscriber</code>
-    </UndefinedClass>
     <UnusedClass>
       <code>TestRunnerExecutionFinishedSubscriber</code>
     </UnusedClass>
-    <UnusedParam>
-      <code>$collector</code>
-      <code>$event</code>
-      <code>$reporter</code>
-    </UnusedParam>
   </file>
   <file src="test/Double/Collector/AppendingCollector.php">
     <UnusedClass>
@@ -77,7 +62,7 @@
       <code>NullReporter</code>
     </UnusedClass>
   </file>
-  <file src="test/EndToEnd/Version10/DefaultConfiguration/SleeperTest.php">
+  <file src="test/EndToEnd/Version10/Default/SleeperTest.php">
     <PossiblyUnusedMethod>
       <code>provideMillisecondsGreaterThanDefaultMaximumDuration</code>
     </PossiblyUnusedMethod>
@@ -92,9 +77,25 @@
       <code><![CDATA[$this->milliseconds * 1000]]></code>
     </ArgumentTypeCoercion>
   </file>
+  <file src="test/Unit/DurationTest.php">
+    <PossiblyUnusedMethod>
+      <code>provideMillisecondsSecondsAndNanoseconds</code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="test/Unit/Formatter/DefaultDurationFormatterTest.php">
+    <PossiblyUnusedMethod>
+      <code>provideDurationAndFormattedDuration</code>
+    </PossiblyUnusedMethod>
+  </file>
   <file src="test/Unit/Reporter/DefaultReporterTest.php">
-    <MixedInferredReturnType>
-      <code>iterable</code>
-    </MixedInferredReturnType>
+    <PossiblyUnusedMethod>
+      <code>provideExpectedReportMaximumDurationMaximumCountAndSlowTests</code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="test/Unit/TimeTest.php">
+    <PossiblyUnusedMethod>
+      <code>provideStartEndAndDuration</code>
+      <code>provideStartGreaterThanEnd</code>
+    </PossiblyUnusedMethod>
   </file>
 </files>
diff --git a/src/Extension.php b/src/Extension.php
@@ -63,7 +63,7 @@ public function bootstrap(
 
             $facade->registerSubscribers(
                 new Subscriber\TestPreparedSubscriber($timeKeeper),
-                new Subscriber\TestPassedSubscriber(
+                new Subscriber\TestFinishedSubscriber(
                     $maximumDuration,
                     $timeKeeper,
                     $collector,
@@ -81,7 +81,7 @@ public function bootstrap(
      */
     final class Extension implements
         Runner\AfterLastTestHook,
-        Runner\AfterSuccessfulTestHook,
+        Runner\AfterTestHook,
         Runner\BeforeFirstTestHook
     {
         private int $suites = 0;
@@ -117,7 +117,7 @@ public function executeBeforeFirstTest(): void
             ++$this->suites;
         }
 
-        public function executeAfterSuccessfulTest(
+        public function executeAfterTest(
             string $test,
             float $time
         ): void {

diff --git a/src/Subscriber/TestPassedSubscriber.php → src/Subscriber/TestFinishedSubscriber.php b/src/Subscriber/TestPassedSubscriber.php → src/Subscriber/TestFinishedSubscriber.php
@@ -26,7 +26,7 @@
 /**
  * @internal
  */
-final class TestPassedSubscriber implements Event\Test\PassedSubscriber
+final class TestFinishedSubscriber implements Event\Test\FinishedSubscriber
 {
     private Collector\Collector $collector;
     private TimeKeeper $timeKeeper;
@@ -42,7 +42,7 @@ public function __construct(
         $this->collector = $collector;
     }
 
-    public function notify(Event\Test\Passed $event): void
+    public function notify(Event\Test\Finished $event): void
     {
         $testIdentifier = TestIdentifier::fromString($event->test()->id());