Merge branch '7.2' into 7.3

* 7.2:
  properly clean up mocked features after tests have run

Author: xabbuh

Extension/DisableClockMockSubscriber.php

@@ -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;
@@ -41,7 +47,37 @@ public function bootstrap(Configuration $configuration, Facade $facade, Paramete
 
         $facade->registerSubscriber(new RegisterClockMockSubscriber($reader));
         $facade->registerSubscriber(new EnableClockMockSubscriber($reader));
-        $facade->registerSubscriber(new DisableClockMockSubscriber($reader));
+        $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) {
@@ -50,6 +86,21 @@ public function bootstrap(Configuration $configuration, Facade $facade, Paramete
         }
 
         $facade->registerSubscriber(new RegisterDnsMockSubscriber($reader));
-        $facade->registerSubscriber(new DisableDnsMockSubscriber($reader));
+    }
+
+    /**
+     * @internal
+     */
+    public static function disableClockMock(): void
+    {
+        ClockMock::withClockMock(false);
+    }
+
+    /**
+     * @internal
+     */
+    public static function disableDnsMock(): void
+    {
+        DnsMock::withMockedHosts([]);
     }
 }