diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-02-17 08:55:18 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-02-17 08:55:18 +0100 |
| commit | 7d0102dfa70ca000af0cd4027e8c07a89ad14de2 (patch) | |
| tree | f4a1009c80c74629fe0763ddae74f4e5aff9a520 /ext/odbc | |
| parent | de6984edd5ce7fa2b2f365b5ae770507ef42022d (diff) | |
| download | php-git-7d0102dfa70ca000af0cd4027e8c07a89ad14de2.tar.gz | |
Revert "Replace @param annotations with type declarations"
This reverts commit c31029f335ca1b453af799805c43c37e959ad555.
Diffstat (limited to 'ext/odbc')
| -rw-r--r-- | ext/odbc/odbc.stub.php | 3 | ||||
| -rw-r--r-- | ext/odbc/odbc_arginfo.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ext/odbc/odbc.stub.php b/ext/odbc/odbc.stub.php index 814b8fba71..9eafe46ae5 100644 --- a/ext/odbc/odbc.stub.php +++ b/ext/odbc/odbc.stub.php @@ -53,8 +53,9 @@ function odbc_fetch_row($result_id, int $row_number = UNKNOWN): bool {} /** * @param resource $result_id + * @param string|int $field */ -function odbc_result($result_id, string|int $field): string|bool|null {} +function odbc_result($result_id, $field): string|bool|null {} /** @param resource $result_id */ function odbc_result_all($result_id, string $format = ''): int|false {} diff --git a/ext/odbc/odbc_arginfo.h b/ext/odbc/odbc_arginfo.h index 1a462ee0dc..41f00cb2a0 100644 --- a/ext/odbc/odbc_arginfo.h +++ b/ext/odbc/odbc_arginfo.h @@ -69,7 +69,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_result, 0, 2, MAY_BE_STRING|MAY_BE_BOOL|MAY_BE_NULL) ZEND_ARG_INFO(0, result_id) - ZEND_ARG_TYPE_MASK(0, field, MAY_BE_STRING|MAY_BE_LONG) + ZEND_ARG_INFO(0, field) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_result_all, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) |