diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2021-01-03 16:20:01 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2021-01-03 16:20:01 +0100 |
| commit | b30462beadc60abaa983acd6613b5c83994f435e (patch) | |
| tree | 34f73d9a7c0f20a3e8390bc2e0365030d11a522a | |
| parent | 533af1eb14dbeb10c83f291b07da62b70d0df8ae (diff) | |
| parent | aab23282fc7089450a04c5146082a630c21bc7e8 (diff) | |
| download | php-git-b30462beadc60abaa983acd6613b5c83994f435e.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix imap stubs
| -rw-r--r-- | ext/imap/php_imap.stub.php | 4 | ||||
| -rw-r--r-- | ext/imap/php_imap_arginfo.h | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ext/imap/php_imap.stub.php b/ext/imap/php_imap.stub.php index 580c79cc9b..bd4b04a121 100644 --- a/ext/imap/php_imap.stub.php +++ b/ext/imap/php_imap.stub.php @@ -13,7 +13,7 @@ function imap_close(IMAPConnection $imap, int $flags = 0): bool {} function imap_num_msg(IMAPConnection $imap): int|false {} -function imap_num_recent(IMAPConnection $imap): int|false {} +function imap_num_recent(IMAPConnection $imap): int {} function imap_headers(IMAPConnection $imap): array|false {} @@ -129,7 +129,7 @@ function imap_sort(IMAPConnection $imap, int $criteria, bool $reverse, int $flag function imap_uid(IMAPConnection $imap, int $message_num): int|false {} -function imap_msgno(IMAPConnection $imap, int $message_uid): int|false {} +function imap_msgno(IMAPConnection $imap, int $message_uid): int {} function imap_list(IMAPConnection $imap, string $reference, string $pattern): array|false {} diff --git a/ext/imap/php_imap_arginfo.h b/ext/imap/php_imap_arginfo.h index d164de3293..f7f999e3d6 100644 --- a/ext/imap/php_imap_arginfo.h +++ b/ext/imap/php_imap_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 6fa602f286cb156c92ead840e149456dc0c07869 */ + * Stub hash: 2b4a654a6a247e59e3213715ecee9c7b837b0249 */ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imap_open, 0, 3, IMAPConnection, MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(0, mailbox, IS_STRING, 0) @@ -26,7 +26,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imap_num_msg, 0, 1, MAY_BE_LONG| ZEND_ARG_OBJ_INFO(0, imap, IMAPConnection, 0) ZEND_END_ARG_INFO() -#define arginfo_imap_num_recent arginfo_imap_num_msg +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_num_recent, 0, 1, IS_LONG, 0) + ZEND_ARG_OBJ_INFO(0, imap, IMAPConnection, 0) +ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imap_headers, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE) ZEND_ARG_OBJ_INFO(0, imap, IMAPConnection, 0) @@ -218,7 +220,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imap_uid, 0, 2, MAY_BE_LONG|MAY_ ZEND_ARG_TYPE_INFO(0, message_num, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imap_msgno, 0, 2, MAY_BE_LONG|MAY_BE_FALSE) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_msgno, 0, 2, IS_LONG, 0) ZEND_ARG_OBJ_INFO(0, imap, IMAPConnection, 0) ZEND_ARG_TYPE_INFO(0, message_uid, IS_LONG, 0) ZEND_END_ARG_INFO() |