Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit da62118

Browse filesBrowse files
bug #60174 [PhpUnitBridge] properly clean up mocked features after tests have run (xabbuh)
This PR was merged into the 7.2 branch. Discussion ---------- [PhpUnitBridge] properly clean up mocked features after tests have run | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT If a test has been skipped or if it errored, the mocked PHP functions must be cleaned up as well. Commits ------- 9757a69 properly clean up mocked features after tests have run
2 parents 7455c3c + 9757a69 commit da62118
Copy full SHA for da62118

File tree

Expand file treeCollapse file tree

3 files changed

+55
-82
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+55
-82
lines changed

‎src/Symfony/Bridge/PhpUnit/Extension/DisableClockMockSubscriber.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/Extension/DisableClockMockSubscriber.php
-39Lines changed: 0 additions & 39 deletions
This file was deleted.

‎src/Symfony/Bridge/PhpUnit/Extension/DisableDnsMockSubscriber.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/Extension/DisableDnsMockSubscriber.php
-39Lines changed: 0 additions & 39 deletions
This file was deleted.

‎src/Symfony/Bridge/PhpUnit/SymfonyExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/SymfonyExtension.php
+55-4Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,18 @@
1111

1212
namespace Symfony\Bridge\PhpUnit;
1313

14+
use PHPUnit\Event\Test\BeforeTestMethodErrored;
15+
use PHPUnit\Event\Test\BeforeTestMethodErroredSubscriber;
16+
use PHPUnit\Event\Test\Errored;
17+
use PHPUnit\Event\Test\ErroredSubscriber;
18+
use PHPUnit\Event\Test\Finished;
19+
use PHPUnit\Event\Test\FinishedSubscriber;
20+
use PHPUnit\Event\Test\Skipped;
21+
use PHPUnit\Event\Test\SkippedSubscriber;
1422
use PHPUnit\Runner\Extension\Extension;
1523
use PHPUnit\Runner\Extension\Facade;
1624
use PHPUnit\Runner\Extension\ParameterCollection;
1725
use PHPUnit\TextUI\Configuration\Configuration;
18-
use Symfony\Bridge\PhpUnit\Extension\DisableClockMockSubscriber;
19-
use Symfony\Bridge\PhpUnit\Extension\DisableDnsMockSubscriber;
2026
use Symfony\Bridge\PhpUnit\Extension\EnableClockMockSubscriber;
2127
use Symfony\Bridge\PhpUnit\Extension\RegisterClockMockSubscriber;
2228
use Symfony\Bridge\PhpUnit\Extension\RegisterDnsMockSubscriber;
@@ -38,7 +44,37 @@ public function bootstrap(Configuration $configuration, Facade $facade, Paramete
3844

3945
$facade->registerSubscriber(new RegisterClockMockSubscriber());
4046
$facade->registerSubscriber(new EnableClockMockSubscriber());
41-
$facade->registerSubscriber(new DisableClockMockSubscriber());
47+
$facade->registerSubscriber(new class implements ErroredSubscriber {
48+
public function notify(Errored $event): void
49+
{
50+
SymfonyExtension::disableClockMock();
51+
SymfonyExtension::disableDnsMock();
52+
}
53+
});
54+
$facade->registerSubscriber(new class implements FinishedSubscriber {
55+
public function notify(Finished $event): void
56+
{
57+
SymfonyExtension::disableClockMock();
58+
SymfonyExtension::disableDnsMock();
59+
}
60+
});
61+
$facade->registerSubscriber(new class implements SkippedSubscriber {
62+
public function notify(Skipped $event): void
63+
{
64+
SymfonyExtension::disableClockMock();
65+
SymfonyExtension::disableDnsMock();
66+
}
67+
});
68+
69+
if (interface_exists(BeforeTestMethodErroredSubscriber::class)) {
70+
$facade->registerSubscriber(new class implements BeforeTestMethodErroredSubscriber {
71+
public function notify(BeforeTestMethodErrored $event): void
72+
{
73+
SymfonyExtension::disableClockMock();
74+
SymfonyExtension::disableDnsMock();
75+
}
76+
});
77+
}
4278

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

4985
$facade->registerSubscriber(new RegisterDnsMockSubscriber());
50-
$facade->registerSubscriber(new DisableDnsMockSubscriber());
86+
}
87+
88+
/**
89+
* @internal
90+
*/
91+
public static function disableClockMock(): void
92+
{
93+
ClockMock::withClockMock(false);
94+
}
95+
96+
/**
97+
* @internal
98+
*/
99+
public static function disableDnsMock(): void
100+
{
101+
DnsMock::withMockedHosts([]);
51102
}
52103
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.