1 files changed, 56 insertions, 166 deletions
diff --git a/ext/imap/php_imap.stub.php b/ext/imap/php_imap.stub.php
index ab3a24b54d..241edd6b47 100644
--- a/ext/imap/php_imap.stub.php
+++ b/ext/imap/php_imap.stub.php
@@ -15,23 +15,14 @@ function imap_reopen($stream_id, string $mailbox, int $options = 0, int $n_retri
  */
 function imap_close($stream_id, int $options = 0): bool {}
 
-/**
- * @param resource $stream_id
- * @return int|false
- */
-function imap_num_msg($stream_id) {}
+/** @param resource $stream_id */
+function imap_num_msg($stream_id): int|false {}
 
-/**
- * @param resource $stream_id
- * @return int|false
- */
-function imap_num_recent($stream_id) {}
+/** @param resource $stream_id */
+function imap_num_recent($stream_id): int|false {}
 
-/**
- * @param resource $stream_id
- * @return array|false
- */
-function imap_headers($stream_id) {}
+/** @param resource $stream_id */
+function imap_headers($stream_id): array|false {}
 
 /**
  * @param resource $stream_id
@@ -41,20 +32,12 @@ function imap_headerinfo($stream_id, int $msg_no, int $from_length = 0, int $sub
 
 function imap_rfc822_parse_headers(string $headers, string $default_host = 'UNKNOWN'): \stdClass {}
 
-/**
- * @return string|false
- */
-function imap_rfc822_write_address(string $mailbox, string $host, string $personal) {}
+function imap_rfc822_write_address(string $mailbox, string $host, string $personal): string|false {}
 
 function imap_rfc822_parse_adrlist(string $address_string, string $default_host): array {}
 
-
-/**
- * @param resource $stream_id
- * @return string|false
- */
-function imap_body($stream_id, int $msg_no, int $options = 0) {}
-
+/** @param resource $stream_id */
+function imap_body($stream_id, int $msg_no, int $options = 0): string|false {}
 
 /**
  * @param resource $stream_id
@@ -62,18 +45,11 @@ function imap_body($stream_id, int $msg_no, int $options = 0) {}
  */
 function imap_bodystruct($stream_id, int $msg_no, string $section) {}
 
-/**
- * @param resource $stream_id
- * @return string|false
- */
-function imap_fetchbody($stream_id, int $msg_no, string $section, int $options = 0) {}
-
-/**
- * @param resource $stream_id
- * @return string|false
- */
-function imap_fetchmime($stream_id, int $msg_no, string $section, int $options = 0) {}
+/** @param resource $stream_id */
+function imap_fetchbody($stream_id, int $msg_no, string $section, int $options = 0): string|false {}
 
+/** @param resource $stream_id */
+function imap_fetchmime($stream_id, int $msg_no, string $section, int $options = 0): string|false {}
 
 /**
  * @param resource $stream_id
@@ -81,11 +57,8 @@ function imap_fetchmime($stream_id, int $msg_no, string $section, int $options =
  */
 function imap_savebody($stream_id, $file, int $msg_no, string $section = '', int $options = 0): bool {}
 
-/**
- * @param resource $stream_id
- * @return string|false
- */
-function imap_fetchheader($stream_id, int $msg_no, int $options = 0) {}
+/** @param resource $stream_id */
+function imap_fetchheader($stream_id, int $msg_no, int $options = 0): string|false {}
 
 /**
  * @param resource $stream_id
@@ -119,11 +92,8 @@ function imap_undelete($stream_id, string $msg_no, int $options = 0): bool {}
  */
 function imap_check($stream_id) {}
 
-/**
- * @param resource $stream_id
- * @return array|false
- */
-function imap_listscan($stream_id, string $ref, string $pattern, string $content) {}
+/** @param resource $stream_id */
+function imap_listscan($stream_id, string $ref, string $pattern, string $content): array|false {}
 
 /**
  * @param resource $stream_id
@@ -135,10 +105,7 @@ function imap_mail_copy($stream_id, string $msglist, string $mailbox, int $optio
  */
 function imap_mail_move($stream_id, string $sequence, string $mailbox, int $options = 0): bool {}
 
-/**
- * @return string|false
- */
-function imap_mail_compose(array $envelope, array $body) {}
+function imap_mail_compose(array $envelope, array $body): string|false {}
 
 /**
  * @param resource $stream_id
@@ -175,25 +142,13 @@ function imap_append($stream_id, string $folder, string $message, string $option
  */
 function imap_ping($stream_id): bool {}
 
-/**
- * @return string|false
- */
-function imap_base64(string $text) {}
+function imap_base64(string $text): string|false {}
 
-/**
- * @return string|false
- */
-function imap_qprint(string $text) {}
+function imap_qprint(string $text): string|false {}
 
-/**
- * @return string|false
- */
-function imap_8bit(string $text) {}
+function imap_8bit(string $text): string|false {}
 
-/**
- * @return string|false
- */
-function imap_binary(string $text) {}
+function imap_binary(string $text): string|false {}
 
 
 function imap_utf8(string $mime_encoded_text): string {}
@@ -219,125 +174,63 @@ function imap_setflag_full($stream_id, string $sequence, string $flag, int $opti
  */
 function imap_clearflag_full($stream_id, string $sequence, string $flag, int $options = 0): bool {}
 
-/**
- * @param resource $stream_id
- * @return array|false
- */
-function imap_sort($stream_id, int $criteria, int $reverse, int $options = 0, string $search_criteria = UNKNOWN, string $charset = UNKNOWN) {}
-
+/** @param resource $stream_id */
+function imap_sort($stream_id, int $criteria, int $reverse, int $options = 0, string $search_criteria = UNKNOWN, string $charset = UNKNOWN): array|false {}
 
-/**
- * @param resource $stream_id
- * @return int|false
- */
-function imap_uid($stream_id, int $msg_no) {}
 
-/**
- * @param resource $stream_id
- * @return int|false
- */
-function imap_msgno($stream_id, int $unique_msg_id) {}
+/** @param resource $stream_id */
+function imap_uid($stream_id, int $msg_no): int|false {}
 
-/**
- * @param resource $stream_id
- * @return array|false
- */
-function imap_list($stream_id, string $ref, string $pattern) {}
+/** @param resource $stream_id */
+function imap_msgno($stream_id, int $unique_msg_id): int|false {}
 
-/**
- * @param resource $stream_id
- * @return array|false
- */
-function imap_lsub($stream_id, string $ref, string $pattern) {}
+/** @param resource $stream_id */
+function imap_list($stream_id, string $ref, string $pattern): array|false {}
 
-/**
- * @param resource $stream_id
- * @return array|false
- */
-function imap_getsubscribed($stream_id, string $ref, string $pattern) {}
+/** @param resource $stream_id */
+function imap_lsub($stream_id, string $ref, string $pattern): array|false {}
 
-/**
- * @param resource $stream_id
- * @return array|false
- */
-function imap_getmailboxes($stream_id, string $ref, string $pattern) {}
+/** @param resource $stream_id */
+function imap_getsubscribed($stream_id, string $ref, string $pattern): array|false {}
 
-/**
- * @param resource $stream_id
- * @return array|false
- */
-function imap_fetch_overview($stream_id, string $sequence, int $options = 0) {}
+/** @param resource $stream_id */
+function imap_getmailboxes($stream_id, string $ref, string $pattern): array|false {}
 
-/**
- * @return array|false
- */
-function imap_alerts() {}
+/** @param resource $stream_id */
+function imap_fetch_overview($stream_id, string $sequence, int $options = 0): array|false {}
 
-/**
- * @return array|false
- */
-function imap_errors() {}
+function imap_alerts(): array|false {}
 
-/**
- * @return string|false
- */
-function imap_last_error() {}
+function imap_errors(): array|false {}
 
+function imap_last_error(): string|false {}
 
-/**
- * @param resource $stream_id
- * @return array|false
- */
-function imap_search($stream_id, string $criteria, int $options = \SE_FREE, string $charset = '') {}
+/** @param resource $stream_id */
+function imap_search($stream_id, string $criteria, int $options = \SE_FREE, string $charset = ''): array|false {}
 
-/**
- * @return string|false
- */
-function imap_utf7_decode(string $buf) {}
+function imap_utf7_decode(string $buf): string|false {}
 
 function imap_utf7_encode(string $buf): string {}
 
 #ifdef HAVE_IMAP_MUTF7
-/**
- * @return string|false
- */
-function imap_utf8_to_mutf7(string $in) {}
+function imap_utf8_to_mutf7(string $in): string|false {}
 
-/**
- * @return string|false
- */
-function imap_mutf7_to_utf8(string $in) {}
+function imap_mutf7_to_utf8(string $in): string|false {}
 #endif
 
-/**
- * @return array|false
- */
-function imap_mime_header_decode(string $str) {}
-
+function imap_mime_header_decode(string $str): array|false {}
 
-/**
- * @param resource $stream_id
- * @return array|false
- */
-function imap_thread($stream_id, int $options = \SE_FREE) {}
+/** @param resource $stream_id */
+function imap_thread($stream_id, int $options = \SE_FREE): array|false {}
 
-/**
- * @return int|bool
- */
-function imap_timeout(int $timeout_type, int $timeout = -1) {}
+function imap_timeout(int $timeout_type, int $timeout = -1): int|bool {}
 
 #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
-/**
- * @param resource $stream_id
- * @return array|false
- */
-function imap_get_quota($stream_id, string $qroot) {}
+/** @param resource $stream_id */
+function imap_get_quota($stream_id, string $qroot): array|false {}
 
-/**
- * @param resource $stream_id
- * @return array|false
- */
-function imap_get_quotaroot($stream_id, string $mbox) {}
+/** @param resource $stream_id */
+function imap_get_quotaroot($stream_id, string $mbox): array|false {}
 
 /**
  * @param resource $stream_id
@@ -349,11 +242,8 @@ function imap_set_quota($stream_id, string $qroot, int $mailbox_size): bool {}
  */
 function imap_setacl($stream_id, string $mailbox, string $id, string $rights): bool {}
 
-/**
- * @param resource $stream_id
- * @return array|false
- */
-function imap_getacl($stream_id, string $mailbox) {}
+/** @param resource $stream_id */
+function imap_getacl($stream_id, string $mailbox): array|false {}
 #endif
 
 function imap_mail(string $to, string $subject, string $message, string $additional_headers = UNKNOWN, string $cc = UNKNOWN, string $bcc = UNKNOWN, string $rpath = UNKNOWN): bool {}