Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/PhpImap/Mailbox.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down
11 changes: 11 additions & 0 deletions tests/unit/MailboxEncodingTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);
}
}
Loading