From cc9ab53308d3a70102b086a1953ce3a5f7bf8bf4 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Wed, 14 Jun 2023 07:43:59 +0100 Subject: [PATCH] ext/imap: Narrow return type to true Those functions always return true as of PHP 8.0. --- ext/imap/php_imap.stub.php | 14 +++++++------- ext/imap/php_imap_arginfo.h | 14 ++++++++------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ext/imap/php_imap.stub.php b/ext/imap/php_imap.stub.php index 346ce2d3dc5dc..225675576fe94 100644 --- a/ext/imap/php_imap.stub.php +++ b/ext/imap/php_imap.stub.php @@ -409,7 +409,7 @@ function imap_open(string $mailbox, string $user, #[\SensitiveParameter] string function imap_reopen(IMAP\Connection $imap, string $mailbox, int $flags = 0, int $retries = 0): bool {} - function imap_close(IMAP\Connection $imap, int $flags = 0): bool {} + function imap_close(IMAP\Connection $imap, int $flags = 0): true {} function imap_is_open(IMAP\Connection $imap): bool {} @@ -445,13 +445,13 @@ function imap_fetchheader(IMAP\Connection $imap, int $message_num, int $flags = function imap_fetchstructure(IMAP\Connection $imap, int $message_num, int $flags = 0): \stdClass|false {} - function imap_gc(IMAP\Connection $imap, int $flags): bool {} + function imap_gc(IMAP\Connection $imap, int $flags): true {} - function imap_expunge(IMAP\Connection $imap): bool {} + function imap_expunge(IMAP\Connection $imap): true {} - function imap_delete(IMAP\Connection $imap, string $message_nums, int $flags = 0): bool {} + function imap_delete(IMAP\Connection $imap, string $message_nums, int $flags = 0): true {} - function imap_undelete(IMAP\Connection $imap, string $message_nums, int $flags = 0): bool {} + function imap_undelete(IMAP\Connection $imap, string $message_nums, int $flags = 0): true {} function imap_check(IMAP\Connection $imap): \stdClass|false {} @@ -503,9 +503,9 @@ function imap_status(IMAP\Connection $imap, string $mailbox, int $flags): \stdCl function imap_mailboxmsginfo(IMAP\Connection $imap): \stdClass {} - function imap_setflag_full(IMAP\Connection $imap, string $sequence, string $flag, int $options = 0): bool {} + function imap_setflag_full(IMAP\Connection $imap, string $sequence, string $flag, int $options = 0): true {} - function imap_clearflag_full(IMAP\Connection $imap, string $sequence, string $flag, int $options = 0): bool {} + function imap_clearflag_full(IMAP\Connection $imap, string $sequence, string $flag, int $options = 0): true {} function imap_sort(IMAP\Connection $imap, int $criteria, bool $reverse, int $flags = 0, ?string $search_criteria = null, ?string $charset = null): array|false {} diff --git a/ext/imap/php_imap_arginfo.h b/ext/imap/php_imap_arginfo.h index eb49ae1dfb404..0676dbcf90701 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: c7ef736ea5c4121a4694c24af33fa1672f502c25 */ + * Stub hash: 45b8472a0d18e596a427daf14edbe1ec46bd06ef */ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imap_open, 0, 3, IMAP\\Connection, MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(0, mailbox, IS_STRING, 0) @@ -17,7 +17,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_reopen, 0, 2, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, retries, IS_LONG, 0, "0") ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_close, 0, 1, _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_close, 0, 1, IS_TRUE, 0) ZEND_ARG_OBJ_INFO(0, imap, IMAP\\Connection, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0") ZEND_END_ARG_INFO() @@ -100,14 +100,16 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imap_fetchstructure, 0, 2, s ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0") ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_gc, 0, 2, _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_gc, 0, 2, IS_TRUE, 0) ZEND_ARG_OBJ_INFO(0, imap, IMAP\\Connection, 0) ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0) ZEND_END_ARG_INFO() -#define arginfo_imap_expunge arginfo_imap_is_open +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_expunge, 0, 1, IS_TRUE, 0) + ZEND_ARG_OBJ_INFO(0, imap, IMAP\\Connection, 0) +ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_delete, 0, 2, _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_delete, 0, 2, IS_TRUE, 0) ZEND_ARG_OBJ_INFO(0, imap, IMAP\\Connection, 0) ZEND_ARG_TYPE_INFO(0, message_nums, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0") @@ -199,7 +201,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_imap_mailboxmsginfo, 0, 1, stdCla ZEND_ARG_OBJ_INFO(0, imap, IMAP\\Connection, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_setflag_full, 0, 3, _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_setflag_full, 0, 3, IS_TRUE, 0) ZEND_ARG_OBJ_INFO(0, imap, IMAP\\Connection, 0) ZEND_ARG_TYPE_INFO(0, sequence, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, flag, IS_STRING, 0)