[php-src] master: Merge branch 'PHP-8.6'
| From: | Daniel Scherzer | Date: | Mon, 05 Oct 2026 02:08:43 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.6' | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-141937@lists.php.net to get a copy of this message | ||
Author: Daniel Scherzer (DanielEScherzer)
Date: 2026-10-04T19:08:26-07:00
Commit: https://github.com/php/php-src/commit/825bf1b4aa1e5279ef0bf6f6ccd814dea1b5521b
Raw diff: https://github.com/php/php-src/commit/825bf1b4aa1e5279ef0bf6f6ccd814dea1b5521b.diff
Merge branch 'PHP-8.6'
* PHP-8.6:
[
%pS migration] Use %pS in ext/random (#23167)
Changed paths:
M ext/random/engine_mt19937.c
Diff:
diff --git a/ext/random/engine_mt19937.c b/ext/random/engine_mt19937.c
index bccf3770fb43..511e1d7cf3e2 100644
--- a/ext/random/engine_mt19937.c
+++ b/ext/random/engine_mt19937.c
@@ -348,30 +348,30 @@ PHP_METHOD(Random_Engine_Mt19937, __unserialize)
/* Verify the expected number of elements, this implicitly ensures that no additional elements are
present. */
if (zend_hash_num_elements(d) != 2) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(engine->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
engine->std.ce->name);
RETURN_THROWS();
}
/* members */
t = zend_hash_index_find(d, 0);
if (!t || Z_TYPE_P(t) != IS_ARRAY) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(engine->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
engine->std.ce->name);
RETURN_THROWS();
}
object_properties_load(&engine->std, Z_ARRVAL_P(t));
if (EG(exception)) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(engine->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
engine->std.ce->name);
RETURN_THROWS();
}
/* state */
t = zend_hash_index_find(d, 1);
if (!t || Z_TYPE_P(t) != IS_ARRAY) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(engine->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
engine->std.ce->name);
RETURN_THROWS();
}
if (!engine->engine.algo->unserialize(engine->engine.state, Z_ARRVAL_P(t))) {
- zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object",
ZSTR_VAL(engine->std.ce->name));
+ zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %pS object",
engine->std.ce->name);
RETURN_THROWS();
}
}