Skip to content

Commit d98634e

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Fix 2nd param name of pg_send_execute()
2 parents 28cca5d + ca219d7 commit d98634e

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

ext/pgsql/pgsql.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ function pg_send_query_params(PgSql\Connection $connection, string $query, array
461461

462462
function pg_send_prepare(PgSql\Connection $connection, string $statement_name, string $query): int|bool {}
463463

464-
function pg_send_execute(PgSql\Connection $connection, string $query, array $params): int|bool {}
464+
function pg_send_execute(PgSql\Connection $connection, string $statement_name, array $params): int|bool {}
465465

466466
/** @refcount 1 */
467467
function pg_get_result(PgSql\Connection $connection): PgSql\Result|false {}

ext/pgsql/pgsql_arginfo.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: b64120fb9848f9c2784b5b88608fdc532f8f0c15 */
2+
* Stub hash: 35f41dd74485f921feddc223085dea520f8d816e */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_pg_connect, 0, 1, PgSql\\Connection, MAY_BE_FALSE)
55
ZEND_ARG_TYPE_INFO(0, connection_string, IS_STRING, 0)
@@ -374,7 +374,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_send_prepare, 0, 3, MAY_BE_LO
374374
ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0)
375375
ZEND_END_ARG_INFO()
376376

377-
#define arginfo_pg_send_execute arginfo_pg_send_query_params
377+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_send_execute, 0, 3, MAY_BE_LONG|MAY_BE_BOOL)
378+
ZEND_ARG_OBJ_INFO(0, connection, PgSql\\Connection, 0)
379+
ZEND_ARG_TYPE_INFO(0, statement_name, IS_STRING, 0)
380+
ZEND_ARG_TYPE_INFO(0, params, IS_ARRAY, 0)
381+
ZEND_END_ARG_INFO()
378382

379383
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_pg_get_result, 0, 1, PgSql\\Result, MAY_BE_FALSE)
380384
ZEND_ARG_OBJ_INFO(0, connection, PgSql\\Connection, 0)

0 commit comments

Comments
 (0)