Remove code that is no longer needed

sebastianbergmann · Jul 19, 2024 · 4d4375a · 4d4375a
1 parent 1c640d4
commit 4d4375a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 91 deletions.
diff --git a/src/Event/Facade.php b/src/Event/Facade.php
@@ -11,10 +11,7 @@
 
 use function assert;
 use function interface_exists;
-use function version_compare;
 use PHPUnit\Event\Telemetry\HRTime;
-use PHPUnit\Event\Telemetry\Php81GarbageCollectorStatusProvider;
-use PHPUnit\Event\Telemetry\Php83GarbageCollectorStatusProvider;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
@@ -96,7 +93,7 @@ public function initForIsolation(HRTime $offset): CollectingDispatcher
             new Telemetry\System(
                 new Telemetry\SystemStopWatchWithOffset($offset),
                 new Telemetry\SystemMemoryMeter,
-                $this->garbageCollectorStatusProvider(),
+                new Telemetry\SystemGarbageCollectorStatusProvider,
             ),
         );
 
@@ -136,7 +133,7 @@ private function createTelemetrySystem(): Telemetry\System
         return new Telemetry\System(
             new Telemetry\SystemStopWatch,
             new Telemetry\SystemMemoryMeter,
-            $this->garbageCollectorStatusProvider(),
+            new Telemetry\SystemGarbageCollectorStatusProvider,
         );
     }
 
@@ -246,15 +243,4 @@ private function registerDefaultTypes(TypeMap $typeMap): void
             $typeMap->addMapping($subscriberInterface, $eventClass);
         }
     }
-
-    private function garbageCollectorStatusProvider(): Telemetry\GarbageCollectorStatusProvider
-    {
-        if (version_compare(PHP_VERSION, '8.3.0', '>=')) {
-            return new Php83GarbageCollectorStatusProvider;
-        }
-
-        // @codeCoverageIgnoreStart
-        return new Php81GarbageCollectorStatusProvider;
-        // @codeCoverageIgnoreEnd
-    }
 }
diff --git a/src/Event/Value/Telemetry/Php83GarbageCollectorStatusProvider.php b/src/Event/Value/Telemetry/Php83GarbageCollectorStatusProvider.php
diff --git a/...y/Php81GarbageCollectorStatusProvider.php → .../SystemGarbageCollectorStatusProvider.php b/...y/Php81GarbageCollectorStatusProvider.php → .../SystemGarbageCollectorStatusProvider.php
@@ -13,10 +13,8 @@
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
- *
- * @codeCoverageIgnore
  */
-final readonly class Php81GarbageCollectorStatusProvider implements GarbageCollectorStatusProvider
+final readonly class SystemGarbageCollectorStatusProvider implements GarbageCollectorStatusProvider
 {
     public function status(): GarbageCollectorStatus
     {
@@ -27,14 +25,14 @@ public function status(): GarbageCollectorStatus
             $status['collected'],
             $status['threshold'],
             $status['roots'],
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
+            $status['application_time'],
+            $status['collector_time'],
+            $status['destructor_time'],
+            $status['free_time'],
+            $status['running'],
+            $status['protected'],
+            $status['full'],
+            $status['buffer_size'],
         );
     }
 }
diff --git a/tests/unit/Event/Emitter/DispatchingEmitterTest.php b/tests/unit/Event/Emitter/DispatchingEmitterTest.php
@@ -13,13 +13,11 @@
 use function array_values;
 use function explode;
 use function get_class_methods;
-use function version_compare;
 use Exception;
 use PHPUnit\Event\Code\TestCollection;
 use PHPUnit\Event\Code\TestDoxBuilder;
 use PHPUnit\Event\Code\ThrowableBuilder;
-use PHPUnit\Event\Telemetry\Php81GarbageCollectorStatusProvider;
-use PHPUnit\Event\Telemetry\Php83GarbageCollectorStatusProvider;
+use PHPUnit\Event\Telemetry\SystemGarbageCollectorStatusProvider;
 use PHPUnit\Event\TestData\TestDataCollection;
 use PHPUnit\Event\TestRunner\ExecutionStarted;
 use PHPUnit\Event\TestRunner\ExecutionStartedSubscriber;
@@ -1385,16 +1383,10 @@ private function dispatcherWithRegisteredSubscribers(string $subscriberInterface
 
     private function telemetrySystem(): Telemetry\System
     {
-        if (version_compare('8.3.0', PHP_VERSION, '>')) {
-            $garbageCollectorStatusProvider = new Php81GarbageCollectorStatusProvider;
-        } else {
-            $garbageCollectorStatusProvider = new Php83GarbageCollectorStatusProvider;
-        }
-
         return new Telemetry\System(
             new Telemetry\SystemStopWatch,
             new Telemetry\SystemMemoryMeter,
-            $garbageCollectorStatusProvider,
+            new SystemGarbageCollectorStatusProvider,
         );
     }
 

diff --git a/tests/unit/Event/Value/Telemetry/InfoTest.php b/tests/unit/Event/Value/Telemetry/InfoTest.php
@@ -9,7 +9,6 @@
  */
 namespace PHPUnit\Event\Telemetry;
 
-use function version_compare;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Small;
 use PHPUnit\Framework\TestCase;
@@ -81,16 +80,10 @@ private function info(): Info
 
     private function telemetrySystem(): System
     {
-        if (version_compare('8.3.0', PHP_VERSION, '>')) {
-            $garbageCollectorStatusProvider = new Php81GarbageCollectorStatusProvider;
-        } else {
-            $garbageCollectorStatusProvider = new Php83GarbageCollectorStatusProvider;
-        }
-
         return new System(
             new SystemStopWatch,
             new SystemMemoryMeter,
-            $garbageCollectorStatusProvider,
+            new SystemGarbageCollectorStatusProvider,
         );
     }
 }