Merge branch 'PHP-8.3' into PHP-8.4

Author: ndossche

NEWS

@@ -74,6 +74,8 @@ PHP                                                                        NEWS
 - Reflection:
   . Fixed bug GH-16122 (The return value of ReflectionFunction::getNamespaceName()
     and ReflectionFunction::inNamespace() for closures is incorrect). (timwolla)
+  . Fixed bug GH-16187 (Assertion failure in ext/reflection/php_reflection.c).
+    (DanielEScherzer)
 
 - SAPI:
   . Fixed bug GHSA-9pqp-7h25-4f32 (Erroneous parsing of multipart form data).

ext/reflection/php_reflection.c

@@ -484,7 +484,7 @@ static void _class_string(smart_str *str, zend_class_entry *ce, zval *obj, const
 
 		count = 0;
 		if (properties && zend_hash_num_elements(properties)) {
-			ZEND_HASH_MAP_FOREACH_STR_KEY(properties, prop_name) {
+			ZEND_HASH_FOREACH_STR_KEY(properties, prop_name) {
 				if (prop_name && ZSTR_LEN(prop_name) && ZSTR_VAL(prop_name)[0]) { /* skip all private and protected properties */
 					if (!zend_hash_exists(&ce->properties_info, prop_name)) {
 						count++;

ext/reflection/tests/gh16187.phpt

@@ -0,0 +1,14 @@
+--TEST--
+GH-16187 (ReflectionClass::__toString() with unpacked properties)
+--EXTENSIONS--
+simplexml
+--FILE--
+<?php
+$xml = '<form name="test"></form>';
+$simplexml = simplexml_load_string($xml);
+$reflector = new ReflectionObject($simplexml['name']);
+$reflector->__toString();
+?>
+DONE
+--EXPECT--
+DONE