Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 15 Apr 2019 13:28:07 +0000 (15:28 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 15 Apr 2019 13:28:07 +0000 (15:28 +0200)
1  2 
ext/intl/dateformat/dateformat_create.cpp

index fbff95743e88b64b293fcd89e83117fecc5e8286,8c2b72a2daa0173a0b0df69bcba91488924c1cf6..73d8d8c356ed0f772594ad1f27b4e1e583b28039
@@@ -69,9 -70,11 +69,9 @@@ static int datefmt_ctor(INTERNAL_FUNCTI
        intl_error_reset(NULL);
        object = return_value;
        /* Parse parameters. */
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "sll|zzs",
 -      if (zend_parse_parameters_ex(zpp_flags, ZEND_NUM_ARGS(), "s!ll|zzs",
++      if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!ll|zzs",
                        &locale_str, &locale_len, &date_type, &time_type, &timezone_zv,
                        &calendar_zv, &pattern_str, &pattern_str_len) == FAILURE) {
 -              intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_create: "
 -                              "unable to parse input parameters", 0);
                return FAILURE;
        }