From aab23282fc7089450a04c5146082a630c21bc7e8 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Thu, 31 Dec 2020 19:30:11 +0100 Subject: Fix imap stubs Closes GH-6559. --- ext/imap/php_imap.stub.php | 4 ++-- 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 7b3d01afa0..d8b01988df 100644 --- a/ext/imap/php_imap.stub.php +++ b/ext/imap/php_imap.stub.php @@ -21,7 +21,7 @@ function imap_close($imap, int $flags = 0): bool {} function imap_num_msg($imap): int|false {} /** @param resource $imap */ -function imap_num_recent($imap): int|false {} +function imap_num_recent($imap): int {} /** @param resource $imap */ function imap_headers($imap): array|false {} @@ -179,7 +179,7 @@ function imap_sort($imap, int $criteria, bool $reverse, int $flags = 0, ?string function imap_uid($imap, int $message_num): int|false {} /** @param resource $imap */ -function imap_msgno($imap, int $message_uid): int|false {} +function imap_msgno($imap, int $message_uid): int {} /** @param resource $imap */ function imap_list($imap, string $reference, string $pattern): array|false {} diff --git a/ext/imap/php_imap_arginfo.h b/ext/imap/php_imap_arginfo.h index b1ff14da91..027baa2d32 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: 326cb0410034aecc702e9397cd88ef91adaa254c */ + * Stub hash: d6d158112a802d867646b8f85402b8762599180b */ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_open, 0, 0, 3) 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_INFO(0, imap) 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_INFO(0, imap) +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_INFO(0, imap) @@ -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_INFO(0, imap) ZEND_ARG_TYPE_INFO(0, message_uid, IS_LONG, 0) ZEND_END_ARG_INFO() -- cgit v1.2.1