Merge branch 'PHP-8.4' into PHP-8.5

Author: LamentXU123

NEWS

@@ -24,6 +24,9 @@ PHP                                                                        NEWS
     overflow-triggered early return). (iliaal)
 
 - Intl:
+  . Fix incorrect argument positions for invalid start/end arguments in
+    transliterator_transliterate().
+    (Weilin Du)
   . Fixed IntlTimeZone::getDisplayName() to synchronize object error state
     for invalid display types. (Weilin Du)
 

ext/intl/tests/transliterator_transliterate_error.phpt

@@ -9,17 +9,38 @@ intl.use_exceptions=true
 
 $tr = Transliterator::create("latin");
 
-try {
-	var_dump(transliterator_transliterate($tr, "str", 7));
-} catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+function dump_throwable(callable $callback): void {
+    try {
+        $callback();
+    } catch (Throwable $e) {
+        echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+    }
 }
 
-try {
+//Arguments
+dump_throwable(function() use ($tr) {
+    var_dump(transliterator_transliterate($tr, "str", 7));
+});
+
+dump_throwable(function() use ($tr) {
     transliterator_transliterate($tr, "str", 7, 6);
-} catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
-}
+});
+
+dump_throwable(function() use ($tr) {
+    transliterator_transliterate($tr, "str", 0, -2);
+});
+
+dump_throwable(function() use ($tr) {
+    transliterator_transliterate($tr, "str", -1);
+});
+
+dump_throwable(function() {
+    transliterator_transliterate("latin", "str", -1);
+});
+
+dump_throwable(function() use ($tr) {
+    $tr->transliterate("str", 7, 6);
+});
 
 //bad UTF-8
 try {
@@ -31,5 +52,9 @@ try {
 ?>
 --EXPECT--
 IntlException: transliterator_transliterate(): Neither "start" nor the "end" arguments can exceed the number of UTF-16 code units (in this case, 3)
-ValueError: transliterator_transliterate(): Argument #2 ($string) must be less than or equal to argument #3 ($end)
+ValueError: transliterator_transliterate(): Argument #3 ($start) must be less than or equal to argument #4 ($end)
+ValueError: transliterator_transliterate(): Argument #4 ($end) must be greater than or equal to -1
+ValueError: transliterator_transliterate(): Argument #3 ($start) must be greater than or equal to 0
+ValueError: transliterator_transliterate(): Argument #3 ($start) must be greater than or equal to 0
+ValueError: Transliterator::transliterate(): Argument #2 ($start) must be less than or equal to argument #3 ($end)
 IntlException: transliterator_transliterate(): String conversion of string to UTF-16 failed

ext/intl/transliterator/transliterator_methods.c

@@ -269,14 +269,16 @@ PHP_FUNCTION( transliterator_transliterate )
 	zend_long	start		= 0,
 				limit		= -1;
 	int			success     = 0;
+	bool		is_method;
 	zval 		tmp_object;
 	TRANSLITERATOR_METHOD_INIT_VARS;
 
 	object = getThis();
+	is_method = object != NULL;
 
 	ZVAL_UNDEF(&tmp_object);
 
-	if (object == NULL) {
+	if (!is_method) {
 		/* in non-OOP version, accept both a transliterator and a string */
 		zend_string *arg1_str;
 		zend_object *arg1_obj;
@@ -313,17 +315,17 @@ PHP_FUNCTION( transliterator_transliterate )
 	}
 
 	if (limit < -1) {
-		zend_argument_value_error(object ? 3 : 4, "must be greater than or equal to -1");
+		zend_argument_value_error(is_method ? 3 : 4, "must be greater than or equal to -1");
 		goto cleanup_object;
 	}
 
 	if (start < 0) {
-		zend_argument_value_error(object ? 2 : 3, "must be greater than or equal to 0");
+		zend_argument_value_error(is_method ? 2 : 3, "must be greater than or equal to 0");
 		goto cleanup_object;
 	}
 
 	if (limit != -1 && start > limit) {
-		zend_argument_value_error(object ? 2 : 3, "must be less than or equal to argument #%d ($end)", object ? 3 : 4);
+		zend_argument_value_error(is_method ? 2 : 3, "must be less than or equal to argument #%d ($end)", is_method ? 3 : 4);
 		goto cleanup_object;
 	}