ext/intl: Use ICU U16_APPEND_UNSAFE macro for UTF-16 surrogate pair encoding

LamentXU123 · LamentXU123 · commit 8c2ea16633d8 · 2026-05-06T00:13:25.000+08:00
diff --git a/ext/intl/converter/converter.cpp b/ext/intl/converter/converter.cpp
@@ -167,9 +167,9 @@ static void php_converter_append_toUnicode_target(zval *val, UConverterToUnicode
 			if (lval > 0xFFFF) {
 				/* Supplemental planes U+010000 - U+10FFFF */
 				if (TARGET_CHECK(args, 2)) {
-					/* TODO: Find the ICU call which does this properly */
-					*(args->target++) = (UChar)(((lval - 0x10000) >> 10)   | 0xD800);
-					*(args->target++) = (UChar)(((lval - 0x10000) & 0x3FF) | 0xDC00);
+					int32_t offset = 0;
+					U16_APPEND_UNSAFE(args->target, offset, lval);
+					args->target += offset;
 				}
 				return;
 			}

Original file line number	Diff line number	Diff line change
`@@ -167,9 +167,9 @@ static void php_converter_append_toUnicode_target(zval *val, UConverterToUnicode`
`167`	`167`	`if (lval > 0xFFFF) {`
`168`	`168`	`/* Supplemental planes U+010000 - U+10FFFF */`
`169`	`169`	`if (TARGET_CHECK(args, 2)) {`
`170`		`- /* TODO: Find the ICU call which does this properly */`
`171`		`- *(args->target++) = (UChar)(((lval - 0x10000) >> 10) \| 0xD800);`
`172`		`- *(args->target++) = (UChar)(((lval - 0x10000) & 0x3FF) \| 0xDC00);`
	`170`	`+ int32_t offset = 0;`
	`171`	`+ U16_APPEND_UNSAFE(args->target, offset, lval);`
	`172`	`+ args->target += offset;`
`173`	`173`	`}`
`174`	`174`	`return;`
`175`	`175`	`}`