Skip to content

[PhpUnitBridge] properly clean up mocked features after tests have run #60174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

39 changes: 0 additions & 39 deletions src/Symfony/Bridge/PhpUnit/Extension/DisableDnsMockSubscriber.php

This file was deleted.

59 changes: 55 additions & 4 deletions src/Symfony/Bridge/PhpUnit/SymfonyExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,18 @@

namespace Symfony\Bridge\PhpUnit;

use PHPUnit\Event\Test\BeforeTestMethodErrored;
use PHPUnit\Event\Test\BeforeTestMethodErroredSubscriber;
use PHPUnit\Event\Test\Errored;
use PHPUnit\Event\Test\ErroredSubscriber;
use PHPUnit\Event\Test\Finished;
use PHPUnit\Event\Test\FinishedSubscriber;
use PHPUnit\Event\Test\Skipped;
use PHPUnit\Event\Test\SkippedSubscriber;
use PHPUnit\Runner\Extension\Extension;
use PHPUnit\Runner\Extension\Facade;
use PHPUnit\Runner\Extension\ParameterCollection;
use PHPUnit\TextUI\Configuration\Configuration;
use Symfony\Bridge\PhpUnit\Extension\DisableClockMockSubscriber;
use Symfony\Bridge\PhpUnit\Extension\DisableDnsMockSubscriber;
use Symfony\Bridge\PhpUnit\Extension\EnableClockMockSubscriber;
use Symfony\Bridge\PhpUnit\Extension\RegisterClockMockSubscriber;
use Symfony\Bridge\PhpUnit\Extension\RegisterDnsMockSubscriber;
Expand All @@ -38,7 +44,37 @@ public function bootstrap(Configuration $configuration, Facade $facade, Paramete

$facade->registerSubscriber(new RegisterClockMockSubscriber());
$facade->registerSubscriber(new EnableClockMockSubscriber());
$facade->registerSubscriber(new DisableClockMockSubscriber());
$facade->registerSubscriber(new class implements ErroredSubscriber {
public function notify(Errored $event): void
{
SymfonyExtension::disableClockMock();
SymfonyExtension::disableDnsMock();
}
});
$facade->registerSubscriber(new class implements FinishedSubscriber {
public function notify(Finished $event): void
{
SymfonyExtension::disableClockMock();
SymfonyExtension::disableDnsMock();
}
});
$facade->registerSubscriber(new class implements SkippedSubscriber {
public function notify(Skipped $event): void
{
SymfonyExtension::disableClockMock();
SymfonyExtension::disableDnsMock();
}
});

if (interface_exists(BeforeTestMethodErroredSubscriber::class)) {
$facade->registerSubscriber(new class implements BeforeTestMethodErroredSubscriber {
public function notify(BeforeTestMethodErrored $event): void
{
SymfonyExtension::disableClockMock();
SymfonyExtension::disableDnsMock();
}
});
}

if ($parameters->has('dns-mock-namespaces')) {
foreach (explode(',', $parameters->get('dns-mock-namespaces')) as $namespace) {
Expand All @@ -47,6 +83,21 @@ public function bootstrap(Configuration $configuration, Facade $facade, Paramete
}

$facade->registerSubscriber(new RegisterDnsMockSubscriber());
$facade->registerSubscriber(new DisableDnsMockSubscriber());
}

/**
* @internal
*/
public static function disableClockMock(): void
{
ClockMock::withClockMock(false);
}

/**
* @internal
*/
public static function disableDnsMock(): void
{
DnsMock::withMockedHosts([]);
}
}
Loading