Skip to content

Commit 2ef4785

Browse files
committed
Merge branch 'PHP-8.3'
2 parents e30d78f + be2d460 commit 2ef4785

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

ext/pgsql/pgsql.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2199,7 +2199,7 @@ PHP_FUNCTION(pg_untrace)
21992199
PGconn *pgsql;
22002200
pgsql_link_handle *link;
22012201

2202-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r!", &pgsql_link) == FAILURE) {
2202+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|O!", &pgsql_link, pgsql_link_ce) == FAILURE) {
22032203
RETURN_THROWS();
22042204
}
22052205

ext/pgsql/tests/gh12763.phpt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
--TEST--
2+
Bug #GH12763 (pg_untrace(): Argument #1 ($connection) must be of type resource or null, PgSql\Connection given)
3+
--EXTENSIONS--
4+
pgsql
5+
--SKIPIF--
6+
<?php include("skipif.inc"); ?>
7+
--FILE--
8+
<?php
9+
include('config.inc');
10+
11+
$conn = pg_connect($conn_str);
12+
13+
$file_name = tempnam('.', 'trace.log');
14+
pg_trace($file_name, 'w', $conn);
15+
pg_query($conn, 'select 1 as a');
16+
pg_untrace($conn);
17+
$items = explode("\n", file_get_contents($file_name));
18+
unlink($file_name);
19+
echo isset($items[0]) ? 'OK' : 'FAIL';
20+
21+
?>
22+
--EXPECT--
23+
OK

0 commit comments

Comments
 (0)