Merge pull request #8537 from ppdeblieck/stubfix

Fixed function signatures of imap_delete and imap_undelete
vimeo · Oct 6, 2022 · b6ddcdf · b6ddcdf
2 parents 6051ae7 + 15453d4
commit b6ddcdf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -6017,7 +6017,7 @@
 'imap_close' => ['bool', 'imap'=>'IMAP\Connection', 'flags='=>'int'],
 'imap_create' => ['bool', 'imap'=>'IMAP\Connection', 'mailbox'=>'string'],
 'imap_createmailbox' => ['bool', 'imap'=>'IMAP\Connection', 'mailbox'=>'string'],
-'imap_delete' => ['bool', 'imap'=>'IMAP\Connection', 'message_num'=>'int', 'flags='=>'int'],
+'imap_delete' => ['bool', 'imap'=>'IMAP\Connection', 'message_nums'=>'string', 'flags='=>'int'],
 'imap_deletemailbox' => ['bool', 'imap'=>'IMAP\Connection', 'mailbox'=>'string'],
 'imap_errors' => ['array|false'],
 'imap_expunge' => ['bool', 'imap'=>'IMAP\Connection'],
@@ -6074,7 +6074,7 @@
 'imap_thread' => ['array|false', 'imap'=>'IMAP\Connection', 'flags='=>'int'],
 'imap_timeout' => ['int|bool', 'timeout_type'=>'int', 'timeout='=>'int'],
 'imap_uid' => ['int|false', 'imap'=>'IMAP\Connection', 'message_num'=>'int'],
-'imap_undelete' => ['bool', 'imap'=>'IMAP\Connection', 'message_num'=>'int', 'flags='=>'int'],
+'imap_undelete' => ['bool', 'imap'=>'IMAP\Connection', 'message_nums'=>'string', 'flags='=>'int'],
 'imap_unsubscribe' => ['bool', 'imap'=>'IMAP\Connection', 'mailbox'=>'string'],
 'imap_utf7_decode' => ['string|false', 'string'=>'string'],
 'imap_utf7_encode' => ['string', 'string'=>'string'],

diff --git a/dictionaries/CallMap_81_delta.php b/dictionaries/CallMap_81_delta.php
@@ -270,8 +270,8 @@
         'new' => ['bool', 'imap'=>'IMAP\Connection', 'mailbox'=>'string'],
     ],
     'imap_delete' => [
-        'old' => ['bool', 'imap'=>'resource', 'message_num'=>'int', 'flags='=>'int'],
-        'new' => ['bool', 'imap'=>'IMAP\Connection', 'message_num'=>'int', 'flags='=>'int'],
+        'old' => ['bool', 'imap'=>'resource', 'message_nums'=>'string', 'flags='=>'int'],
+        'new' => ['bool', 'imap'=>'IMAP\Connection', 'message_nums'=>'string', 'flags='=>'int'],
     ],
     'imap_deletemailbox' => [
         'old' => ['bool', 'imap'=>'resource', 'mailbox'=>'string'],
@@ -450,8 +450,8 @@
         'new' => ['int|false', 'imap'=>'IMAP\Connection', 'message_num'=>'int'],
     ],
     'imap_undelete' => [
-        'old' => ['bool', 'imap'=>'resource', 'message_num'=>'int', 'flags='=>'int'],
-        'new' => ['bool', 'imap'=>'IMAP\Connection', 'message_num'=>'int', 'flags='=>'int'],
+        'old' => ['bool', 'imap'=>'resource', 'message_nums'=>'string', 'flags='=>'int'],
+        'new' => ['bool', 'imap'=>'IMAP\Connection', 'message_nums'=>'string', 'flags='=>'int'],
     ],
     'imap_unsubscribe' => [
         'old' => ['bool', 'imap'=>'resource', 'mailbox'=>'string'],

diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -12228,7 +12228,7 @@
     'imap_close' => ['bool', 'imap'=>'resource', 'flags='=>'int'],
     'imap_create' => ['bool', 'imap'=>'resource', 'mailbox'=>'string'],
     'imap_createmailbox' => ['bool', 'imap'=>'resource', 'mailbox'=>'string'],
-    'imap_delete' => ['bool', 'imap'=>'resource', 'message_num'=>'int', 'flags='=>'int'],
+    'imap_delete' => ['bool', 'imap'=>'resource', 'message_nums'=>'string', 'flags='=>'int'],
     'imap_deletemailbox' => ['bool', 'imap'=>'resource', 'mailbox'=>'string'],
     'imap_errors' => ['array|false'],
     'imap_expunge' => ['bool', 'imap'=>'resource'],
@@ -12285,7 +12285,7 @@
     'imap_thread' => ['array|false', 'imap'=>'resource', 'flags='=>'int'],
     'imap_timeout' => ['int|bool', 'timeout_type'=>'int', 'timeout='=>'int'],
     'imap_uid' => ['int|false', 'imap'=>'resource', 'message_num'=>'int'],
-    'imap_undelete' => ['bool', 'imap'=>'resource', 'message_num'=>'int', 'flags='=>'int'],
+    'imap_undelete' => ['bool', 'imap'=>'resource', 'message_nums'=>'string', 'flags='=>'int'],
     'imap_unsubscribe' => ['bool', 'imap'=>'resource', 'mailbox'=>'string'],
     'imap_utf7_decode' => ['string|false', 'string'=>'string'],
     'imap_utf7_encode' => ['string', 'string'=>'string'],

diff --git a/tests/Internal/Codebase/InternalCallMapHandlerTest.php b/tests/Internal/Codebase/InternalCallMapHandlerTest.php
@@ -119,11 +119,9 @@ class InternalCallMapHandlerTest extends TestCase
         'imagettfbbox',
         'imagettftext',
         'imagexbm',
-        'imap_delete',
         'imap_open',
         'imap_rfc822_write_address',
         'imap_sort',
-        'imap_undelete',
         'inflate_add',
         'inflate_get_read_len',
         'inflate_get_status',