Skip to content

Commit 179030d

Browse files
committed
Fix #81649: imap_(un)delete accept sequences, not single numbers
As such, the parameter name `$message_num` is utmost misleading; it should be `$message_nums` as for other functions. Closes GH-7686.
1 parent f9518c3 commit 179030d

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ PHP NEWS
1919
- GD:
2020
. Fixed bug #71316 (libpng warning from imagecreatefromstring). (cmb)
2121

22+
- IMAP:
23+
. Fixed bug #81649 (imap_(un)delete accept sequences, not single numbers).
24+
(cmb)
25+
2226
- OpenSSL:
2327
. Fixed bug #75725 (./configure: detecting RAND_egd). (Dilyan Palauzov)
2428

ext/imap/php_imap.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ function imap_expunge($imap): bool {}
8181
/**
8282
* @param resource $imap
8383
*/
84-
function imap_delete($imap, string $message_num, int $flags = 0): bool {}
84+
function imap_delete($imap, string $message_nums, int $flags = 0): bool {}
8585

8686
/**
8787
* @param resource $imap
8888
*/
89-
function imap_undelete($imap, string $message_num, int $flags = 0): bool {}
89+
function imap_undelete($imap, string $message_nums, int $flags = 0): bool {}
9090

9191
/** @param resource $imap */
9292
function imap_check($imap): stdClass|false {}

ext/imap/php_imap_arginfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: d6d158112a802d867646b8f85402b8762599180b */
2+
* Stub hash: ec8020febecb370ef2e5f19f00cd092ecb198f8c */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_open, 0, 0, 3)
55
ZEND_ARG_TYPE_INFO(0, mailbox, IS_STRING, 0)
@@ -107,7 +107,7 @@ ZEND_END_ARG_INFO()
107107

108108
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_delete, 0, 2, _IS_BOOL, 0)
109109
ZEND_ARG_INFO(0, imap)
110-
ZEND_ARG_TYPE_INFO(0, message_num, IS_STRING, 0)
110+
ZEND_ARG_TYPE_INFO(0, message_nums, IS_STRING, 0)
111111
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
112112
ZEND_END_ARG_INFO()
113113

0 commit comments

Comments
 (0)