[php-src] master: Merge branch 'PHP-8.0'

Author: Máté Kocsis (kocsismate) Date: 2021-04-26T19:38:57+02:00 Commit: https://github.com/php/php-src/commit/12799847a6d8ca8478b02d5dfdc6aaffe9f2f022 Raw diff: https://github.com/php/php-src/commit/12799847a6d8ca8478b02d5dfdc6aaffe9f2f022.diff Merge branch 'PHP-8.0' * Fix pg_get_notify() parameter name Changed paths: M ext/pgsql/pgsql.stub.php M ext/pgsql/pgsql_arginfo.h Diff: diff --git a/ext/pgsql/pgsql.stub.php b/ext/pgsql/pgsql.stub.php index 65edfd332968..e05c91ebee4e 100644 --- a/ext/pgsql/pgsql.stub.php +++ b/ext/pgsql/pgsql.stub.php @@ -475,8 +475,8 @@ function pg_get_result($connection) {} /** @param resource $result */ function pg_result_status($result, int $mode = PGSQL_STATUS_LONG): string|int {} -/** @param resource $result */ -function pg_get_notify($result, int $mode = PGSQL_ASSOC): array|false {} +/** @param resource $connection */ +function pg_get_notify($connection, int $mode = PGSQL_ASSOC): array|false {} /** @param resource $connection */ function pg_get_pid($connection): int {} diff --git a/ext/pgsql/pgsql_arginfo.h b/ext/pgsql/pgsql_arginfo.h index bb12e2d228bf..970d372cdde4 100644 --- a/ext/pgsql/pgsql_arginfo.h +++ b/ext/pgsql/pgsql_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: c88ced859b9bc6775690361d932c4cec14cb0c64 */ + * Stub hash: 949190bcdea7c4d889d0a7da190cf9aeb80ebaab */ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_connect, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, connection_string, IS_STRING, 0) @@ -386,7 +386,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_result_status, 0, 1, MAY_BE_S 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_INFO(0, connection) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "PGSQL_ASSOC") ZEND_END_ARG_INFO()