Commit 91904050f78 for php
commit 91904050f78e8899ef4e6b102f2a7aef400dbcc0
Merge: 6d57acf7823 642899fc18c
Author: Jorg Sowa <jorg.sowa@gmail.com>
Date: Wed Nov 11 10:17:04 2026 +0100
Merge branch 'PHP-8.6'
# Conflicts:
# NEWS
diff --cc Zend/zend_API.c
index d5968bd6376,4dba7fa25b0..c9f5ed38aee
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@@ -1786,9 -1784,9 +1786,9 @@@ ZEND_API void object_properties_load(ze
(property_info->flags & ZEND_ACC_STATIC) == 0) {
bool is_typed = ZEND_TYPE_IS_SET(property_info->type);
- /* Mimick unserialize behaviour for virtual properties. */
+ /* Mimic unserialize behaviour for virtual properties. */
if (UNEXPECTED(property_info->flags & ZEND_ACC_VIRTUAL)) {
- zend_throw_error(NULL, "Cannot unserialize value for virtual property %s::$%s", ZSTR_VAL(object->ce->name), zend_get_unmangled_property_name(property_info->name));
+ zend_throw_error(NULL, "Cannot unserialize value for virtual property %pS::$%s", object->ce->name, zend_get_unmangled_property_name(property_info->name));
return;
}
diff --cc Zend/zend_vm_execute.h
index 48f7f977251,b196dcc01f0..e75546b9078
Binary files differ
diff --cc main/main.c
index a8cdff9ff68,815edf52dae..40ff5af0d5e
--- a/main/main.c
+++ b/main/main.c
@@@ -1458,10 -1479,10 +1479,10 @@@ static ZEND_COLD void php_error_cb(int
if (PG(html_errors)) {
if (type == E_ERROR || type == E_PARSE) {
zend_string *buf = escape_html(ZSTR_VAL(message), ZSTR_LEN(message));
- php_printf("%s<br />\n<b>%s</b>: %s in <b>%s</b> on line <b>%" PRIu32 "</b><br />\n%s", STR_PRINT(prepend_string), error_type_str, ZSTR_VAL(buf), ZSTR_VAL(error_filename), error_lineno, STR_PRINT(append_string));
+ php_printf("%s<br />\n<b>%s</b>: %pS in <b>%s</b> on line <b>%" PRIu32 "</b><br />\n%s", STR_PRINT(prepend_string), error_type_str, buf, ZSTR_VAL(error_filename), error_lineno, STR_PRINT(append_string));
zend_string_free(buf);
} else {
- php_printf_unchecked("%s<br />\n<b>%s</b>: %S in <b>%s</b> on line <b>%" PRIu32 "</b><br />%s%s\n%s", STR_PRINT(prepend_string), error_type_str, message, ZSTR_VAL(error_filename), error_lineno, ZSTR_LEN(backtrace) ? "\nStack trace:\n" : "", ZSTR_VAL(backtrace), STR_PRINT(append_string));
+ php_printf("%s<br />\n<b>%s</b>: %pS in <b>%s</b> on line <b>%" PRIu32 "</b><br />%s%s\n%s", STR_PRINT(prepend_string), error_type_str, message, ZSTR_VAL(error_filename), error_lineno, ZSTR_LEN(backtrace) ? "\nStack trace:\n" : "", ZSTR_VAL(backtrace), STR_PRINT(append_string));
}
} else {
/* Write CLI/CGI errors to stderr if display_errors = "stderr" */