From e910fd3a1a70dbb4b824935f086e51309dae6d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Tue, 28 Nov 2023 12:12:00 +0100
Subject: [PATCH] Hook on finished instead of passed test event

---
 composer-require-checker.json                               | 4 ++--
 psalm-baseline.xml                                          | 6 +++---
 src/Extension.php                                           | 6 +++---
 ...{TestPassedSubscriber.php => TestFinishedSubscriber.php} | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename src/Subscriber/{TestPassedSubscriber.php => TestFinishedSubscriber.php} (96%)

diff --git a/composer-require-checker.json b/composer-require-checker.json
index e3e16b98..31099491 100644
--- 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
index 5bb152a6..6678670e 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -21,12 +21,12 @@
       <code>($durationInMilliseconds - $hoursInMilliseconds - $minutesInMilliseconds) / 1_000</code>
     </InvalidOperand>
   </file>
-  <file src="src/Subscriber/TestPassedSubscriber.php">
+  <file src="src/Subscriber/TestFinishedSubscriber.php">
     <UndefinedClass>
-      <code>Event\Test\PassedSubscriber</code>
+      <code>Event\Test\FinishedSubscriber</code>
     </UndefinedClass>
     <UnusedClass>
-      <code>TestPassedSubscriber</code>
+      <code>TestFinishedSubscriber</code>
     </UnusedClass>
     <UnusedParam>
       <code>$collector</code>
diff --git a/src/Extension.php b/src/Extension.php
index eacead13..40f2ebd8 100644
--- a/src/Extension.php
+++ b/src/Extension.php
@@ -35,7 +35,7 @@
      */
     final class Extension implements
         Runner\AfterLastTestHook,
-        Runner\AfterSuccessfulTestHook,
+        Runner\AfterTestHook,
         Runner\BeforeFirstTestHook
     {
         private int $suites = 0;
@@ -71,7 +71,7 @@ public function executeBeforeFirstTest(): void
             ++$this->suites;
         }
 
-        public function executeAfterSuccessfulTest(
+        public function executeAfterTest(
             string $test,
             float $time
         ): void {
@@ -210,7 +210,7 @@ public function bootstrap(
 
             $facade->registerSubscribers(
                 new Subscriber\TestPreparedSubscriber($timeKeeper),
-                new Subscriber\TestPassedSubscriber(
+                new Subscriber\TestFinishedSubscriber(
                     $maximumDuration,
                     $timeKeeper,
                     $collector,
diff --git a/src/Subscriber/TestPassedSubscriber.php b/src/Subscriber/TestFinishedSubscriber.php
similarity index 96%
rename from src/Subscriber/TestPassedSubscriber.php
rename to src/Subscriber/TestFinishedSubscriber.php
index 27b37945..7b0d2ff2 100644
--- a/src/Subscriber/TestPassedSubscriber.php
+++ b/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());