Merge branch '12.1'

Author: sebastianbergmann

src/Event/Emitter/DispatchingEmitter.php

@@ -10,6 +10,7 @@
 namespace PHPUnit\Event;
 
 use function assert;
+use function memory_reset_peak_usage;
 use PHPUnit\Event\Code\ClassMethod;
 use PHPUnit\Event\Code\ComparisonFailure;
 use PHPUnit\Event\Code\IssueTrigger\IssueTrigger;
@@ -492,6 +493,8 @@ public function preConditionFinished(TestMethod $test, ClassMethod ...$calledMet
      */
     public function testPrepared(Code\Test $test): void
     {
+        memory_reset_peak_usage();
+
         $this->dispatcher->dispatch(
             new Test\Prepared(
                 $this->telemetryInfo(),

src/Event/Value/Telemetry/Info.php

@@ -79,7 +79,7 @@ public function asString(): string
             '[%s / %s] [%d bytes]',
             $this->durationSinceStart()->asString(),
             $this->durationSincePrevious()->asString(),
-            $this->memoryUsage()->bytes(),
+            $this->peakMemoryUsage()->bytes(),
         );
     }
 }

src/Event/Value/Telemetry/SystemMemoryMeter.php

@@ -21,11 +21,11 @@
 {
     public function memoryUsage(): MemoryUsage
     {
-        return MemoryUsage::fromBytes(memory_get_usage(true));
+        return MemoryUsage::fromBytes(memory_get_usage());
     }
 
     public function peakMemoryUsage(): MemoryUsage
     {
-        return MemoryUsage::fromBytes(memory_get_peak_usage(true));
+        return MemoryUsage::fromBytes(memory_get_peak_usage());
     }
 }