Merge branch 'PHP-8.4' into PHP-8.5

iluuu1994 · iluuu1994 · commit 801e587faa0e · 2025-10-21T17:53:32.000+02:00
* PHP-8.4:
  [skip ci] Auto-mark SKIP_PERF_SENSITIVE tests as flaky
diff --git a/run-tests.php b/run-tests.php
@@ -2811,6 +2811,11 @@ function is_flaky(TestFile $test): bool
     if ($test->hasSection('FLAKY')) {
         return true;
     }
+    if ($test->hasSection('SKIPIF')) {
+        if (strpos($test->getSection('SKIPIF'), 'SKIP_PERF_SENSITIVE') !== false) {
+            return true;
+        }
+    }
     if (!$test->hasSection('FILE')) {
         return false;
     }

Original file line number	Diff line number	Diff line change
`@@ -2811,6 +2811,11 @@ function is_flaky(TestFile $test): bool`
`2811`	`2811`	`if ($test->hasSection('FLAKY')) {`
`2812`	`2812`	`return true;`
`2813`	`2813`	`}`
	`2814`	`+ if ($test->hasSection('SKIPIF')) {`
	`2815`	`+ if (strpos($test->getSection('SKIPIF'), 'SKIP_PERF_SENSITIVE') !== false) {`
	`2816`	`+ return true;`
	`2817`	`+ }`
	`2818`	`+ }`
`2814`	`2819`	`if (!$test->hasSection('FILE')) {`
`2815`	`2820`	`return false;`
`2816`	`2821`	`}`