Skip to content

Commit d63be3f

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: Disable inlining and inter-procedure-analyses for zend_string_equal_val() function that may be overriden for valgrind (php#13099) Skip lc_ctype_inheritance.phpt on macos 15+
2 parents 2bdc745 + 4b0ad46 commit d63be3f

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

ext/ctype/tests/lc_ctype_inheritance.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ Do not inherit LC_CTYPE from environment
44
ctype
55
--SKIPIF--
66
<?php
7-
if (PHP_OS_FAMILY === 'Darwin') die('skip Fails for macOS 15');
7+
if (PHP_OS_FAMILY === 'Darwin' && version_compare(php_uname('r'), '24.0.0', '>=')) {
8+
die('skip macOS 15 inherits LC_CTYPE into the thread locale');
9+
}
810
if (setlocale(LC_ALL, 'invalid') === 'invalid') { die('skip setlocale() is broken /w musl'); }
911
if (!setlocale(LC_CTYPE, "de_DE", "de-DE")) die("skip requires de_DE locale");
1012
?>

0 commit comments

Comments
 (0)