From 2e75a8de674060778af9fef81a587ee6a342f6fc Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Tue, 23 Jul 2024 00:25:34 +0200 Subject: [PATCH 1/2] Fix test on Alpine/Musl When libxml uses musl iconv, GBK encoding is not supported as a target encoding --- .../tests/xmlwriter_toStream_encoding_gbk.phpt | 18 ------------------ .../xmlwriter_toStream_encoding_shiftjis.phpt | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 ext/xmlwriter/tests/xmlwriter_toStream_encoding_gbk.phpt create mode 100644 ext/xmlwriter/tests/xmlwriter_toStream_encoding_shiftjis.phpt diff --git a/ext/xmlwriter/tests/xmlwriter_toStream_encoding_gbk.phpt b/ext/xmlwriter/tests/xmlwriter_toStream_encoding_gbk.phpt deleted file mode 100644 index a92f3f6c5825a..0000000000000 --- a/ext/xmlwriter/tests/xmlwriter_toStream_encoding_gbk.phpt +++ /dev/null @@ -1,18 +0,0 @@ ---TEST-- -XMLWriter::toStream() with encoding - test GBK ---EXTENSIONS-- -xmlwriter ---FILE-- -startDocument(encoding: "GBK"); -$writer->writeComment("\u{00E9}\u{00E9}\u{00E9}"); -unset($writer); - -?> ---EXPECT-- - - diff --git a/ext/xmlwriter/tests/xmlwriter_toStream_encoding_shiftjis.phpt b/ext/xmlwriter/tests/xmlwriter_toStream_encoding_shiftjis.phpt new file mode 100644 index 0000000000000..4eacb716a3c1f --- /dev/null +++ b/ext/xmlwriter/tests/xmlwriter_toStream_encoding_shiftjis.phpt @@ -0,0 +1,18 @@ +--TEST-- +XMLWriter::toStream() with encoding - test SHIFT-JIS +--EXTENSIONS-- +xmlwriter +--FILE-- +startDocument(encoding: "SHIFT-JIS"); +$writer->writeComment("\u{3041}\u{3041}\u{3041}"); +unset($writer); + +?> +--EXPECT-- + + From 280b5a2732434c0ebe119a6a2a85756d4601aa54 Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Tue, 23 Jul 2024 13:56:07 +0200 Subject: [PATCH 2/2] Adjust encoding name --- .../tests/xmlwriter_toStream_encoding_shiftjis.phpt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/xmlwriter/tests/xmlwriter_toStream_encoding_shiftjis.phpt b/ext/xmlwriter/tests/xmlwriter_toStream_encoding_shiftjis.phpt index 4eacb716a3c1f..eea1a4d5a88b5 100644 --- a/ext/xmlwriter/tests/xmlwriter_toStream_encoding_shiftjis.phpt +++ b/ext/xmlwriter/tests/xmlwriter_toStream_encoding_shiftjis.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLWriter::toStream() with encoding - test SHIFT-JIS +XMLWriter::toStream() with encoding - test SHIFT_JIS --EXTENSIONS-- xmlwriter --FILE-- @@ -8,11 +8,11 @@ xmlwriter $h = fopen("php://output", "w"); $writer = XMLWriter::toStream($h); -$writer->startDocument(encoding: "SHIFT-JIS"); +$writer->startDocument(encoding: "SHIFT_JIS"); $writer->writeComment("\u{3041}\u{3041}\u{3041}"); unset($writer); ?> --EXPECT-- - +