Merge branch '11.5' into 12.1

Author: sebastianbergmann

ChangeLog-12.1.md

@@ -4,6 +4,12 @@ All notable changes of the PHPUnit 12.1 release series are documented in this fi
 
 ## [12.1.3] - 2025-MM-DD
 
+### Changed
+
+* When gathering the telemetry information that each event has, the real size of memory allocated from the operating system is no longer used as this is grown by PHP's memory manager in chunks that are so large that small(er) increases in peak memory usage cannot be seen
+* The peak memory usage returned by `memory_get_peak_usage()` is now reset immediately before the `Test\Prepared` event is emitted using `memory_reset_peak_usage()` so that (memory usage at `Test\Finished` - memory usage at `Test\Prepared`) is a better approximation of the the memory usage of the test
+* The string representation of `Telemetry\Info` now uses peak memory usage instead of memory usage (this affects `--log-events-verbose-text`)
+
 ### Fixed
 
 * [#6173](https://github.com/sebastianbergmann/phpunit/issues/6173): Output from `error_log()` is not displayed when test fails

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());
     }
 }