Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  ext/intl: use PATTERN constant name in dateformat errors

Author: devnexen

ext/intl/dateformat/dateformat_create.cpp

@@ -99,7 +99,7 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
 		return FAILURE;
 	}
 	if (date_type == UDAT_PATTERN && time_type != UDAT_PATTERN) {
-		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "time format must be UDAT_PATTERN if date format is UDAT_PATTERN");
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_create: time format must be IntlDateFormatter::PATTERN if date format is IntlDateFormatter::PATTERN", 0);
 		return FAILURE;
 	}
 

ext/intl/tests/gh12243.phpt

@@ -1,5 +1,5 @@
 --TEST--
-GitHub #12043 segfault with IntlDateFormatter::dateType where it equals to UDAT_PATTERN (icu 50) but
+GitHub #12043 segfault with IntlDateFormatter::dateType where it equals to IntlDateFormatter::PATTERN (icu 50) but
 IntldateFormatter::timeType needs to be set as such.
 --EXTENSIONS--
 intl
@@ -21,4 +21,4 @@ try {
 
 ?>
 --EXPECT--
-IntlDateFormatter::__construct(): time format must be UDAT_PATTERN if date format is UDAT_PATTERN
+IntlDateFormatter::__construct(): time format must be IntlDateFormatter::PATTERN if date format is IntlDateFormatter::PATTERN: U_ILLEGAL_ARGUMENT_ERROR