[php-src] master: [`%pS` migration] Use `%pS` in ext/spl/spl_heap.c
| From: | Daniel Scherzer | Date: | Sat, 24 Oct 2026 03:35:00 +0000 |
| Subject: | [php-src] master: [`%pS` migration] Use `%pS` in ext/spl/spl_heap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-142653@lists.php.net to get a copy of this message | ||
Author: Daniel Scherzer (DanielEScherzer)
Date: 2026-10-23T19:38:22-07:00
Commit: https://github.com/php/php-src/commit/7851dae949866fba578a50df780aad84df0082f3
Raw diff: https://github.com/php/php-src/commit/7851dae949866fba578a50df780aad84df0082f3.diff
[
%pS migration] Use %pS in ext/spl/spl_heap.c
Changed paths:
M ext/spl/spl_heap.c
Diff:
diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c
index 5a6cc33cf86c..74298a04c947 100644
--- a/ext/spl/spl_heap.c
+++ b/ext/spl/spl_heap.c
@@ -1172,30 +1172,30 @@ PHP_METHOD(SplPriorityQueue, __unserialize)
ZEND_PARSE_PARAMETERS_END();
if (zend_hash_num_elements(data) != 2) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(intern->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
intern->std.ce->name);
RETURN_THROWS();
}
zval *props = zend_hash_index_find(data, 0);
if (!props || Z_TYPE_P(props) != IS_ARRAY) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(intern->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
intern->std.ce->name);
RETURN_THROWS();
}
object_properties_load(&intern->std, Z_ARRVAL_P(props));
if (EG(exception)) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(intern->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
intern->std.ce->name);
RETURN_THROWS();
}
zval *state = zend_hash_index_find(data, 1);
if (!state || Z_TYPE_P(state) != IS_ARRAY) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(intern->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
intern->std.ce->name);
RETURN_THROWS();
}
if (spl_heap_unserialize_internal_state(Z_ARRVAL_P(state), intern, ZEND_THIS, true) != SUCCESS) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(intern->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
intern->std.ce->name);
RETURN_THROWS();
}
@@ -1227,30 +1227,30 @@ PHP_METHOD(SplHeap, __unserialize)
}
if (zend_hash_num_elements(data) != 2) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(intern->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
intern->std.ce->name);
RETURN_THROWS();
}
zval *props = zend_hash_index_find(data, 0);
if (!props || Z_TYPE_P(props) != IS_ARRAY) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(intern->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
intern->std.ce->name);
RETURN_THROWS();
}
object_properties_load(&intern->std, Z_ARRVAL_P(props));
if (EG(exception)) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(intern->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
intern->std.ce->name);
RETURN_THROWS();
}
zval *state = zend_hash_index_find(data, 1);
if (!state || Z_TYPE_P(state) != IS_ARRAY) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(intern->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
intern->std.ce->name);
RETURN_THROWS();
}
if (spl_heap_unserialize_internal_state(Z_ARRVAL_P(state), intern, ZEND_THIS, false) != SUCCESS) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(intern->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
intern->std.ce->name);
RETURN_THROWS();
}