diff --git a/UPGRADING b/UPGRADING index 437d3cb34e9..38d6700b58f 100644 --- a/UPGRADING +++ b/UPGRADING @@ -364,6 +364,10 @@ PHP 8.1 UPGRADE NOTES parent::init() with parent::__construct(). RFC: https://wiki.php.net/rfc/deprecations_php_8_1 +- ODBC: + . odbc_result_all() has been deprecated. + RFC: https://wiki.php.net/rfc/deprecations_php_8_1 + - PDO: . The PDO::FETCH_SERIALIZE mode has been deprecated. RFC: https://wiki.php.net/rfc/phase_out_serializable diff --git a/ext/odbc/odbc.stub.php b/ext/odbc/odbc.stub.php index fc19ca259f3..ca0ca2301d7 100644 --- a/ext/odbc/odbc.stub.php +++ b/ext/odbc/odbc.stub.php @@ -60,7 +60,10 @@ function odbc_fetch_row($statement, ?int $row = null): bool {} /** @param resource $statement */ function odbc_result($statement, string|int $field): string|bool|null {} -/** @param resource $statement */ +/** + * @param resource $statement + * @deprecated + */ function odbc_result_all($statement, string $format = ""): int|false {} /** @param resource $statement */ diff --git a/ext/odbc/odbc_arginfo.h b/ext/odbc/odbc_arginfo.h index d766a978208..b374007b652 100644 --- a/ext/odbc/odbc_arginfo.h +++ b/ext/odbc/odbc_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 6d7d8d8f495236297745b9b1087e5cf955976127 */ + * Stub hash: 27a50ba79ed632721ee458527ef543e4b44ee897 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_close_all, 0, 0, IS_VOID, 0) ZEND_END_ARG_INFO() @@ -330,7 +330,7 @@ static const zend_function_entry ext_functions[] = { ZEND_FE(odbc_fetch_into, arginfo_odbc_fetch_into) ZEND_FE(odbc_fetch_row, arginfo_odbc_fetch_row) ZEND_FE(odbc_result, arginfo_odbc_result) - ZEND_FE(odbc_result_all, arginfo_odbc_result_all) + ZEND_DEP_FE(odbc_result_all, arginfo_odbc_result_all) ZEND_FE(odbc_free_result, arginfo_odbc_free_result) ZEND_FE(odbc_connect, arginfo_odbc_connect) ZEND_FE(odbc_pconnect, arginfo_odbc_pconnect) diff --git a/ext/odbc/tests/bug44618.phpt b/ext/odbc/tests/bug44618.phpt index ed838a21fe6..efead0e9951 100644 --- a/ext/odbc/tests/bug44618.phpt +++ b/ext/odbc/tests/bug44618.phpt @@ -59,6 +59,8 @@ array(3) { Warning: odbc_result(): Cannot get data of column #3 (retcode 100) in %s on line %d bool(false) + +Deprecated: Function odbc_result_all() is deprecated in %s on line %d
ID | real1 | text1 |
---|---|---|
1 | 10.02 |