diff --git a/src/PhpImap/Mailbox.php b/src/PhpImap/Mailbox.php index 980f59e6..11144e32 100644 --- a/src/PhpImap/Mailbox.php +++ b/src/PhpImap/Mailbox.php @@ -583,13 +583,7 @@ public function encodeStringToUtf7Imap(string $str): string */ public function decodeStringFromUtf7ImapToUtf8(string $str): string { - $out = imap_utf7_decode($str); - - if (!\is_string($out)) { - throw new UnexpectedValueException('mb_convert_encoding($str, \'UTF-8\', \'UTF7-IMAP\') could not convert $str'); - } - - return $out; + return Imap::decodeStringFromUtf7ImapToUtf8($str); } /** diff --git a/tests/unit/MailboxEncodingTest.php b/tests/unit/MailboxEncodingTest.php index 37225bda..5a8bd62f 100644 --- a/tests/unit/MailboxEncodingTest.php +++ b/tests/unit/MailboxEncodingTest.php @@ -101,4 +101,15 @@ public function testDecodeRFC2231(string $input, string $expected): void $this->assertSame($expected, $mailbox->decodeRFC2231ForTests($input)); } + + public function testDecodeStringFromUtf7ImapToUtf8DecodesMailboxNamesToUtf8(): void + { + $mailbox = new Fixtures\Mailbox('', '', ''); + $encodedMailboxName = '{imap.example.com:993/imap/ssl}INBOX.&bUuL1Q-'; + + $this->assertSame( + '{imap.example.com:993/imap/ssl}INBOX.测试', + $mailbox->decodeStringFromUtf7ImapToUtf8($encodedMailboxName) + ); + } }