From 0a6fdf12488f8f4a5550dac2eb0a9175b0cab6ca Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Thu, 30 Jun 2022 18:18:17 +0900 Subject: [PATCH] Use logged encoding from JSON debug block for non UTF-8 tests --- 4dev/tests/CoreLibsCreateEmailTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/4dev/tests/CoreLibsCreateEmailTest.php b/4dev/tests/CoreLibsCreateEmailTest.php index 21d65cc3..58cc1962 100644 --- a/4dev/tests/CoreLibsCreateEmailTest.php +++ b/4dev/tests/CoreLibsCreateEmailTest.php @@ -562,8 +562,8 @@ final class CoreLibsCreateEmailTest extends TestCase $encoding != 'UTF-8' ? mb_convert_encoding($expected_content[$pos]['body'] ?? '', $encoding, 'UTF-8') : $expected_content[$pos]['body'] ?? 'MISSING BODY', - $encoding != 'UTF-8' ? - mb_convert_encoding($email['body'] ?? '', $encoding, 'UTF-8') : + $email['encoding'] != 'UTF-8' ? + mb_convert_encoding($email['body'] ?? '', $email['encoding'], 'UTF-8') : $email['body'] ?? '', 'Email check: assert body' );