Skip to content

Commit ff3a12b

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: 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 d36109b + c2fd6d6 commit ff3a12b

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

ext/ctype/tests/lc_ctype_inheritance.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Do not inherit LC_CTYPE from environment
44
ctype
55
--SKIPIF--
66
<?php
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+
}
710
if (setlocale(LC_ALL, 'invalid') === 'invalid') { die('skip setlocale() is broken /w musl'); }
811
if (!setlocale(LC_CTYPE, "de_DE", "de-DE")) die("skip requires de_DE locale");
912
?>

0 commit comments

Comments
 (0)