From 52b49036b22e0711d13057689ce0ed47aecc60b7 Mon Sep 17 00:00:00 2001 From: Larry Garfield Date: Sat, 3 Oct 2020 16:37:10 -0500 Subject: [PATCH 1/4] Update PostgreSQL stub file. --- ext/pgsql/pgsql.stub.php | 336 +++++++++++++++++++-------------------- 1 file changed, 168 insertions(+), 168 deletions(-) diff --git a/ext/pgsql/pgsql.stub.php b/ext/pgsql/pgsql.stub.php index a6dfb5d18512e..63bd2f29b2408 100644 --- a/ext/pgsql/pgsql.stub.php +++ b/ext/pgsql/pgsql.stub.php @@ -3,83 +3,83 @@ /** @generate-function-entries */ /** @return resource|false */ -function pg_connect(string $connection_string, int $connection_type = 0) {} +function pg_connect(string $pgsql_string, int $pgsql_type = 0) {} /** @return resource|false */ -function pg_pconnect(string $connection_string, int $connection_type = 0) {} +function pg_pconnect(string $pgsql_string, int $pgsql_type = 0) {} -/** @param resource $connection */ -function pg_connect_poll($connection): int {} +/** @param resource $pgsql */ +function pg_connect_poll($pgsql): int {} -/** @param resource|null $connection */ -function pg_close($connection = null): bool {} +/** @param resource|null $pgsql */ +function pg_close($pgsql = null): bool {} -/** @param resource|null $connection */ -function pg_dbname($connection = null): string {} +/** @param resource|null $pgsql */ +function pg_dbname($pgsql = null): string {} -/** @param resource|null $connection */ -function pg_last_error($connection = null): string {} +/** @param resource|null $pgsql */ +function pg_last_error($pgsql = null): string {} /** - * @param resource|null $connection + * @param resource|null $pgsql * @alias pg_last_error * @deprecated */ -function pg_errormessage($connection = null): string {} +function pg_errormessage($pgsql = null): string {} -/** @param resource|null $connection */ -function pg_options($connection = null): string {} +/** @param resource|null $pgsql */ +function pg_options($pgsql = null): string {} -/** @param resource|null $connection */ -function pg_port($connection = null): string {} +/** @param resource|null $pgsql */ +function pg_port($pgsql = null): string {} -/** @param resource|null $connection */ -function pg_tty($connection = null): string {} +/** @param resource|null $pgsql */ +function pg_tty($pgsql = null): string {} -/** @param resource|null $connection */ -function pg_host($connection = null): string {} +/** @param resource|null $pgsql */ +function pg_host($pgsql = null): string {} -/** @param resource|null $connection */ -function pg_version($connection = null): array {} +/** @param resource|null $pgsql */ +function pg_version($pgsql = null): array {} -/** @param resource|string $connection */ -function pg_parameter_status($connection, string $param_name = UNKNOWN): string|false {} +/** @param resource|string $pgsql */ +function pg_parameter_status($pgsql, string $param_name = UNKNOWN): string|false {} -/** @param resource|null $connection */ -function pg_ping($connection = null): bool {} +/** @param resource|null $pgsql */ +function pg_ping($pgsql = null): bool {} /** - * @param resource|string $connection + * @param resource|string $pgsql * @return resource|false */ -function pg_query($connection, string $query = UNKNOWN) {} +function pg_query($pgsql, string $query = UNKNOWN) {} /** - * @param resource|string $connection + * @param resource|string $pgsql * @return resource|false * @alias pg_query */ -function pg_exec($connection, string $query = UNKNOWN) {} +function pg_exec($pgsql, string $query = UNKNOWN) {} /** - * @param resource|string $connection + * @param resource|string $pgsql * @param string|array $query * @return resource|false */ -function pg_query_params($connection, $query, array $params = UNKNOWN) {} +function pg_query_params($pgsql, $query, array $params = UNKNOWN) {} /** - * @param resource|string $connection + * @param resource|string $pgsql * @return resource|false */ -function pg_prepare($connection, string $stmt_name, string $query = UNKNOWN) {} +function pg_prepare($pgsql, string $stmt, string $query = UNKNOWN) {} /** - * @param resource|string $connection + * @param resource|string $pgsql * @param string|array $stmt_name * @return resource|false */ -function pg_execute($connection, $stmt_name, array $params = UNKNOWN) {} +function pg_execute($pgsql, $stmt, array $params = UNKNOWN) {} /** @param resource $result */ function pg_num_rows($result): int {} @@ -111,44 +111,44 @@ function pg_affected_rows($result): int {} */ function pg_cmdtuples($result): int {} -/** @param resource $connection */ -function pg_last_notice($connection, int $option = PGSQL_NOTICE_LAST): array|string|bool {} +/** @param resource $pgsql */ +function pg_last_notice($pgsql, int $type = PGSQL_NOTICE_LAST): array|string|bool {} /** @param resource $result */ -function pg_field_table($result, int $field_number, bool $oid_only = false): string|int|false {} +function pg_field_table($result, int $index, bool $oid_only = false): string|int|false {} /** @param resource $result */ -function pg_field_name($result, int $field_number): string {} +function pg_field_name($result, int $index): string {} /** * @param resource $result * @alias pg_field_name * @deprecated */ -function pg_fieldname($result, int $field_number): string {} +function pg_fieldname($result, int $index): string {} /** @param resource $result */ -function pg_field_size($result, int $field_number): int {} +function pg_field_size($result, int $index): int {} /** * @param resource $result * @alias pg_field_size * @deprecated */ -function pg_fieldsize($result, int $field_number): int {} +function pg_fieldsize($result, int $index): int {} /** @param resource $result */ -function pg_field_type($result, int $field_number): string {} +function pg_field_type($result, int $index): string {} /** * @param resource $result * @alias pg_field_type * @deprecated */ -function pg_fieldtype($result, int $field_number): string {} +function pg_fieldtype($result, int $index): string {} /** @param resource $result */ -function pg_field_type_oid($result, int $field_number): string|int {} +function pg_field_type_oid($result, int $index): string|int {} /** @param resource $result */ function pg_field_num($result, string $field_name): int {} @@ -162,72 +162,72 @@ function pg_fieldnum($result, string $field_name): int {} /** * @param resource $result - * @param string|int $row_number + * @param string|int $row */ -function pg_fetch_result($result, $row_number, string|int $field = UNKNOWN): string|false|null {} +function pg_fetch_result($result, $row, string|int $field = UNKNOWN): string|false|null {} /** * @param resource $result - * @param string|int $row_number + * @param string|int $row * @alias pg_fetch_result * @deprecated */ -function pg_result($result, $row_number, string|int $field = UNKNOWN): string|false|null {} +function pg_result($result, $row, string|int $field = UNKNOWN): string|false|null {} /** * @param resource $result */ -function pg_fetch_row($result, ?int $row_number = null, int $result_type = PGSQL_NUM): array|false {} +function pg_fetch_row($result, ?int $row = null, int $result_type = PGSQL_NUM): array|false {} /** * @param resource $result */ -function pg_fetch_assoc($result, ?int $row_number = null): array|false {} +function pg_fetch_assoc($result, ?int $row = null): array|false {} /** * @param resource $result */ -function pg_fetch_array($result, ?int $row_number = null, int $result_type = PGSQL_BOTH): array|false {} +function pg_fetch_array($result, ?int $row = null, int $mode = PGSQL_BOTH): array|false {} /** @param resource $result */ -function pg_fetch_object($result, ?int $row_number = null, string $class_name = "stdClass", ?array $ctor_params = null): object|false {} +function pg_fetch_object($result, ?int $row = null, string $class = "stdClass", ?array $constructor_args = null): object|false {} /** @param resource $result */ -function pg_fetch_all($result, int $result_type = PGSQL_ASSOC): array {} +function pg_fetch_all($result, int $mode = PGSQL_ASSOC): array {} /** @param resource $result */ -function pg_fetch_all_columns($result, int $field_number = 0): array {} +function pg_fetch_all_columns($result, int $index = 0): array {} /** @param resource $result */ -function pg_result_seek($result, int $row_number): bool {} +function pg_result_seek($result, int $row): bool {} /** * @param resource $result - * @param string|int $row_number + * @param string|int $row */ -function pg_field_prtlen($result, $row_number, string|int $field = UNKNOWN): int|false {} +function pg_field_prtlen($result, $row, string|int $field = UNKNOWN): int|false {} /** * @param resource $result - * @param string|int $row_number + * @param string|int $row * @alias pg_field_prtlen * @deprecated */ -function pg_fieldprtlen($result, $row_number, string|int $field = UNKNOWN): int|false {} +function pg_fieldprtlen($result, $row, string|int $field = UNKNOWN): int|false {} /** * @param resource $result - * @param string|int $row_number + * @param string|int $row */ -function pg_field_is_null($result, $row_number, string|int $field = UNKNOWN): int|false {} +function pg_field_is_null($result, $row, string|int $field = UNKNOWN): int|false {} /** * @param resource $result - * @param string|int $row_number + * @param string|int $row * @alias pg_field_is_null * @deprecated */ -function pg_fieldisnull($result, $row_number, string|int $field = UNKNOWN): int|false {} +function pg_fieldisnull($result, $row, string|int $field = UNKNOWN): int|false {} /** @param resource $result */ function pg_free_result($result): bool {} @@ -249,55 +249,55 @@ function pg_last_oid($result): string|int|false {} */ function pg_getlastoid($result): string|int|false {} -/** @param resource|null $connection */ -function pg_trace(string $filename, string $mode = "w", $connection = null): bool {} +/** @param resource|null $pgsql */ +function pg_trace(string $filename, string $mode = "w", $pgsql = null): bool {} -/** @param resource|null $connection */ -function pg_untrace($connection = null): bool {} +/** @param resource|null $pgsql */ +function pg_untrace($pgsql = null): bool {} /** - * @param resource $connection - * @param string|int $large_object_id + * @param resource $pgsql + * @param string|int $object_id */ -function pg_lo_create($connection = UNKNOWN, $large_object_id = UNKNOWN): string|int|false {} +function pg_lo_create($pgsql = UNKNOWN, $object_id = UNKNOWN): string|int|false {} /** - * @param resource $connection - * @param string|int $large_object_id + * @param resource $pgsql + * @param string|int $object_id * @alias pg_lo_create * @deprecated */ -function pg_locreate($connection = UNKNOWN, $large_object_id = UNKNOWN): string|int|false {} +function pg_locreate($pgsql = UNKNOWN, $object_id = UNKNOWN): string|int|false {} /** - * @param resource $connection - * @param string|int $large_object_id + * @param resource $pgsql + * @param string|int $object_id */ -function pg_lo_unlink($connection, $large_object_id = UNKNOWN): bool {} +function pg_lo_unlink($pgsql, $object_id = UNKNOWN): bool {} /** - * @param resource $connection - * @param string|int $large_object_id + * @param resource $pgsql + * @param string|int $object_id * @alias pg_lo_unlink * @deprecated */ -function pg_lounlink($connection, $large_object_id = UNKNOWN): bool {} +function pg_lounlink($pgsql, $object_id = UNKNOWN): bool {} /** - * @param resource $connection - * @param string|int $large_object_id + * @param resource $pgsql + * @param string|int $object_id * @return resource|false */ -function pg_lo_open($connection, $large_object_id = UNKNOWN, string $mode = UNKNOWN) {} +function pg_lo_open($pgsql, $object_id = UNKNOWN, string $mode = UNKNOWN) {} /** - * @param resource $connection - * @param string|int $large_object_id + * @param resource $pgsql + * @param string|int $object_id * @return resource|false * @alias pg_lo_open * @deprecated */ -function pg_loopen($connection, $large_object_id = UNKNOWN, string $mode = UNKNOWN) {} +function pg_loopen($pgsql, $object_id = UNKNOWN, string $mode = UNKNOWN) {} /** @param resource $large_object */ function pg_lo_close($large_object): bool {} @@ -340,43 +340,43 @@ function pg_lo_read_all($large_object): int {} function pg_loreadall($large_object): int {} /** - * @param resource|string $connection + * @param resource|string $pgsql * @param string|int $filename - * @param string|int $large_object_id + * @param string|int $object_id * @return resource|false */ -function pg_lo_import($connection, $filename = UNKNOWN, $large_object_id = UNKNOWN): string|int|false {} +function pg_lo_import($pgsql, $filename = UNKNOWN, $object_id = UNKNOWN): string|int|false {} /** - * @param resource|string $connection + * @param resource|string $pgsql * @param string|int $filename - * @param string|int $large_object_id + * @param string|int $object_id * @return resource|false * @alias pg_lo_import * @deprecated */ -function pg_loimport($connection, $filename = UNKNOWN, $large_object_id = UNKNOWN): string|int|false {} +function pg_loimport($pgsql, $filename = UNKNOWN, $object_id = UNKNOWN): string|int|false {} /** - * @param resource|string|int $connection - * @param string|int $large_object_id + * @param resource|string|int $pgsql + * @param string|int $object_id * @param string|int $filename * @return resource|false */ -function pg_lo_export($connection, $large_object_id = UNKNOWN, $filename = UNKNOWN): bool {} +function pg_lo_export($pgsql, $object_id = UNKNOWN, $filename = UNKNOWN): bool {} /** - * @param resource|string|int $connection - * @param string|int $large_object_id + * @param resource|string|int $pgsql + * @param string|int $object_id * @param string|int $filename * @return resource|false * @alias pg_lo_export * @deprecated */ -function pg_loexport($connection, $large_object_id = UNKNOWN, $filename = UNKNOWN): bool {} +function pg_loexport($pgsql, $object_id = UNKNOWN, $filename = UNKNOWN): bool {} /** @param resource $large_object */ -function pg_lo_seek($large_object, int $offset, int $whence = SEEK_CUR): bool {} +function pg_lo_seek($large_object, int $offset, int $start = SEEK_CUR): bool {} /** @param resource $large_object */ function pg_lo_tell($large_object): int {} @@ -384,54 +384,54 @@ function pg_lo_tell($large_object): int {} /** @param resource $large_object */ function pg_lo_truncate($large_object, int $size): bool {} -/** @param resource|int $connection */ -function pg_set_error_verbosity($connection, int $verbosity = UNKNOWN): int|false {} +/** @param resource|int $pgsql */ +function pg_set_error_verbosity($pgsql, int $verbosity = UNKNOWN): int|false {} -/** @param resource|string $connection */ -function pg_set_client_encoding($connection, string $encoding = UNKNOWN): int {} +/** @param resource|string $pgsql */ +function pg_set_client_encoding($pgsql, string $encoding = UNKNOWN): int {} /** - * @param resource|string $connection + * @param resource|string $pgsql * @alias pg_set_client_encoding * @deprecated */ -function pg_setclientencoding($connection, string $encoding = UNKNOWN): int {} +function pg_setclientencoding($pgsql, string $encoding = UNKNOWN): int {} -/** @param resource|null $connection */ -function pg_client_encoding($connection = null): string {} +/** @param resource|null $pgsql */ +function pg_client_encoding($pgsql = null): string {} /** - * @param resource|null $connection + * @param resource|null $pgsql * @alias pg_client_encoding * @deprecated */ -function pg_clientencoding($connection = null): string {} +function pg_clientencoding($pgsql = null): string {} -/** @param resource|null $connection */ -function pg_end_copy($connection = null): bool {} +/** @param resource|null $pgsql */ +function pg_end_copy($pgsql = null): bool {} -/** @param resource|string $connection */ -function pg_put_line($connection, string $query = UNKNOWN): bool {} +/** @param resource|string $pgsql */ +function pg_put_line($pgsql, string $query = UNKNOWN): bool {} -/** @param resource $connection */ -function pg_copy_to($connection, string $table_name, string $delimiter = "\t", string $null_as = "\\\\N"): array|false {} +/** @param resource $pgsql */ +function pg_copy_to($pgsql, string $table_name, string $delimiter = "\t", string $null_as = "\\\\N"): array|false {} -/** @param resource $connection */ -function pg_copy_from($connection, string $table_name, array $rows, string $delimiter = "\t", string $null_as = "\\\\N"): bool {} +/** @param resource $pgsql */ +function pg_copy_from($pgsql, string $table_name, array $rows, string $delimiter = "\t", string $null_as = "\\\\N"): bool {} -/** @param resource|string $connection */ -function pg_escape_string($connection, string $data = UNKNOWN): string {} +/** @param resource|string $pgsql */ +function pg_escape_string($pgsql, string $string = UNKNOWN): string {} -/** @param resource|string $connection */ -function pg_escape_bytea($connection, string $data = UNKNOWN): string {} +/** @param resource|string $pgsql */ +function pg_escape_bytea($pgsql, string $data = UNKNOWN): string {} function pg_unescape_bytea(?string $data = null): string {} -/** @param resource|string $connection */ -function pg_escape_literal($connection, string $data = UNKNOWN): string|false {} +/** @param resource|string $pgsql */ +function pg_escape_literal($pgsql, string $string = UNKNOWN): string|false {} -/** @param resource|string $connection */ -function pg_escape_identifier($connection, string $data = UNKNOWN): string|false {} +/** @param resource|string $pgsql */ +function pg_escape_identifier($pgsql, string $identifier = UNKNOWN): string|false {} /** @param resource $result */ function pg_result_error($result): string|false {} @@ -439,77 +439,77 @@ function pg_result_error($result): string|false {} /** @param resource $result */ function pg_result_error_field($result, int $fieldcode): string|false|null {} -/** @param resource $connection */ -function pg_connection_status($connection): int {} +/** @param resource $pgsql */ +function pg_connection_status($pgsql): int {} -/** @param resource $connection */ -function pg_transaction_status($connection): int {} +/** @param resource $pgsql */ +function pg_transaction_status($pgsql): int {} -/** @param resource $connection */ -function pg_connection_reset($connection): bool {} +/** @param resource $pgsql */ +function pg_connection_reset($pgsql): bool {} -/** @param resource $connection */ -function pg_cancel_query($connection): bool {} +/** @param resource $pgsql */ +function pg_cancel_query($pgsql): bool {} -/** @param resource $connection */ -function pg_connection_busy($connection): bool {} +/** @param resource $pgsql */ +function pg_connection_busy($pgsql): bool {} -/** @param resource $connection */ -function pg_send_query($connection, string $query): int|bool {} +/** @param resource $pgsql */ +function pg_send_query($pgsql, string $query): int|bool {} -/** @param resource $connection */ -function pg_send_query_params($connection, string $query, array $params): int|bool {} +/** @param resource $pgsql */ +function pg_send_query_params($pgsql, string $query, array $params): int|bool {} -/** @param resource $connection */ -function pg_send_prepare($connection, string $stmtname, string $query): int|bool {} +/** @param resource $pgsql */ +function pg_send_prepare($pgsql, string $stmtname, string $query): int|bool {} -/** @param resource $connection */ -function pg_send_execute($connection, string $query, array $params): int|bool {} +/** @param resource $pgsql */ +function pg_send_execute($pgsql, string $query, array $params): int|bool {} /** - * @param resource $connection + * @param resource $pgsql * @return resource|false */ -function pg_get_result($connection) {} +function pg_get_result($pgsql) {} /** @param resource $result */ -function pg_result_status($result, int $result_type = PGSQL_STATUS_LONG): string|int {} +function pg_result_status($result, int $type = PGSQL_STATUS_LONG): string|int {} /** @param resource $result */ -function pg_get_notify($result, int $result_type = PGSQL_ASSOC): array|false {} +function pg_get_notify($result, int $type = PGSQL_ASSOC): array|false {} -/** @param resource $connection */ -function pg_get_pid($connection): int {} +/** @param resource $pgsql */ +function pg_get_pid($pgsql): int {} /** - * @param resource $connection + * @param resource $pgsql * @return resource|false */ -function pg_socket($connection) {} +function pg_socket($pgsql) {} -/** @param resource $connection */ -function pg_consume_input($connection): bool {} +/** @param resource $pgsql */ +function pg_consume_input($pgsql): bool {} -/** @param resource $connection */ -function pg_flush($connection): int|bool {} +/** @param resource $pgsql */ +function pg_flush($pgsql): int|bool {} -/** @param resource $connection */ -function pg_meta_data($connection, string $table_name, bool $extended = false): array|false {} +/** @param resource $pgsql */ +function pg_meta_data($pgsql, string $table_name, bool $extended = false): array|false {} -/** @param resource $connection */ -function pg_convert($connection, string $table_name, array $values, int $options = 0): array|false {} +/** @param resource $pgsql */ +function pg_convert($pgsql, string $table_name, array $values, int $options = 0): array|false {} /** - * @param resource $connection + * @param resource $pgsql * @return resource|string|bool */ -function pg_insert($connection, string $table_name, array $values, int $options = 0) {} +function pg_insert($pgsql, string $table, array $values, int $flags = 0) {} -/** @param resource $connection */ -function pg_update($connection, string $table_name, array $values, array $ids, int $options = 0): string|bool {} +/** @param resource $pgsql */ +function pg_update($pgsql, string $table, array $values, array $ids, int $flags = 0): string|bool {} -/** @param resource $connection */ -function pg_delete($connection, string $table_name, array $ids, int $options = 0): string|bool {} +/** @param resource $pgsql */ +function pg_delete($pgsql, string $table, array $ids, int $flags = 0): string|bool {} -/** @param resource $connection */ -function pg_select($connection, string $table_name, array $ids, int $options = 0, int $result_type = PGSQL_ASSOC): array|string|false {} +/** @param resource $pgsql */ +function pg_select($pgsql, string $table, array $ids, int $flags = 0, int $result_type = PGSQL_ASSOC): array|string|false {} From f43c893ef33ab566cdf288ae6a0ec7dc124839d7 Mon Sep 17 00:00:00 2001 From: Larry Garfield Date: Thu, 8 Oct 2020 18:33:00 -0500 Subject: [PATCH 2/4] Fix over-aggressive find/replace. --- ext/pgsql/pgsql.stub.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/pgsql/pgsql.stub.php b/ext/pgsql/pgsql.stub.php index 63bd2f29b2408..827f943700666 100644 --- a/ext/pgsql/pgsql.stub.php +++ b/ext/pgsql/pgsql.stub.php @@ -3,10 +3,10 @@ /** @generate-function-entries */ /** @return resource|false */ -function pg_connect(string $pgsql_string, int $pgsql_type = 0) {} +function pg_connect(string $connection_string, int $pgsql_type = 0) {} /** @return resource|false */ -function pg_pconnect(string $pgsql_string, int $pgsql_type = 0) {} +function pg_pconnect(string $connection_string, int $pgsql_type = 0) {} /** @param resource $pgsql */ function pg_connect_poll($pgsql): int {} From e3867802033123eb28bf83cf56ffbcb4a6c0bf45 Mon Sep 17 00:00:00 2001 From: Larry Garfield Date: Thu, 8 Oct 2020 19:01:19 -0500 Subject: [PATCH 3/4] Fix args and generate arginfo.h --- ext/pgsql/pgsql.stub.php | 2 +- ext/pgsql/pgsql_arginfo.h | 158 ++++++++++++++++++++------------------ 2 files changed, 83 insertions(+), 77 deletions(-) diff --git a/ext/pgsql/pgsql.stub.php b/ext/pgsql/pgsql.stub.php index 827f943700666..80aa3e8c56c05 100644 --- a/ext/pgsql/pgsql.stub.php +++ b/ext/pgsql/pgsql.stub.php @@ -76,7 +76,7 @@ function pg_prepare($pgsql, string $stmt, string $query = UNKNOWN) {} /** * @param resource|string $pgsql - * @param string|array $stmt_name + * @param string|array $stmt * @return resource|false */ function pg_execute($pgsql, $stmt, array $params = UNKNOWN) {} diff --git a/ext/pgsql/pgsql_arginfo.h b/ext/pgsql/pgsql_arginfo.h index a0f267c8ff896..66d38cc3a9f8b 100644 --- a/ext/pgsql/pgsql_arginfo.h +++ b/ext/pgsql/pgsql_arginfo.h @@ -1,23 +1,23 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 9735dbc8a4ca642ee825ae8942470ac2dec89f50 */ + * Stub hash: aea739c1365f454ff44634f866dbae99a2b36575 */ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_connect, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, connection_string, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, connection_type, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pgsql_type, IS_LONG, 0, "0") ZEND_END_ARG_INFO() #define arginfo_pg_pconnect arginfo_pg_connect ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_connect_poll, 0, 1, IS_LONG, 0) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_close, 0, 0, _IS_BOOL, 0) - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, connection, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, pgsql, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_dbname, 0, 0, IS_STRING, 0) - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, connection, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, pgsql, "null") ZEND_END_ARG_INFO() #define arginfo_pg_last_error arginfo_pg_dbname @@ -33,38 +33,38 @@ ZEND_END_ARG_INFO() #define arginfo_pg_host arginfo_pg_dbname ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_version, 0, 0, IS_ARRAY, 0) - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, connection, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, pgsql, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_parameter_status, 0, 1, MAY_BE_STRING|MAY_BE_FALSE) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_ARG_TYPE_INFO(0, param_name, IS_STRING, 0) ZEND_END_ARG_INFO() #define arginfo_pg_ping arginfo_pg_close ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_query, 0, 0, 1) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0) ZEND_END_ARG_INFO() #define arginfo_pg_exec arginfo_pg_query ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_query_params, 0, 0, 2) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_ARG_INFO(0, query) ZEND_ARG_TYPE_INFO(0, params, IS_ARRAY, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_prepare, 0, 0, 2) - ZEND_ARG_INFO(0, connection) - ZEND_ARG_TYPE_INFO(0, stmt_name, IS_STRING, 0) + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_TYPE_INFO(0, stmt, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_execute, 0, 0, 2) - ZEND_ARG_INFO(0, connection) - ZEND_ARG_INFO(0, stmt_name) + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_INFO(0, stmt) ZEND_ARG_TYPE_INFO(0, params, IS_ARRAY, 0) ZEND_END_ARG_INFO() @@ -83,26 +83,26 @@ ZEND_END_ARG_INFO() #define arginfo_pg_cmdtuples arginfo_pg_num_rows ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_last_notice, 0, 1, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_BOOL) - ZEND_ARG_INFO(0, connection) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, option, IS_LONG, 0, "PGSQL_NOTICE_LAST") + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "PGSQL_NOTICE_LAST") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_field_table, 0, 2, MAY_BE_STRING|MAY_BE_LONG|MAY_BE_FALSE) ZEND_ARG_INFO(0, result) - ZEND_ARG_TYPE_INFO(0, field_number, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, oid_only, _IS_BOOL, 0, "false") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_field_name, 0, 2, IS_STRING, 0) ZEND_ARG_INFO(0, result) - ZEND_ARG_TYPE_INFO(0, field_number, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0) ZEND_END_ARG_INFO() #define arginfo_pg_fieldname arginfo_pg_field_name ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_field_size, 0, 2, IS_LONG, 0) ZEND_ARG_INFO(0, result) - ZEND_ARG_TYPE_INFO(0, field_number, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0) ZEND_END_ARG_INFO() #define arginfo_pg_fieldsize arginfo_pg_field_size @@ -113,7 +113,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_field_type_oid, 0, 2, MAY_BE_STRING|MAY_BE_LONG) ZEND_ARG_INFO(0, result) - ZEND_ARG_TYPE_INFO(0, field_number, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_field_num, 0, 2, IS_LONG, 0) @@ -125,7 +125,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_fetch_result, 0, 2, MAY_BE_STRING|MAY_BE_FALSE|MAY_BE_NULL) ZEND_ARG_INFO(0, result) - ZEND_ARG_INFO(0, row_number) + ZEND_ARG_INFO(0, row) ZEND_ARG_TYPE_MASK(0, field, MAY_BE_STRING|MAY_BE_LONG, NULL) ZEND_END_ARG_INFO() @@ -133,46 +133,46 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_fetch_row, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE) ZEND_ARG_INFO(0, result) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, row_number, IS_LONG, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, row, IS_LONG, 1, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, result_type, IS_LONG, 0, "PGSQL_NUM") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_fetch_assoc, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE) ZEND_ARG_INFO(0, result) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, row_number, IS_LONG, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, row, IS_LONG, 1, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_fetch_array, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE) ZEND_ARG_INFO(0, result) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, row_number, IS_LONG, 1, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, result_type, IS_LONG, 0, "PGSQL_BOTH") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, row, IS_LONG, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "PGSQL_BOTH") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_fetch_object, 0, 1, MAY_BE_OBJECT|MAY_BE_FALSE) ZEND_ARG_INFO(0, result) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, row_number, IS_LONG, 1, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class_name, IS_STRING, 0, "\"stdClass\"") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ctor_params, IS_ARRAY, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, row, IS_LONG, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, class, IS_STRING, 0, "\"stdClass\"") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, constructor_args, IS_ARRAY, 1, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_fetch_all, 0, 1, IS_ARRAY, 0) ZEND_ARG_INFO(0, result) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, result_type, IS_LONG, 0, "PGSQL_ASSOC") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "PGSQL_ASSOC") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_fetch_all_columns, 0, 1, IS_ARRAY, 0) ZEND_ARG_INFO(0, result) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, field_number, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, index, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_result_seek, 0, 2, _IS_BOOL, 0) ZEND_ARG_INFO(0, result) - ZEND_ARG_TYPE_INFO(0, row_number, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, row, IS_LONG, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_field_prtlen, 0, 2, MAY_BE_LONG|MAY_BE_FALSE) ZEND_ARG_INFO(0, result) - ZEND_ARG_INFO(0, row_number) + ZEND_ARG_INFO(0, row) ZEND_ARG_TYPE_MASK(0, field, MAY_BE_STRING|MAY_BE_LONG, NULL) ZEND_END_ARG_INFO() @@ -197,28 +197,28 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_trace, 0, 1, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_STRING, 0, "\"w\"") - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, connection, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, pgsql, "null") ZEND_END_ARG_INFO() #define arginfo_pg_untrace arginfo_pg_close ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_lo_create, 0, 0, MAY_BE_STRING|MAY_BE_LONG|MAY_BE_FALSE) - ZEND_ARG_INFO(0, connection) - ZEND_ARG_INFO(0, large_object_id) + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_INFO(0, object_id) ZEND_END_ARG_INFO() #define arginfo_pg_locreate arginfo_pg_lo_create ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_lo_unlink, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, connection) - ZEND_ARG_INFO(0, large_object_id) + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_INFO(0, object_id) ZEND_END_ARG_INFO() #define arginfo_pg_lounlink arginfo_pg_lo_unlink ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_open, 0, 0, 1) - ZEND_ARG_INFO(0, connection) - ZEND_ARG_INFO(0, large_object_id) + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_INFO(0, object_id) ZEND_ARG_TYPE_INFO(0, mode, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -252,16 +252,16 @@ ZEND_END_ARG_INFO() #define arginfo_pg_loreadall arginfo_pg_lo_read_all ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_lo_import, 0, 1, MAY_BE_STRING|MAY_BE_LONG|MAY_BE_FALSE) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_ARG_INFO(0, filename) - ZEND_ARG_INFO(0, large_object_id) + ZEND_ARG_INFO(0, object_id) ZEND_END_ARG_INFO() #define arginfo_pg_loimport arginfo_pg_lo_import ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_lo_export, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, connection) - ZEND_ARG_INFO(0, large_object_id) + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_INFO(0, object_id) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() @@ -270,7 +270,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_lo_seek, 0, 2, _IS_BOOL, 0) ZEND_ARG_INFO(0, large_object) ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, whence, IS_LONG, 0, "SEEK_CUR") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start, IS_LONG, 0, "SEEK_CUR") ZEND_END_ARG_INFO() #define arginfo_pg_lo_tell arginfo_pg_lo_read_all @@ -281,12 +281,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_lo_truncate, 0, 2, _IS_BOOL, ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_set_error_verbosity, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_ARG_TYPE_INFO(0, verbosity, IS_LONG, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_set_client_encoding, 0, 1, IS_LONG, 0) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -299,19 +299,19 @@ ZEND_END_ARG_INFO() #define arginfo_pg_end_copy arginfo_pg_close ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_put_line, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_copy_to, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_ARG_TYPE_INFO(0, table_name, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, delimiter, IS_STRING, 0, "\"\\t\"") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, null_as, IS_STRING, 0, "\"\\\\\\\\N\"") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_copy_from, 0, 3, _IS_BOOL, 0) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_ARG_TYPE_INFO(0, table_name, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, rows, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, delimiter, IS_STRING, 0, "\"\\t\"") @@ -319,22 +319,28 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_copy_from, 0, 3, _IS_BOOL, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_escape_string, 0, 1, IS_STRING, 0) - ZEND_ARG_INFO(0, connection) - ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0) + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0) ZEND_END_ARG_INFO() -#define arginfo_pg_escape_bytea arginfo_pg_escape_string +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_escape_bytea, 0, 1, IS_STRING, 0) + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0) +ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_unescape_bytea, 0, 0, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, data, IS_STRING, 1, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_escape_literal, 0, 1, MAY_BE_STRING|MAY_BE_FALSE) - ZEND_ARG_INFO(0, connection) - ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0) + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0) ZEND_END_ARG_INFO() -#define arginfo_pg_escape_identifier arginfo_pg_escape_literal +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_escape_identifier, 0, 1, MAY_BE_STRING|MAY_BE_FALSE) + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_TYPE_INFO(0, identifier, IS_STRING, 0) +ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_result_error, 0, 1, MAY_BE_STRING|MAY_BE_FALSE) ZEND_ARG_INFO(0, result) @@ -350,7 +356,7 @@ ZEND_END_ARG_INFO() #define arginfo_pg_transaction_status arginfo_pg_connect_poll ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_connection_reset, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_END_ARG_INFO() #define arginfo_pg_cancel_query arginfo_pg_connection_reset @@ -358,18 +364,18 @@ ZEND_END_ARG_INFO() #define arginfo_pg_connection_busy arginfo_pg_connection_reset ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_send_query, 0, 2, MAY_BE_LONG|MAY_BE_BOOL) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_send_query_params, 0, 3, MAY_BE_LONG|MAY_BE_BOOL) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, params, IS_ARRAY, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_send_prepare, 0, 3, MAY_BE_LONG|MAY_BE_BOOL) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_ARG_TYPE_INFO(0, stmtname, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -377,17 +383,17 @@ ZEND_END_ARG_INFO() #define arginfo_pg_send_execute arginfo_pg_send_query_params ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_get_result, 0, 0, 1) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_result_status, 0, 1, MAY_BE_STRING|MAY_BE_LONG) ZEND_ARG_INFO(0, result) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, result_type, IS_LONG, 0, "PGSQL_STATUS_LONG") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "PGSQL_STATUS_LONG") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_get_notify, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE) ZEND_ARG_INFO(0, result) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, result_type, IS_LONG, 0, "PGSQL_ASSOC") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "PGSQL_ASSOC") ZEND_END_ARG_INFO() #define arginfo_pg_get_pid arginfo_pg_connect_poll @@ -397,49 +403,49 @@ ZEND_END_ARG_INFO() #define arginfo_pg_consume_input arginfo_pg_connection_reset ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_flush, 0, 1, MAY_BE_LONG|MAY_BE_BOOL) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_meta_data, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_ARG_TYPE_INFO(0, table_name, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, extended, _IS_BOOL, 0, "false") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_convert, 0, 3, MAY_BE_ARRAY|MAY_BE_FALSE) - ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, pgsql) ZEND_ARG_TYPE_INFO(0, table_name, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, values, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_insert, 0, 0, 3) - ZEND_ARG_INFO(0, connection) - ZEND_ARG_TYPE_INFO(0, table_name, IS_STRING, 0) + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_TYPE_INFO(0, table, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, values, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_update, 0, 4, MAY_BE_STRING|MAY_BE_BOOL) - ZEND_ARG_INFO(0, connection) - ZEND_ARG_TYPE_INFO(0, table_name, IS_STRING, 0) + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_TYPE_INFO(0, table, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, values, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO(0, ids, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_delete, 0, 3, MAY_BE_STRING|MAY_BE_BOOL) - ZEND_ARG_INFO(0, connection) - ZEND_ARG_TYPE_INFO(0, table_name, IS_STRING, 0) + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_TYPE_INFO(0, table, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, ids, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_select, 0, 3, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_FALSE) - ZEND_ARG_INFO(0, connection) - ZEND_ARG_TYPE_INFO(0, table_name, IS_STRING, 0) + ZEND_ARG_INFO(0, pgsql) + ZEND_ARG_TYPE_INFO(0, table, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, ids, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, result_type, IS_LONG, 0, "PGSQL_ASSOC") ZEND_END_ARG_INFO() From c3c6de3ee2c49eabf487be86c0318b8efd65e381 Mon Sep 17 00:00:00 2001 From: Larry Garfield Date: Fri, 9 Oct 2020 09:13:08 -0500 Subject: [PATCH 4/4] Update tests. --- ext/pgsql/tests/03sync_query.phpt | 12 ++++++------ ext/pgsql/tests/09notice.phpt | 2 +- ext/pgsql/tests/bug60244.phpt | 8 ++++---- ext/pgsql/tests/pg_insert_002.phpt | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ext/pgsql/tests/03sync_query.phpt b/ext/pgsql/tests/03sync_query.phpt index cc3b1b86b98a5..dffef84ebd628 100644 --- a/ext/pgsql/tests/03sync_query.phpt +++ b/ext/pgsql/tests/03sync_query.phpt @@ -136,15 +136,15 @@ echo "OK"; Argument #3 must be greater than or equal to 0 Argument #3 must be less than the number of fields for this result set Argument #3 must be a field name from this result set -pg_fetch_all_columns(): Argument #2 ($field_number) must be greater than or equal to 0 -pg_fetch_all_columns(): Argument #2 ($field_number) must be less than the number of fields for this result set +pg_fetch_all_columns(): Argument #2 ($index) must be greater than or equal to 0 +pg_fetch_all_columns(): Argument #2 ($index) must be less than the number of fields for this result set Argument #2 must be greater than or equal to 0 Argument #2 must be less than the number of fields for this result set Argument #2 must be a field name from this result set -pg_field_name(): Argument #2 ($field_number) must be greater than or equal to 0 -pg_field_name(): Argument #2 ($field_number) must be less than the number of fields for this result set -pg_field_table(): Argument #2 ($field_number) must be greater than or equal to 0 -pg_field_table(): Argument #2 ($field_number) must be less than the number of fields for this result set +pg_field_name(): Argument #2 ($index) must be greater than or equal to 0 +pg_field_name(): Argument #2 ($index) must be less than the number of fields for this result set +pg_field_table(): Argument #2 ($index) must be greater than or equal to 0 +pg_field_table(): Argument #2 ($index) must be less than the number of fields for this result set array(0) { } OK diff --git a/ext/pgsql/tests/09notice.phpt b/ext/pgsql/tests/09notice.phpt index 2b4df446d8f05..c6c6030900488 100644 --- a/ext/pgsql/tests/09notice.phpt +++ b/ext/pgsql/tests/09notice.phpt @@ -72,4 +72,4 @@ bool(true) string(0) "" array(0) { } -pg_last_notice(): Argument #2 ($option) must be one of PGSQL_NOTICE_LAST, PGSQL_NOTICE_ALL, or PGSQL_NOTICE_CLEAR +pg_last_notice(): Argument #2 ($type) must be one of PGSQL_NOTICE_LAST, PGSQL_NOTICE_ALL, or PGSQL_NOTICE_CLEAR diff --git a/ext/pgsql/tests/bug60244.phpt b/ext/pgsql/tests/bug60244.phpt index 4d2f4cbcd773b..888e51129ff56 100644 --- a/ext/pgsql/tests/bug60244.phpt +++ b/ext/pgsql/tests/bug60244.phpt @@ -42,10 +42,10 @@ pg_close($db); ?> --EXPECT-- -pg_fetch_array(): Argument #2 ($row_number) must be greater than or equal to 0 -pg_fetch_assoc(): Argument #2 ($row_number) must be greater than or equal to 0 -pg_fetch_object(): Argument #2 ($row_number) must be greater than or equal to 0 -pg_fetch_row(): Argument #2 ($row_number) must be greater than or equal to 0 +pg_fetch_array(): Argument #2 ($row) must be greater than or equal to 0 +pg_fetch_assoc(): Argument #2 ($row) must be greater than or equal to 0 +pg_fetch_object(): Argument #2 ($row) must be greater than or equal to 0 +pg_fetch_row(): Argument #2 ($row) must be greater than or equal to 0 array(2) { [0]=> string(1) "a" diff --git a/ext/pgsql/tests/pg_insert_002.phpt b/ext/pgsql/tests/pg_insert_002.phpt index 0aa6395cfa0cf..0da2c0569786f 100644 --- a/ext/pgsql/tests/pg_insert_002.phpt +++ b/ext/pgsql/tests/pg_insert_002.phpt @@ -19,7 +19,7 @@ foreach (array('', '.', '..') as $table) { ?> Done --EXPECTF-- -pg_insert(): Argument #2 ($table_name) cannot be empty +pg_insert(): Argument #2 ($table) cannot be empty Warning: pg_insert(): The table name must be specified in %s on line %d bool(false)