[php-src] PHP-8.4: Merge branch 'PHP-8.3' into PHP-8.4

From:	Shivam Mathur	Date:	Tue, 24 Jun 2025 22:06:44 +0000
Subject:	[php-src] PHP-8.4: Merge branch 'PHP-8.3' into PHP-8.4
Groups:	php.cvs
Request:	Send a blank email to [email protected] to get a copy of this message

Author: Shivam Mathur (shivammathur)
Date: 2025-06-25T03:22:43+05:30

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

Merge branch 'PHP-8.3' into PHP-8.4

Changed paths:
  M  Zend/tests/bug40770.phpt
  M  Zend/tests/gh12073.phpt
  M  Zend/tests/traits/bugs/gh13177.phpt
  M  tests/basic/timeout_variation_0.phpt
  M  tests/basic/timeout_variation_7.phpt
  M  tests/func/005a.phpt
  M  tests/lang/bug45392.phpt


Diff:

diff --git a/Zend/tests/bug40770.phpt b/Zend/tests/bug40770.phpt
index f37d96d5ff333..bdbae4cf8f1a2 100644
--- a/Zend/tests/bug40770.phpt
+++ b/Zend/tests/bug40770.phpt
@@ -4,6 +4,9 @@ Bug #40770 (Apache child exits when PHP memory limit reached)
 memory_limit=8M
 --SKIPIF--
 <?php
+if (PHP_OS_FAMILY === 'Windows' && version_compare(PHP_VERSION, '8.4',
'<')) {
+    die("xfail fails on Windows Server 2022 and newer.");
+}
 $zend_mm_enabled = getenv("USE_ZEND_ALLOC");
 if ($zend_mm_enabled === "0") {
     die("skip Zend MM disabled");
diff --git a/Zend/tests/gh12073.phpt b/Zend/tests/gh12073.phpt
index ef115685ce7d4..811da788d03fc 100644
--- a/Zend/tests/gh12073.phpt
+++ b/Zend/tests/gh12073.phpt
@@ -2,6 +2,9 @@
 GH-12073: Freeing of non-ZMM pointer of incompletely allocated closure
 --SKIPIF--
 <?php
+if (PHP_OS_FAMILY === 'Windows' && version_compare(PHP_VERSION, '8.4',
'<')) {
+    die("xfail fails on Windows Server 2022 and newer.");
+}
 if (getenv("USE_ZEND_ALLOC") === "0" &&
getenv("USE_TRACKED_ALLOC") !== "1") {
     die("skip Zend MM disabled");
 }
diff --git a/Zend/tests/traits/bugs/gh13177.phpt b/Zend/tests/traits/bugs/gh13177.phpt
index 42ef0ae9d60d7..1787b3c6bd7c2 100644
--- a/Zend/tests/traits/bugs/gh13177.phpt
+++ b/Zend/tests/traits/bugs/gh13177.phpt
@@ -1,5 +1,11 @@
 --TEST--
 GH-13177 (PHP 8.3.2: final private constructor not allowed when used in trait)
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === 'Windows' && version_compare(PHP_VERSION, '8.4',
'<')) {
+    die("xfail fails on Windows Server 2022 and newer.");
+}
+?>
 --FILE--
 <?php
 
diff --git a/tests/basic/timeout_variation_0.phpt b/tests/basic/timeout_variation_0.phpt
index ac514e1f9a428..d336eab9072ca 100644
--- a/tests/basic/timeout_variation_0.phpt
+++ b/tests/basic/timeout_variation_0.phpt
@@ -2,6 +2,9 @@
 Timeout within while loop
 --SKIPIF--
 <?php
+if (PHP_OS_FAMILY === 'Windows' && version_compare(PHP_VERSION, '8.4',
'<')) {
+    die("xfail fails on Windows Server 2022 and newer.");
+}
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
diff --git a/tests/basic/timeout_variation_7.phpt b/tests/basic/timeout_variation_7.phpt
index 0401240ba953d..3d40b540677db 100644
--- a/tests/basic/timeout_variation_7.phpt
+++ b/tests/basic/timeout_variation_7.phpt
@@ -2,6 +2,9 @@
 Timeout within for loop
 --SKIPIF--
 <?php
+if (PHP_OS_FAMILY === 'Windows' && version_compare(PHP_VERSION, '8.4',
'<')) {
+    die("xfail fails on Windows Server 2022 and newer.");
+}
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
diff --git a/tests/func/005a.phpt b/tests/func/005a.phpt
index cf1e5713770a9..2f527d773adbe 100644
--- a/tests/func/005a.phpt
+++ b/tests/func/005a.phpt
@@ -2,6 +2,9 @@
 Testing register_shutdown_function() with timeout. (Bug: #21513)
 --SKIPIF--
 <?php
+if (PHP_OS_FAMILY === 'Windows' && version_compare(PHP_VERSION, '8.4',
'<')) {
+    die("xfail fails on Windows Server 2022 and newer.");
+}
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
diff --git a/tests/lang/bug45392.phpt b/tests/lang/bug45392.phpt
index 27e3e994b64d9..cfb09437bd2cc 100644
--- a/tests/lang/bug45392.phpt
+++ b/tests/lang/bug45392.phpt
@@ -2,6 +2,9 @@
 Bug #45392 (ob_start()/ob_end_clean() and memory_limit)
 --SKIPIF--
 <?php
+if (PHP_OS_FAMILY === 'Windows' && version_compare(PHP_VERSION, '8.4',
'<')) {
+    die("xfail fails on Windows Server 2022 and newer.");
+}
 if (getenv("USE_ZEND_ALLOC") === "0") {
     die("skip Zend MM disabled");
 }


   

Thread (1 message)

• Shivam MathurTue, 24 Jun 2025 22:06:44 +0000