Skip to content

Commit 9adc949

Browse files
committed
Merge branch 'PHP-8.4'
2 parents be23be0 + a8bd3ba commit 9adc949

File tree

7 files changed

+24
-0
lines changed

7 files changed

+24
-0
lines changed

Zend/tests/bug40770.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Bug #40770 (Apache child exits when PHP memory limit reached)
44
memory_limit=8M
55
--SKIPIF--
66
<?php
7+
if (PHP_OS_FAMILY === 'Windows' && version_compare(PHP_VERSION, '8.4', '<')) {
8+
die("xfail fails on Windows Server 2022 and newer.");
9+
}
710
$zend_mm_enabled = getenv("USE_ZEND_ALLOC");
811
if ($zend_mm_enabled === "0") {
912
die("skip Zend MM disabled");

Zend/tests/closures/gh12073.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
GH-12073: Freeing of non-ZMM pointer of incompletely allocated closure
33
--SKIPIF--
44
<?php
5+
if (PHP_OS_FAMILY === 'Windows' && version_compare(PHP_VERSION, '8.4', '<')) {
6+
die("xfail fails on Windows Server 2022 and newer.");
7+
}
58
if (getenv("USE_ZEND_ALLOC") === "0" && getenv("USE_TRACKED_ALLOC") !== "1") {
69
die("skip Zend MM disabled");
710
}

Zend/tests/traits/bugs/gh13177.phpt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
--TEST--
22
GH-13177 (PHP 8.3.2: final private constructor not allowed when used in trait)
3+
--SKIPIF--
4+
<?php
5+
if (PHP_OS_FAMILY === 'Windows' && version_compare(PHP_VERSION, '8.4', '<')) {
6+
die("xfail fails on Windows Server 2022 and newer.");
7+
}
8+
?>
39
--FILE--
410
<?php
511

tests/basic/timeout_variation_0.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Timeout within while loop
33
--SKIPIF--
44
<?php
5+
if (PHP_OS_FAMILY === 'Windows' && version_compare(PHP_VERSION, '8.4', '<')) {
6+
die("xfail fails on Windows Server 2022 and newer.");
7+
}
58
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
69
?>
710
--FILE--

tests/basic/timeout_variation_7.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Timeout within for loop
33
--SKIPIF--
44
<?php
5+
if (PHP_OS_FAMILY === 'Windows' && version_compare(PHP_VERSION, '8.4', '<')) {
6+
die("xfail fails on Windows Server 2022 and newer.");
7+
}
58
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
69
?>
710
--FILE--

tests/func/005a.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Testing register_shutdown_function() with timeout. (Bug: #21513)
33
--SKIPIF--
44
<?php
5+
if (PHP_OS_FAMILY === 'Windows' && version_compare(PHP_VERSION, '8.4', '<')) {
6+
die("xfail fails on Windows Server 2022 and newer.");
7+
}
58
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
69
?>
710
--FILE--

tests/lang/bug45392.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Bug #45392 (ob_start()/ob_end_clean() and memory_limit)
33
--SKIPIF--
44
<?php
5+
if (PHP_OS_FAMILY === 'Windows' && version_compare(PHP_VERSION, '8.4', '<')) {
6+
die("xfail fails on Windows Server 2022 and newer.");
7+
}
58
if (getenv("USE_ZEND_ALLOC") === "0") {
69
die("skip Zend MM disabled");
710
}

0 commit comments

Comments
 (0)