[PHP-CVS] [php-src] master: Merge branch 'PHP-8.4' into PHP-8.5

Author: Levi Morrison (morrisonlevi)
Date: 2026-08-24T10:23:07-06:00

Commit: https://github.com/php/php-src/commit/98b02fff3de1f203d68a2e83b1976a96135d90c7
Raw diff: https://github.com/php/php-src/commit/98b02fff3de1f203d68a2e83b1976a96135d90c7.diff

Merge branch 'PHP-8.4' into PHP-8.5

Changed paths:
  M  run-tests.php


Diff:

diff --git a/run-tests.php b/run-tests.php
index 5e85fd8a0b30..d9ac185a21a4 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -3379,6 +3379,7 @@ public function markTestAs(
 
         $time = $time ?? $this->getTimer($file_name);
         $this->record($suite, 'execution_time', $time);
+        $formatted_time = number_format($time, 4, '.', '');
 
         $escaped_details = htmlspecialchars($details, ENT_QUOTES, 'UTF-8');
         $escaped_details = preg_replace_callback('/[\0-\x08\x0B\x0C\x0E-\x1F]/', function ($c) {
@@ -3387,7 +3388,7 @@ public function markTestAs(
         $escaped_message = htmlspecialchars($message, ENT_QUOTES, 'UTF-8');
 
         $escaped_test_name = htmlspecialchars($file_name . ' (' . $test_name . ')', ENT_QUOTES);
-        $this->rootSuite['files'][$file_name]['xml'] = "<testcase name='$escaped_test_name' time='$time'>\n";
+        $this->rootSuite['files'][$file_name]['xml'] = "<testcase name='$escaped_test_name' time='$formatted_time'>\n";
 
         if (is_array($type)) {
             $output_type = $type[0] . 'ED';
@@ -3432,7 +3433,7 @@ private function getTimer(string $file_name)
         }
 
         if (isset($this->rootSuite['files'][$file_name]['total'])) {
-            return number_format($this->rootSuite['files'][$file_name]['total'], 4);
+            return $this->rootSuite['files'][$file_name]['total'];
         }
 
         return 0;