diff options
author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2019-01-08 18:14:19 +0300 |
---|---|---|
committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2019-01-08 18:14:35 +0300 |
commit | cdd3a018e0bc5ec47f73523fc7b254aac74bc1f6 (patch) | |
tree | b12a3ca869cc9584713f854121c1246bb2edde4e /lib | |
parent | 059ca0f96dc24bd0e2b25e1443486afc0220e5cd (diff) |
FiooFix invalid int type hint for multipart part ids
Fixes https://github.com/nextcloud/mail/issues/1391
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Model/IMAPMessage.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/Model/IMAPMessage.php b/lib/Model/IMAPMessage.php index 96d3a5abc..2d76d2155 100644 --- a/lib/Model/IMAPMessage.php +++ b/lib/Model/IMAPMessage.php @@ -358,10 +358,10 @@ class IMAPMessage implements IMessage, JsonSerializable { /** * @param Horde_Mime_Part $p - * @param int $partNo + * @param mixed $partNo * @throws DoesNotExistException */ - private function getPart(Horde_Mime_Part $p, int $partNo) { + private function getPart(Horde_Mime_Part $p, $partNo) { // ATTACHMENT // Any part with a filename is an attachment, // so an attached text file (type 0) is not mistaken as the message. @@ -479,33 +479,33 @@ class IMAPMessage implements IMessage, JsonSerializable { /** * @param Horde_Mime_Part $part - * @param int $partNo + * @param mixed $partNo * @throws DoesNotExistException */ - private function handleMultiPartMessage(Horde_Mime_Part $part, int $partNo) { + private function handleMultiPartMessage(Horde_Mime_Part $part, $partNo) { $i = 1; foreach ($part->getParts() as $p) { - $this->getPart($p, (int)"$partNo.$i"); + $this->getPart($p, "$partNo.$i"); $i++; } } /** * @param Horde_Mime_Part $p - * @param int $partNo + * @param mixed $partNo * @throws DoesNotExistException */ - private function handleTextMessage(Horde_Mime_Part $p, int $partNo) { + private function handleTextMessage(Horde_Mime_Part $p, $partNo) { $data = $this->loadBodyData($p, $partNo); $this->plainMessage .= trim($data) . "\n\n"; } /** * @param Horde_Mime_Part $p - * @param int $partNo + * @param mixed $partNo * @throws DoesNotExistException */ - private function handleHtmlMessage(Horde_Mime_Part $p, int $partNo) { + private function handleHtmlMessage(Horde_Mime_Part $p, $partNo) { $this->hasHtmlMessage = true; if ($this->loadHtmlMessage) { $data = $this->loadBodyData($p, $partNo); @@ -515,12 +515,12 @@ class IMAPMessage implements IMessage, JsonSerializable { /** * @param Horde_Mime_Part $p - * @param int $partNo + * @param mixed $partNo * @return string * @throws DoesNotExistException * @throws Exception */ - private function loadBodyData(Horde_Mime_Part $p, int $partNo): string { + private function loadBodyData(Horde_Mime_Part $p, $partNo): string { // DECODE DATA $fetch_query = new Horde_Imap_Client_Fetch_Query(); $ids = new Horde_Imap_Client_Ids($this->messageId); |