From 14ed75e5603541118109b2e08377750abecc0e50 Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Tue, 4 Nov 2025 04:42:42 +0000
Subject: [PATCH 1/3] Fix include paths for new pgsql tests

---
 ext/pgsql/tests/pg_fetch_object_with_abstract_class.phpt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/pgsql/tests/pg_fetch_object_with_abstract_class.phpt b/ext/pgsql/tests/pg_fetch_object_with_abstract_class.phpt
index d04e66a043b8..b3e6ea7f7b36 100644
--- a/ext/pgsql/tests/pg_fetch_object_with_abstract_class.phpt
+++ b/ext/pgsql/tests/pg_fetch_object_with_abstract_class.phpt
@@ -4,7 +4,7 @@ pg_fetch_object() with abstract class name
 pgsql
 --SKIPIF--
 <?php
-include("skipif.inc");
+include("inc/skipif.inc");
 ?>
 --FILE--
 <?php
@@ -17,7 +17,7 @@ enum E {
 	case A;
 }
 
-include "config.inc";
+include "inc/config.inc";
 $table_name = "pg_fetch_object_abstract_class";
 $db = pg_connect($conn_str);
 pg_query($db, "CREATE TABLE {$table_name} (a integer, b text)");
@@ -49,7 +49,7 @@ try {
 ?>
 --CLEAN--
 <?php
-include('config.inc');
+include('inc/config.inc');
 $db = @pg_connect($conn_str);
 @pg_query($db, "DROP TABLE IF EXISTS pg_fetch_object_abstract_class cascade");
 ?>

From b460062f7083ea6213e2d0dba9b05b8e68113c54 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+ndossche@users.noreply.github.com>
Date: Tue, 4 Nov 2025 08:32:06 +0100
Subject: [PATCH 2/3] random: Use ZVAL_EMPTY_ARRAY() for members in
 serialization (#20382)

---
 ext/random/engine_mt19937.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ext/random/engine_mt19937.c b/ext/random/engine_mt19937.c
index 7c9d1741d81f..e8a1ee5cf808 100644
--- a/ext/random/engine_mt19937.c
+++ b/ext/random/engine_mt19937.c
@@ -324,8 +324,7 @@ PHP_METHOD(Random_Engine_Mt19937, __serialize)
 	array_init(return_value);
 
 	/* members */
-	ZVAL_ARR(&t, zend_std_get_properties(&engine->std));
-	Z_TRY_ADDREF(t);
+	ZVAL_EMPTY_ARRAY(&t);
 	zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &t);
 
 	/* state */

From 720e006982951ab6dba15f1138fa0903284f03ee Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+ndossche@users.noreply.github.com>
Date: Tue, 4 Nov 2025 08:32:22 +0100
Subject: [PATCH 3/3] random: Fix memory leak when serialization fails (#20383)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Tim Düsterhus <timwolla@googlemail.com>
---
 ext/random/engine_mt19937.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/random/engine_mt19937.c b/ext/random/engine_mt19937.c
index e16c9f6722fc..a1a0d02b9dee 100644
--- a/ext/random/engine_mt19937.c
+++ b/ext/random/engine_mt19937.c
@@ -329,11 +329,11 @@ PHP_METHOD(Random_Engine_Mt19937, __serialize)
 
 	/* state */
 	array_init(&t);
+	zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &t);
 	if (!engine->algo->serialize(engine->status, Z_ARRVAL(t))) {
 		zend_throw_exception(NULL, "Engine serialize failed", 0);
 		RETURN_THROWS();
 	}
-	zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &t);
 }
 /* }}} */