archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source
This commit is contained in:
Shivam Mathur 2025-06-25 03:22:43 +05:30
commit a8bd3ba1bb
No known key found for this signature in database
GPG key ID: 3E13E4C8591ACC2A
7 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Zend/tests/bug40770.phpt
View file

@ -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");

3
Zend/tests/gh12073.phpt
View file

@ -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");
}

6
Zend/tests/traits/bugs/gh13177.phpt
View file

@ -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

3
tests/basic/timeout_variation_0.phpt
View file

@ -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--

3
tests/basic/timeout_variation_7.phpt
View file

@ -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--

3
tests/func/005a.phpt
View file

@ -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--

3
tests/lang/bug45392.phpt
View file

@ -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");
}