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 b0cee87c..aec64b97 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -23,12 +23,12 @@ ($durationInMilliseconds - $hoursInMilliseconds - $minutesInMilliseconds) / 1_000 - + - Event\Test\PassedSubscriber + Event\Test\FinishedSubscriber - TestPassedSubscriber + TestFinishedSubscriber $collector diff --git a/src/Extension.php b/src/Extension.php index 7dc53515..cdeafe69 100644 --- 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 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());