[pull] master from php:master

.github/CODEOWNERS

@@ -20,11 +20,13 @@
 /ext/curl @adoy
 /ext/date @derickr
 /ext/dba @Girgias
+/ext/dom @devnexen
 /ext/ffi @dstogov
 /ext/gd @devnexen
 /ext/gettext @devnexen
 /ext/gmp @Girgias
 /ext/intl @devnexen
+/ext/libxml @devnexen
 /ext/json @bukka
 /ext/lexbor @kocsismate
 /ext/mbstring @alexdowad @youkidearitai
@@ -45,10 +47,16 @@
 /ext/random @TimWolla @zeriyoshi
 /ext/reflection @DanielEScherzer
 /ext/session @Girgias
+/ext/simplexml @devnexen
+/ext/soap @devnexen
 /ext/sockets @devnexen
 /ext/spl @Girgias
 /ext/standard @bukka
 /ext/uri @kocsismate @TimWolla
+/ext/xml @devnexen
+/ext/xmlreader @devnexen
+/ext/xmlwriter @devnexen
+/ext/xsl @devnexen
 /main @bukka
 /sapi/fpm @bukka
 /Zend/Optimizer @dstogov

NEWS

@@ -133,6 +133,8 @@ PHP                                                                        NEWS
 - SPL:
   . DirectoryIterator key can now work better with filesystem supporting larger
     directory indexing. (David Carlier)
+  . Fix bugs GH-8561, GH-8562, GH-8563, and GH-8564 (Fixing various
+    SplFileObject iterator desync bugs). (iliaal)
 
 - Sqlite3:
   . Fix NUL byte truncation in sqlite3 TEXT column handling. (ndossche)

UPGRADING.INTERNALS

@@ -133,6 +133,7 @@ PHP 8.6 INTERNALS UPGRADE NOTES
   . Dropped session_options parameter from all methods in mysqlnd_auth.
     The same information is present in conn->options and should be used
     instead.
+  . Removed charsets plugin.
 
 - ext/session:
   . php_session_flush() now returns a bool rather than a zend_result.

Zend/tests/gh16799.phpt

@@ -15,7 +15,12 @@ Test::test();
 --EXPECTF--
 Fatal error: Uncaught Exception: Use of "static" in callables is deprecated in %s:%d
 Stack trace:
-#0 %s(%d): {closure:%s:%d}(8192, 'Use of "static"...', %s, %d)
+#0 %s(%d): {closure:%s}(8192, 'Use of "static"%s', '%s', %d)
 #1 %s(%d): Test::test()
 #2 {main}
+
+Next TypeError: call_user_func(): Argument #1 ($callback) must be a valid callback, (null) in %s:%d
+Stack trace:
+#0 %s(%d): Test::test()
+#1 {main}
   thrown in %s on line %d

Zend/tests/gh_21699.phpt

@@ -0,0 +1,31 @@
+--TEST--
+GH-21699: Assertion failure in shutdown_executor when error handler throws during self:: callable resolution
+--FILE--
+<?php
+set_error_handler(function () {
+    throw new Exception;
+});
+class bar {
+    public static function __callstatic($fusion, $b)
+    {
+    }
+    public function test()
+    {
+        call_user_func('self::y');
+    }
+}
+$x = new bar;
+$x->test();
+?>
+--EXPECTF--
+Fatal error: Uncaught Exception in %s:%d
+Stack trace:
+#0 %s(%d): {closure:%s}(%d, 'Use of "self" i%s', '%s', %d)
+#1 %s(%d): bar->test()
+#2 {main}
+
+Next TypeError: call_user_func(): Argument #1 ($callback) must be a valid callback, (null) in %s:%d
+Stack trace:
+#0 %s(%d): bar->test()
+#1 {main}
+  thrown in %s on line %d

Zend/tests/gh_21699_parent.phpt

@@ -0,0 +1,32 @@
+--TEST--
+GH-21699 (parent::): no shutdown_executor trampoline assertion when error handler throws during parent:: callable resolution
+--FILE--
+<?php
+set_error_handler(function () {
+    throw new Exception;
+});
+class Base {
+    public static function __callStatic($name, $args)
+    {
+    }
+}
+class Child extends Base {
+    public function test()
+    {
+        call_user_func('parent::missing');
+    }
+}
+(new Child)->test();
+?>
+--EXPECTF--
+Fatal error: Uncaught Exception in %s:%d
+Stack trace:
+#0 %s(%d): {closure:%s}(%d, 'Use of "parent"%s', '%s', %d)
+#1 %s(%d): Child->test()
+#2 {main}
+
+Next TypeError: call_user_func(): Argument #1 ($callback) must be a valid callback, (null) in %s:%d
+Stack trace:
+#0 %s(%d): Child->test()
+#1 {main}
+  thrown in %s on line %d

Zend/tests/gh_21699_static.phpt

@@ -0,0 +1,31 @@
+--TEST--
+GH-21699 (static::): no shutdown_executor trampoline assertion when error handler throws during static:: callable resolution
+--FILE--
+<?php
+set_error_handler(function () {
+    throw new Exception;
+});
+class bar {
+    public static function __callstatic($fusion, $b)
+    {
+    }
+    public function test()
+    {
+        call_user_func('static::y');
+    }
+}
+$x = new bar;
+$x->test();
+?>
+--EXPECTF--
+Fatal error: Uncaught Exception in %s:%d
+Stack trace:
+#0 %s(%d): {closure:%s}(%d, 'Use of "static"%s', '%s', %d)
+#1 %s(%d): bar->test()
+#2 {main}
+
+Next TypeError: call_user_func(): Argument #1 ($callback) must be a valid callback, (null) in %s:%d
+Stack trace:
+#0 %s(%d): bar->test()
+#1 {main}
+  thrown in %s on line %d

Zend/zend_API.c

@@ -3769,6 +3769,10 @@ static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *sc
 		if (error) zend_spprintf(error, 0, "class \"%.*s\" not found", (int)name_len, ZSTR_VAL(name));
 	}
 	ZSTR_ALLOCA_FREE(lcname, use_heap);
+	/* User error handlers may throw from deprecations above; do not report callable as valid. */
+	if (UNEXPECTED(EG(exception))) {
+		return false;
+	}
 	return ret;
 }
 /* }}} */