fix: prepares for nightly phpunit release

This commit is contained in:
Nuno Maduro
2023-03-18 23:19:20 +00:00
parent 0bf051610d
commit 840364891c
3 changed files with 19 additions and 6 deletions

View File

@ -46,9 +46,11 @@ final class BootSubscribers implements Bootstrapper
assert($instance instanceof Subscriber); assert($instance instanceof Subscriber);
Event\Facade::registerSubscriber( if (method_exists(Event\Facade::class, 'instance')) { // @phpstan-ignore-line
$instance Event\Facade::instance()->registerSubscriber($instance);
); } else {
Event\Facade::registerSubscriber($instance); // @phpstan-ignore-line
}
} }
} }
} }

View File

@ -224,7 +224,7 @@ final class TeamCityLogger
*/ */
private function registerSubscribers(): void private function registerSubscribers(): void
{ {
Facade::registerSubscribers( $subscribers = [
new TestSuiteStartedSubscriber($this), new TestSuiteStartedSubscriber($this),
new TestSuiteFinishedSubscriber($this), new TestSuiteFinishedSubscriber($this),
new TestPreparedSubscriber($this), new TestPreparedSubscriber($this),
@ -235,7 +235,13 @@ final class TeamCityLogger
new TestSkippedSubscriber($this), new TestSkippedSubscriber($this),
new TestConsideredRiskySubscriber($this), new TestConsideredRiskySubscriber($this),
new TestExecutionFinishedSubscriber($this), new TestExecutionFinishedSubscriber($this),
); ];
if (method_exists(Facade::class, 'instance')) { // @phpstan-ignore-line
Facade::instance()->registerSubscribers(...$subscribers);
} else {
Facade::registerSubscribers(...$subscribers); // @phpstan-ignore-line
}
} }
private function setFlowId(): void private function setFlowId(): void

View File

@ -114,7 +114,12 @@ final class WrapperRunner implements RunnerInterface
ExcludeList::addDirectory($directory); ExcludeList::addDirectory($directory);
TestResultFacade::init(); TestResultFacade::init();
EventFacade::seal();
if (method_exists(EventFacade::class, 'instance')) { // @phpstan-ignore-line
EventFacade::instance()->seal();
} else {
EventFacade::seal(); // @phpstan-ignore-line
}
$suiteLoader = new SuiteLoader($this->options, $this->output, $this->codeCoverageFilterRegistry); $suiteLoader = new SuiteLoader($this->options, $this->output, $this->codeCoverageFilterRegistry);
$this->pending = $this->getTestFiles($suiteLoader); $this->pending = $this->getTestFiles($suiteLoader);