Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  ext/intl: Sync IntlTimeZone object errors for invalid display types

Author: LamentXU123

NEWS

@@ -14,6 +14,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-22121 (Double free in gdImageSetStyle() after
     overflow-triggered early return). (iliaal)
 
+- Intl:
+  . Fixed IntlTimeZone::getDisplayName() to synchronize object error state
+    for invalid display types. (Weilin Du)
+
 - URI:
   . Add LEXBOR_STATIC to CFLAGS_URI on Windows so ext/uri does not see
     LXB_API as __declspec(dllimport) when linked statically into PHP.

ext/intl/tests/timezone_getDisplayName_error.phpt

@@ -8,8 +8,12 @@ intl
 $tz = IntlTimeZone::createTimeZone('Europe/Lisbon');
 var_dump($tz->getDisplayName(false, -1));
 echo intl_get_error_message(), PHP_EOL;
+var_dump($tz->getErrorCode());
+echo $tz->getErrorMessage(), PHP_EOL;
 
 ?>
 --EXPECT--
 bool(false)
 IntlTimeZone::getDisplayName(): wrong display type: U_ILLEGAL_ARGUMENT_ERROR
+int(1)
+IntlTimeZone::getDisplayName(): wrong display type: U_ILLEGAL_ARGUMENT_ERROR

ext/intl/timezone/timezone_methods.cpp

@@ -483,22 +483,23 @@ U_CFUNC PHP_FUNCTION(intltz_get_display_name)
 		RETURN_THROWS();
 	}
 
+	TIMEZONE_METHOD_FETCH_OBJECT;
+
 	bool found = false;
 	for (int i = 0; !found && i < sizeof(display_types)/sizeof(*display_types); i++) {
 		if (display_types[i] == display_type)
 			found = true;
 	}
 	if (!found) {
-		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "wrong display type");
+		intl_errors_set(TIMEZONE_ERROR_P(to), U_ILLEGAL_ARGUMENT_ERROR,
+			"wrong display type");
 		RETURN_FALSE;
 	}
 
 	if (!locale_str) {
 		locale_str = intl_locale_get_default();
 	}
 
-	TIMEZONE_METHOD_FETCH_OBJECT;
-
 	UnicodeString result;
 	to->utimezone->getDisplayName((UBool)daylight, (TimeZone::EDisplayType)display_type,
 		Locale::createFromName(locale_str), result);