Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  intl: report more information about message pattern parse errors

diff --cc ext/intl/msgformat/msgformat.c
index cb625ed0372f2fd06322ee3433c64d7e3a86b8a2,edf69dc52c9f5b0fb033e584135636ac277cb389..fdb366c1b12a85b9e028fce0fe8c4e6fc06a4aff
--- 1/ext/intl/msgformat/msgformat.c
--- 2/ext/intl/msgformat/msgformat.c
+++ b/ext/intl/msgformat/msgformat.c
@@@ -34,6 -36,8 +34,7 @@@ static int msgfmt_ctor(INTERNAL_FUNCTIO
        int         spattern_len = 0;
        zval*       object;
        MessageFormatter_object* mfo;
 -      int zpp_flags = is_constructor ? ZEND_PARSE_PARAMS_THROW : 0;
+       UParseError parse_error;
        intl_error_reset( NULL );
  
        object = return_value;
@@@ -103,9 -129,11 +118,11 @@@ PHP_METHOD( MessageFormatter, __constru
  
        zend_replace_error_handling(EH_THROW, IntlException_ce_ptr, &error_handling);
        return_value = ZEND_THIS;
 -      if (msgfmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1) == FAILURE) {
 +      if (msgfmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU) == FAILURE) {
                if (!EG(exception)) {
-                       zend_throw_exception(IntlException_ce_ptr, "Constructor failed", 0);
+                       zend_string *err = intl_error_get_message(NULL);
+                       zend_throw_exception(IntlException_ce_ptr, ZSTR_VAL(err), intl_error_get_code(NULL));
+                       zend_string_release_ex(err, 0);
                }
        }
        zend_restore_error_handling(&error_handling);

diff --cc ext/intl/msgformat/msgformat_format.c
Simple merge

diff --cc ext/intl/tests/msgfmt_fail2.phpt
index 4061eab3dc4d1f41be9bcb509b30b227983d4c94,0d4a52a64f0ee4c46d366af9a833636b30afcd8c..f604de07276948101065bc0b4dd18fc931046e7b
--- 1/ext/intl/tests/msgfmt_fail2.phpt
--- 2/ext/intl/tests/msgfmt_fail2.phpt
+++ b/ext/intl/tests/msgfmt_fail2.phpt
@@@ -108,25 -78,25 +108,25 @@@ foreach($args as $arg) 
  
  ?>
  --EXPECTF--
 -ArgumentCountError: MessageFormatter::__construct() expects exactly 2 parameters, 0 given in %s on line %d
 -'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 +ArgumentCountError: MessageFormatter::__construct() expects exactly 2 arguments, 0 given in %s on line %d
 +'U_ZERO_ERROR'
  
 -Warning: msgfmt_create() expects exactly 2 parameters, 0 given in %s on line %d
 -'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 +ArgumentCountError: msgfmt_create() expects exactly 2 arguments, 0 given in %s on line %d
 +'U_ZERO_ERROR'
  
 -Warning: MessageFormatter::create() expects exactly 2 parameters, 0 given in %s on line %d
 -'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 +ArgumentCountError: MessageFormatter::create() expects exactly 2 arguments, 0 given in %s on line %d
 +'U_ZERO_ERROR'
  
 -ArgumentCountError: MessageFormatter::__construct() expects exactly 2 parameters, 1 given in %s on line %d
 -'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 +ArgumentCountError: MessageFormatter::__construct() expects exactly 2 arguments, 1 given in %s on line %d
 +'U_ZERO_ERROR'
  
 -Warning: msgfmt_create() expects exactly 2 parameters, 1 given in %s on line %d
 -'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 +ArgumentCountError: msgfmt_create() expects exactly 2 arguments, 1 given in %s on line %d
 +'U_ZERO_ERROR'
  
 -Warning: MessageFormatter::create() expects exactly 2 parameters, 1 given in %s on line %d
 -'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 +ArgumentCountError: MessageFormatter::create() expects exactly 2 arguments, 1 given in %s on line %d
 +'U_ZERO_ERROR'
  
- IntlException: Constructor failed in %s on line %d
+ IntlException: msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR in %s on line %d
  'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR'
  'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR'
  'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR'
@@@ -136,21 -106,21 +136,21 @@@ IntlException: msgfmt_create: message f
  'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR'
  'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR'
  
 -TypeError: MessageFormatter::__construct() expects parameter 1 to be string, array given in %s on line %d
 -'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 +TypeError: MessageFormatter::__construct(): Argument #1 ($locale) must be of type string, array given in %s on line %d
 +'U_ZERO_ERROR'
  
 -Warning: MessageFormatter::create() expects parameter 1 to be string, array given in %s on line %d
 -'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 +TypeError: MessageFormatter::create(): Argument #1 ($locale) must be of type string, array given in %s on line %d
 +'U_ZERO_ERROR'
  
 -Warning: msgfmt_create() expects parameter 1 to be string, array given in %s on line %d
 -'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 +TypeError: msgfmt_create(): Argument #1 ($locale) must be of type string, array given in %s on line %d
 +'U_ZERO_ERROR'
  
- IntlException: Constructor failed in %s on line %d
- 'msgfmt_create: message formatter creation failed: U_PATTERN_SYNTAX_ERROR'
- 'msgfmt_create: message formatter creation failed: U_PATTERN_SYNTAX_ERROR'
- 'msgfmt_create: message formatter creation failed: U_PATTERN_SYNTAX_ERROR'
+ IntlException: pattern syntax error (parse error at offset 1, after "{", before or at "0,choice}"): U_PATTERN_SYNTAX_ERROR in %s on line %d
+ 'pattern syntax error (parse error at offset 1, after "{", before or at "0,choice}"): U_PATTERN_SYNTAX_ERROR'
+ 'pattern syntax error (parse error at offset 1, after "{", before or at "0,choice}"): U_PATTERN_SYNTAX_ERROR'
+ 'pattern syntax error (parse error at offset 1, after "{", before or at "0,choice}"): U_PATTERN_SYNTAX_ERROR'
  
- IntlException: Constructor failed in %s on line %d
+ IntlException: msgfmt_create: message formatter creation failed: U_UNMATCHED_BRACES in %s on line %d
  'msgfmt_create: message formatter creation failed: U_UNMATCHED_BRACES'
  'msgfmt_create: message formatter creation failed: U_UNMATCHED_BRACES'
  'msgfmt_create: message formatter creation failed: U_UNMATCHED_BRACES'