[php-src] master: Merge branch 'PHP-8.6'

Author: Daniel Scherzer (DanielEScherzer) Date: 2026-10-04T22:54:00-07:00 Commit: https://github.com/php/php-src/commit/54e71112db49f22564f0e1ad0a0f0afd15304443 Raw diff: https://github.com/php/php-src/commit/54e71112db49f22564f0e1ad0a0f0afd15304443.diff Merge branch 'PHP-8.6' * PHP-8.6: [%pS migration] Use %pS in ext/zip (#23176) Changed paths: M ext/zip/php_zip.c Diff: diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index a095f4fcca32..40f4a34f34f8 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1022,7 +1022,7 @@ static zval *php_zip_write_property(zend_object *object, zend_string *name, zval } if (hnd != NULL) { - zend_throw_error(NULL, "Cannot write read-only property %s::$%s", ZSTR_VAL(object->ce->name), ZSTR_VAL(name)); + zend_throw_error(NULL, "Cannot write read-only property %pS::$%pS", object->ce->name, name); return &EG(error_zval); } @@ -1793,8 +1793,8 @@ PHP_METHOD(ZipArchive, __serialize) ZEND_PARSE_PARAMETERS_NONE(); zend_throw_exception_ex(NULL, 0, - "Serialization of '%s' is not allowed, override __serialize() and __unserialize() to implement it", - ZSTR_VAL(Z_OBJCE_P(ZEND_THIS)->name)); + "Serialization of '%pS' is not allowed, override __serialize() and __unserialize() to implement it", + Z_OBJCE_P(ZEND_THIS)->name); } PHP_METHOD(ZipArchive, __unserialize) @@ -1808,8 +1808,8 @@ PHP_METHOD(ZipArchive, __unserialize) (void) data; zend_throw_exception_ex(NULL, 0, - "Unserialization of '%s' is not allowed, override __serialize() and __unserialize() to implement it", - ZSTR_VAL(Z_OBJCE_P(ZEND_THIS)->name)); + "Unserialization of '%pS' is not allowed, override __serialize() and __unserialize() to implement it", + Z_OBJCE_P(ZEND_THIS)->name); } /* {{{ clear the internal status */