Merge branch '10.0'

sebastianbergmann · Mar 18, 2023 · 9b3cd0a · 9b3cd0a
2 parents 08c7e39 + 57de5fe
commit 9b3cd0a
Show file tree

Hide file tree

Showing 15 changed files with 127 additions and 120 deletions.
diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
@@ -541,18 +541,6 @@
       <code><![CDATA[DefaultPrinter::from(
                     $configuration->logfileTeamcity()
                 )]]></code>
-      <code><![CDATA[EventFacade::registerTracer(
-                new EventLogger(
-                    $configuration->logEventsText(),
-                    false
-                )
-            )]]></code>
-      <code><![CDATA[EventFacade::registerTracer(
-                new EventLogger(
-                    $configuration->logEventsVerboseText(),
-                    true
-                )
-            )]]></code>
       <code><![CDATA[OutputFacade::printerFor($configuration->logfileJunit())]]></code>
       <code><![CDATA[OutputFacade::printerFor($configuration->logfileJunit())]]></code>
       <code>atLeastVersion</code>
@@ -567,26 +555,6 @@
       <code>logEventsVerboseText</code>
       <code>logfileJunit</code>
       <code>logfileTeamcity</code>
-      <code><![CDATA[new JunitXmlLogger(
-                OutputFacade::printerFor($configuration->logfileJunit()),
-            )]]></code>
-      <code><![CDATA[new JunitXmlLogger(
-                OutputFacade::printerFor($configuration->logfileJunit()),
-            )]]></code>
-      <code>new ResultCacheHandler($cache)</code>
-      <code>new ResultCacheHandler($cache)</code>
-      <code><![CDATA[new TeamCityLogger(
-                DefaultPrinter::from(
-                    $configuration->logfileTeamcity()
-                )
-            )]]></code>
-      <code><![CDATA[new TeamCityLogger(
-                DefaultPrinter::from(
-                    $configuration->logfileTeamcity()
-                )
-            )]]></code>
-      <code>new TestDoxResultCollector</code>
-      <code>new TestDoxResultCollector</code>
     </MissingThrowsDocblock>
     <UnresolvableInclude>
       <code>include_once $filename</code>
@@ -802,15 +770,15 @@
       <code><![CDATA[new DefaultProgressPrinter(
             self::$printer,
             $configuration->colors(),
-            $configuration->columns()
+            $configuration->columns(),
+            EventFacade::instance()
         )]]></code>
       <code><![CDATA[new DefaultProgressPrinter(
             self::$printer,
             $configuration->colors(),
-            $configuration->columns()
+            $configuration->columns(),
+            EventFacade::instance()
         )]]></code>
-      <code>new TeamCityLogger(DefaultPrinter::standardOutput())</code>
-      <code>new TeamCityLogger(DefaultPrinter::standardOutput())</code>
     </MissingThrowsDocblock>
     <NullableReturnStatement>
       <code>self::$printer</code>

