Merge branch 'PHP-8.1' into PHP-8.2

Author: devnexen

NEWS

@@ -42,6 +42,9 @@ PHP                                                                        NEWS
 - PCRE:
   . Fixed bug GH-12628 (The gh11374 test fails on Alpinelinux). (nielsdos)
 
+- PGSQL:
+  . Fixed bug GH-12763 wrong argument type for pg_untrace. (degtyarov)
+
 - PHPDBG:
   . Fixed bug GH-12675 (MEMORY_LEAK in phpdbg_prompt.c). (nielsdos)
 

ext/pgsql/pgsql.c

@@ -2186,7 +2186,7 @@ PHP_FUNCTION(pg_untrace)
 	PGconn *pgsql;
 	pgsql_link_handle *link;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r!", &pgsql_link) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|O!", &pgsql_link, pgsql_link_ce) == FAILURE) {
 		RETURN_THROWS();
 	}
 

ext/pgsql/tests/gh12763.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Bug #GH12763 (pg_untrace(): Argument #1 ($connection) must be of type resource or null, PgSql\Connection given)
+--EXTENSIONS--
+pgsql
+--SKIPIF--
+<?php include("skipif.inc"); ?>
+--FILE--
+<?php
+include('config.inc');
+
+$conn = pg_connect($conn_str);
+
+$file_name = tempnam('.', 'trace.log');
+pg_trace($file_name, 'w', $conn);
+pg_query($conn, 'select 1 as a');
+pg_untrace($conn);
+$items = explode("\n", file_get_contents($file_name));
+unlink($file_name);
+echo isset($items[0]) ? 'OK' : 'FAIL';
+
+?>
+--EXPECT--
+OK