Merge branch 'PHP-8.4'

Author: devnexen

ext/intl/converter/converter.c

@@ -738,13 +738,13 @@ PHP_METHOD(UConverter, transcode) {
 			zval *tmpzval;
 
 			if (U_SUCCESS(error) &&
-				(tmpzval = zend_hash_str_find(Z_ARRVAL_P(options), "from_subst", sizeof("from_subst") - 1)) != NULL &&
+				(tmpzval = zend_hash_str_find_deref(Z_ARRVAL_P(options), "from_subst", sizeof("from_subst") - 1)) != NULL &&
 				Z_TYPE_P(tmpzval) == IS_STRING) {
 				error = U_ZERO_ERROR;
 				ucnv_setSubstChars(src_cnv, Z_STRVAL_P(tmpzval), Z_STRLEN_P(tmpzval) & 0x7F, &error);
 			}
 			if (U_SUCCESS(error) &&
-				(tmpzval = zend_hash_str_find(Z_ARRVAL_P(options), "to_subst", sizeof("to_subst") - 1)) != NULL &&
+				(tmpzval = zend_hash_str_find_deref(Z_ARRVAL_P(options), "to_subst", sizeof("to_subst") - 1)) != NULL &&
 				Z_TYPE_P(tmpzval) == IS_STRING) {
 				error = U_ZERO_ERROR;
 				ucnv_setSubstChars(dest_cnv, Z_STRVAL_P(tmpzval), Z_STRLEN_P(tmpzval) & 0x7F, &error);

ext/intl/tests/uconverter_transcode_references.phpt

@@ -0,0 +1,22 @@
+--TEST--
+UConverter::transcode issue with substitutes values as references
+--EXTENSIONS--
+intl
+--FILE--
+<?php
+$subst = '??';
+$opts = array('from_subst' => '?', 'to_subst' => &$subst);
+var_dump(UConverter::transcode("This is an ascii string", 'ascii', 'utf-8', $opts));
+$opts = array('from_subst' => &$subst, 'to_subst' => '?');
+var_dump(UConverter::transcode("This is an ascii string", 'ascii', 'utf-8', $opts));
+// should yield the same results
+$opts = array('from_subst' => '?', 'to_subst' => '??');
+var_dump(UConverter::transcode("This is an ascii string", 'ascii', 'utf-8', $opts));
+$opts = array('from_subst' => '??', 'to_subst' => '?');
+var_dump(UConverter::transcode("This is an ascii string", 'ascii', 'utf-8', $opts));
+?>
+--EXPECT--
+bool(false)
+string(23) "This is an ascii string"
+bool(false)
+string(23) "This is an ascii string"