diff --git a/src/Event/Facade.php b/src/Event/Facade.php
@@ -16,138 +16,149 @@
  */
 final class Facade
 {
-    private static ?TypeMap $typeMap                         = null;
-    private static ?Emitter $emitter                         = null;
-    private static ?Emitter $suspended                       = null;
-    private static ?DeferringDispatcher $deferringDispatcher = null;
-    private static bool $sealed                              = false;
+    private static ?self $instance = null;
+    private Emitter $emitter;
+    private ?TypeMap $typeMap                         = null;
+    private ?Emitter $suspended                       = null;
+    private ?DeferringDispatcher $deferringDispatcher = null;
+    private bool $sealed                              = false;
+
+    public static function instance(): self
+    {
+        if (self::$instance === null) {
+            self::$instance = new self;
+        }
+
+        return self::$instance;
+    }
+
+    public static function emitter(): Emitter
+    {
+        return self::instance()->emitter;
+    }
+
+    public function __construct()
+    {
+        $this->emitter = $this->createDispatchingEmitter();
+    }
 
     /**
      * @throws EventFacadeIsSealedException
      * @throws UnknownSubscriberTypeException
      */
-    public static function registerSubscribers(Subscriber ...$subscribers): void
+    public function registerSubscribers(Subscriber ...$subscribers): void
     {
         foreach ($subscribers as $subscriber) {
-            self::registerSubscriber($subscriber);
+            $this->registerSubscriber($subscriber);
         }
     }
 
     /**
      * @throws EventFacadeIsSealedException
      * @throws UnknownSubscriberTypeException
      */
-    public static function registerSubscriber(Subscriber $subscriber): void
+    public function registerSubscriber(Subscriber $subscriber): void
     {
-        if (self::$sealed) {
+        if ($this->sealed) {
             throw new EventFacadeIsSealedException;
         }
 
-        self::deferredDispatcher()->registerSubscriber($subscriber);
+        $this->deferredDispatcher()->registerSubscriber($subscriber);
     }
 
     /**
      * @throws EventFacadeIsSealedException
      */
-    public static function registerTracer(Tracer\Tracer $tracer): void
+    public function registerTracer(Tracer\Tracer $tracer): void
     {
-        if (self::$sealed) {
+        if ($this->sealed) {
             throw new EventFacadeIsSealedException;
         }
 
-        self::deferredDispatcher()->registerTracer($tracer);
-    }
-
-    public static function emitter(): Emitter
-    {
-        if (self::$emitter === null) {
-            self::$emitter = self::createDispatchingEmitter();
-        }
-
-        return self::$emitter;
+        $this->deferredDispatcher()->registerTracer($tracer);
     }
 
     /** @noinspection PhpUnused */
-    public static function initForIsolation(HRTime $offset): CollectingDispatcher
+    public function initForIsolation(HRTime $offset): CollectingDispatcher
     {
         $dispatcher = new CollectingDispatcher;
 
-        self::$emitter = new DispatchingEmitter(
+        $this->emitter = new DispatchingEmitter(
             $dispatcher,
             new Telemetry\System(
                 new Telemetry\SystemStopWatchWithOffset($offset),
                 new Telemetry\SystemMemoryMeter
             )
         );
 
-        self::$sealed = true;
+        $this->sealed = true;
 
         return $dispatcher;
     }
 
-    public static function forward(EventCollection $events): void
+    public function forward(EventCollection $events): void
     {
-        if (self::$suspended !== null) {
+        if ($this->suspended !== null) {
             return;
         }
 
-        $dispatcher = self::deferredDispatcher();
+        $dispatcher = $this->deferredDispatcher();
 
         foreach ($events as $event) {
             $dispatcher->dispatch($event);
         }
     }
 
-    public static function seal(): void
+    public function seal(): void
     {
-        self::deferredDispatcher()->flush();
+        $this->deferredDispatcher()->flush();
 
-        self::$sealed = true;
+        $this->sealed = true;
 
-        self::emitter()->testRunnerEventFacadeSealed();
+        $this->emitter->testRunnerEventFacadeSealed();
     }
 
-    private static function createDispatchingEmitter(): DispatchingEmitter
+    private function createDispatchingEmitter(): DispatchingEmitter
     {
         return new DispatchingEmitter(
-            self::deferredDispatcher(),
-            self::createTelemetrySystem()
+            $this->deferredDispatcher(),
+            $this->createTelemetrySystem()
         );
     }
 
-    private static function createTelemetrySystem(): Telemetry\System
+    private function createTelemetrySystem(): Telemetry\System
     {
         return new Telemetry\System(
             new Telemetry\SystemStopWatch,
             new Telemetry\SystemMemoryMeter
         );
     }
 
-    private static function deferredDispatcher(): DeferringDispatcher
+    private function deferredDispatcher(): DeferringDispatcher
     {
-        if (self::$deferringDispatcher === null) {
-            self::$deferringDispatcher = new DeferringDispatcher(
-                new DirectDispatcher(self::typeMap())
+        if ($this->deferringDispatcher === null) {
+            $this->deferringDispatcher = new DeferringDispatcher(
+                new DirectDispatcher($this->typeMap())
             );
         }
 
-        return self::$deferringDispatcher;
+        return $this->deferringDispatcher;
     }
 
-    private static function typeMap(): TypeMap
+    private function typeMap(): TypeMap
     {
-        if (self::$typeMap === null) {
+        if ($this->typeMap === null) {
             $typeMap = new TypeMap;
 
-            self::registerDefaultTypes($typeMap);
+            $this->registerDefaultTypes($typeMap);
 
-            self::$typeMap = $typeMap;
+            $this->typeMap = $typeMap;
         }
 
-        return self::$typeMap;
+        return $this->typeMap;
     }
 
-    private static function registerDefaultTypes(TypeMap $typeMap): void
+    private function registerDefaultTypes(TypeMap $typeMap): void
     {
         $defaultEvents = [
             Application\Started::class,

diff --git a/src/Logging/JUnit/JunitXmlLogger.php b/src/Logging/JUnit/JunitXmlLogger.php
@@ -88,11 +88,11 @@ final class JunitXmlLogger
      * @throws EventFacadeIsSealedException
      * @throws UnknownSubscriberTypeException
      */
-    public function __construct(Printer $printer)
+    public function __construct(Printer $printer, Facade $facade)
     {
         $this->printer = $printer;
 
-        $this->registerSubscribers();
+        $this->registerSubscribers($facade);
         $this->createDocument();
     }
 
@@ -268,9 +268,9 @@ private function handleFinish(Info $telemetryInfo, int $numberOfAssertionsPerfor
      * @throws EventFacadeIsSealedException
      * @throws UnknownSubscriberTypeException
      */
-    private function registerSubscribers(): void
+    private function registerSubscribers(Facade $facade): void
     {
-        Facade::registerSubscribers(
+        $facade->registerSubscribers(
             new TestSuiteStartedSubscriber($this),
             new TestSuiteFinishedSubscriber($this),
             new TestPreparedSubscriber($this),

diff --git a/src/Logging/TeamCity/TeamCityLogger.php b/src/Logging/TeamCity/TeamCityLogger.php
@@ -53,11 +53,11 @@ final class TeamCityLogger
      * @throws EventFacadeIsSealedException
      * @throws UnknownSubscriberTypeException
      */
-    public function __construct(Printer $printer)
+    public function __construct(Printer $printer, Facade $facade)
     {
         $this->printer = $printer;
 
-        $this->registerSubscribers();
+        $this->registerSubscribers($facade);
         $this->setFlowId();
     }
 
@@ -275,9 +275,9 @@ public function flush(): void
      * @throws EventFacadeIsSealedException
      * @throws UnknownSubscriberTypeException
      */
-    private function registerSubscribers(): void
+    private function registerSubscribers(Facade $facade): void
     {
-        Facade::registerSubscribers(
+        $facade->registerSubscribers(
             new TestSuiteStartedSubscriber($this),
             new TestSuiteFinishedSubscriber($this),
             new TestPreparedSubscriber($this),

diff --git a/src/Logging/TestDox/TestMethod/TestResultCollector.php b/src/Logging/TestDox/TestMethod/TestResultCollector.php
@@ -58,9 +58,9 @@ final class TestResultCollector
      * @throws EventFacadeIsSealedException
      * @throws UnknownSubscriberTypeException
      */
-    public function __construct()
+    public function __construct(Facade $facade)
     {
-        $this->registerSubscribers();
+        $this->registerSubscribers($facade);
     }
 
     /**
@@ -186,9 +186,9 @@ public function testFinished(Finished $event): void
      * @throws EventFacadeIsSealedException
      * @throws UnknownSubscriberTypeException
      */
-    private function registerSubscribers(): void
+    private function registerSubscribers(Facade $facade): void
     {
-        Facade::registerSubscribers(
+        $facade->registerSubscribers(
             new TestConsideredRiskySubscriber($this),
             new TestCreatedMockObjectForAbstractClassSubscriber($this),
             new TestCreatedMockObjectForTraitSubscriber($this),

diff --git a/src/Runner/Extension/Facade.php b/src/Runner/Extension/Facade.php
@@ -26,7 +26,7 @@ final class Facade
      */
     public function registerSubscribers(Subscriber ...$subscribers): void
     {
-        EventFacade::registerSubscribers(...$subscribers);
+        EventFacade::instance()->registerSubscribers(...$subscribers);
     }
 
     /**
@@ -35,14 +35,14 @@ public function registerSubscribers(Subscriber ...$subscribers): void
      */
     public function registerSubscriber(Subscriber $subscriber): void
     {
-        EventFacade::registerSubscriber($subscriber);
+        EventFacade::instance()->registerSubscriber($subscriber);
     }
 
     /**
      * @throws EventFacadeIsSealedException
      */
     public function registerTracer(Tracer $tracer): void
     {
-        EventFacade::registerTracer($tracer);
+        EventFacade::instance()->registerTracer($tracer);
     }
 }
diff --git a/src/Runner/ResultCache/ResultCacheHandler.php b/src/Runner/ResultCache/ResultCacheHandler.php
@@ -38,11 +38,11 @@ final class ResultCacheHandler
      * @throws EventFacadeIsSealedException
      * @throws UnknownSubscriberTypeException
      */
-    public function __construct(ResultCache $cache)
+    public function __construct(ResultCache $cache, Facade $facade)
     {
         $this->cache = $cache;
 
-        $this->registerSubscribers();
+        $this->registerSubscribers($facade);
     }
 
     public function testSuiteStarted(): void
@@ -138,9 +138,9 @@ private function duration(Event $event): float
      * @throws EventFacadeIsSealedException
      * @throws UnknownSubscriberTypeException
      */
-    private function registerSubscribers(): void
+    private function registerSubscribers(Facade $facade): void
     {
-        Facade::registerSubscribers(
+        $facade->registerSubscribers(
             new TestSuiteStartedSubscriber($this),
             new TestSuiteFinishedSubscriber($this),
             new TestPreparedSubscriber($this),