diff options
Diffstat (limited to 'ext/intl')
22 files changed, 110 insertions, 110 deletions
diff --git a/ext/intl/ERROR_CONVENTIONS.md b/ext/intl/ERROR_CONVENTIONS.md index 863b9f1b8d..af2450c818 100644 --- a/ext/intl/ERROR_CONVENTIONS.md +++ b/ext/intl/ERROR_CONVENTIONS.md @@ -114,7 +114,7 @@ U_CFUNC PHP_FUNCTION(breakiter_set_text) &text, &text_len) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "breakiter_set_text: bad arguments", 0); - RETURN_FALSE; + RETURN_THROWS(); } /* ... */ diff --git a/ext/intl/breakiterator/breakiterator_iterators.cpp b/ext/intl/breakiterator/breakiterator_iterators.cpp index af36f3d59e..cd3ef42281 100644 --- a/ext/intl/breakiterator/breakiterator_iterators.cpp +++ b/ext/intl/breakiterator/breakiterator_iterators.cpp @@ -276,7 +276,7 @@ U_CFUNC PHP_METHOD(IntlPartsIterator, getBreakIterator) INTLITERATOR_METHOD_INIT_VARS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } INTLITERATOR_METHOD_FETCH_OBJECT; diff --git a/ext/intl/breakiterator/breakiterator_methods.cpp b/ext/intl/breakiterator/breakiterator_methods.cpp index 25cd03eeb5..3f2dded5ef 100644 --- a/ext/intl/breakiterator/breakiterator_methods.cpp +++ b/ext/intl/breakiterator/breakiterator_methods.cpp @@ -53,7 +53,7 @@ static void _breakiter_factory(const char *func_name, if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!", &locale_str, &dummy) == FAILURE) { - return; + RETURN_THROWS(); } if (locale_str == NULL) { @@ -113,7 +113,7 @@ U_CFUNC PHP_FUNCTION(breakiter_create_code_point_instance) intl_error_reset(NULL); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } CodePointBreakIterator *cpbi = new CodePointBreakIterator(); @@ -126,7 +126,7 @@ U_CFUNC PHP_FUNCTION(breakiter_get_text) object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } BREAKITER_METHOD_FETCH_OBJECT; @@ -146,7 +146,7 @@ U_CFUNC PHP_FUNCTION(breakiter_set_text) object = ZEND_THIS; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &text) == FAILURE) { - return; + RETURN_THROWS(); } BREAKITER_METHOD_FETCH_OBJECT; @@ -178,7 +178,7 @@ static void _breakiter_no_args_ret_int32( object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } BREAKITER_METHOD_FETCH_OBJECT; @@ -199,7 +199,7 @@ static void _breakiter_int32_ret_int32( object = ZEND_THIS; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &arg) == FAILURE) { - return; + RETURN_THROWS(); } BREAKITER_METHOD_FETCH_OBJECT; @@ -273,7 +273,7 @@ U_CFUNC PHP_FUNCTION(breakiter_current) object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } BREAKITER_METHOD_FETCH_OBJECT; @@ -305,7 +305,7 @@ U_CFUNC PHP_FUNCTION(breakiter_is_boundary) if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &offset) == FAILURE) { - return; + RETURN_THROWS(); } if (offset < INT32_MIN || offset > INT32_MAX) { @@ -329,7 +329,7 @@ U_CFUNC PHP_FUNCTION(breakiter_get_locale) object = ZEND_THIS; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &locale_type) == FAILURE) { - return; + RETURN_THROWS(); } if (locale_type != ULOC_ACTUAL_LOCALE && locale_type != ULOC_VALID_LOCALE) { @@ -355,7 +355,7 @@ U_CFUNC PHP_FUNCTION(breakiter_get_parts_iterator) object = ZEND_THIS; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &key_type) == FAILURE) { - return; + RETURN_THROWS(); } if (key_type != PARTS_ITERATOR_KEY_SEQUENTIAL @@ -378,7 +378,7 @@ U_CFUNC PHP_FUNCTION(breakiter_get_error_code) object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } /* Fetch the object (without resetting its last error code ). */ @@ -396,7 +396,7 @@ U_CFUNC PHP_FUNCTION(breakiter_get_error_message) object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } diff --git a/ext/intl/breakiterator/codepointiterator_methods.cpp b/ext/intl/breakiterator/codepointiterator_methods.cpp index eba0c9e8a3..12df794925 100644 --- a/ext/intl/breakiterator/codepointiterator_methods.cpp +++ b/ext/intl/breakiterator/codepointiterator_methods.cpp @@ -31,7 +31,7 @@ U_CFUNC PHP_FUNCTION(cpbi_get_last_code_point) object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } BREAKITER_METHOD_FETCH_OBJECT; diff --git a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp index f90766206e..04031733d9 100644 --- a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp +++ b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp @@ -41,7 +41,7 @@ static void _php_intlrbbi_constructor_body(INTERNAL_FUNCTION_PARAMETERS) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|b", &rules, &rules_len, &compiled) == FAILURE) { - return; + RETURN_THROWS(); } // instantiation of ICU object @@ -101,7 +101,7 @@ U_CFUNC PHP_FUNCTION(rbbi_get_rules) object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } BREAKITER_METHOD_FETCH_OBJECT; @@ -126,7 +126,7 @@ U_CFUNC PHP_FUNCTION(rbbi_get_rule_status) object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } BREAKITER_METHOD_FETCH_OBJECT; @@ -140,7 +140,7 @@ U_CFUNC PHP_FUNCTION(rbbi_get_rule_status_vec) object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } BREAKITER_METHOD_FETCH_OBJECT; @@ -178,7 +178,7 @@ U_CFUNC PHP_FUNCTION(rbbi_get_binary_rules) object = ZEND_THIS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } BREAKITER_METHOD_FETCH_OBJECT; diff --git a/ext/intl/calendar/calendar_methods.cpp b/ext/intl/calendar/calendar_methods.cpp index 50b4f6982d..76a50e0a10 100644 --- a/ext/intl/calendar/calendar_methods.cpp +++ b/ext/intl/calendar/calendar_methods.cpp @@ -61,7 +61,7 @@ U_CFUNC PHP_FUNCTION(intlcal_create_instance) if (zend_parse_parameters(ZEND_NUM_ARGS(), "|zs!", &zv_timezone, &locale_str, &dummy) == FAILURE) { - return; + RETURN_THROWS(); } timeZone = timezone_process_timezone_argument(zv_timezone, NULL, @@ -150,7 +150,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_keyword_values_for_locale) if (zend_parse_parameters(ZEND_NUM_ARGS(), "ssb", &key, &key_len, &locale, &locale_len, &commonly_used) == FAILURE) { - return; + RETURN_THROWS(); } //does not work; see ICU bug 9194 @@ -184,7 +184,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_now) intl_error_reset(NULL); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_DOUBLE((double)Calendar::getNow()); @@ -195,7 +195,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_available_locales) intl_error_reset(NULL); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } int32_t count; @@ -1049,7 +1049,7 @@ U_CFUNC PHP_FUNCTION(intlcal_from_date_time) if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|s!", &zv_arg, &locale_str, &locale_str_len) == FAILURE) { - return; + RETURN_THROWS(); } if (!(Z_TYPE_P(zv_arg) == IS_OBJECT && instanceof_function( diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp index 4c022c9473..f258e2661a 100644 --- a/ext/intl/calendar/gregoriancalendar_methods.cpp +++ b/ext/intl/calendar/gregoriancalendar_methods.cpp @@ -75,13 +75,13 @@ static void _php_intlgregcal_constructor_body( if (variant <= 2) { if (zend_parse_parameters(MIN(ZEND_NUM_ARGS(), 2), "|z!s!", &tz_object, &locale, &locale_len) == FAILURE) { - return; + RETURN_THROWS(); } } if (variant > 2 && zend_parse_parameters(ZEND_NUM_ARGS(), "lll|lll", &largs[0], &largs[1], &largs[2], &largs[3], &largs[4], &largs[5]) == FAILURE) { - return; + RETURN_THROWS(); } // instantion of ICU object diff --git a/ext/intl/common/common_enum.cpp b/ext/intl/common/common_enum.cpp index 7367e3ad70..d94323ba82 100644 --- a/ext/intl/common/common_enum.cpp +++ b/ext/intl/common/common_enum.cpp @@ -209,7 +209,7 @@ static PHP_METHOD(IntlIterator, current) INTLITERATOR_METHOD_INIT_VARS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } INTLITERATOR_METHOD_FETCH_OBJECT; @@ -224,7 +224,7 @@ static PHP_METHOD(IntlIterator, key) INTLITERATOR_METHOD_INIT_VARS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } INTLITERATOR_METHOD_FETCH_OBJECT; @@ -241,7 +241,7 @@ static PHP_METHOD(IntlIterator, next) INTLITERATOR_METHOD_INIT_VARS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } INTLITERATOR_METHOD_FETCH_OBJECT; @@ -256,7 +256,7 @@ static PHP_METHOD(IntlIterator, rewind) INTLITERATOR_METHOD_INIT_VARS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } INTLITERATOR_METHOD_FETCH_OBJECT; @@ -273,7 +273,7 @@ static PHP_METHOD(IntlIterator, valid) INTLITERATOR_METHOD_INIT_VARS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } INTLITERATOR_METHOD_FETCH_OBJECT; diff --git a/ext/intl/common/common_error.c b/ext/intl/common/common_error.c index 883c45f5fe..af239d6e2c 100644 --- a/ext/intl/common/common_error.c +++ b/ext/intl/common/common_error.c @@ -27,7 +27,7 @@ PHP_FUNCTION( intl_get_error_code ) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG( intl_error_get_code( NULL ) ); @@ -40,7 +40,7 @@ PHP_FUNCTION( intl_get_error_code ) PHP_FUNCTION( intl_get_error_message ) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_STR(intl_error_get_message( NULL )); @@ -60,7 +60,7 @@ PHP_FUNCTION( intl_is_failure ) if( zend_parse_parameters( ZEND_NUM_ARGS(), "l", &err_code ) == FAILURE ) { - return; + RETURN_THROWS(); } RETURN_BOOL( U_FAILURE( err_code ) ); @@ -79,7 +79,7 @@ PHP_FUNCTION( intl_error_name ) if( zend_parse_parameters( ZEND_NUM_ARGS(), "l", &err_code ) == FAILURE ) { - return; + RETURN_THROWS(); } RETURN_STRING( (char*)u_errorName( err_code ) ); diff --git a/ext/intl/converter/converter.c b/ext/intl/converter/converter.c index a5eb9063cf..a8d0dcbb65 100644 --- a/ext/intl/converter/converter.c +++ b/ext/intl/converter/converter.c @@ -120,7 +120,7 @@ static PHP_METHOD(UConverter, toUCallback) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "lzzz", &reason, &source, &codeUnits, &error) == FAILURE) { - return; + RETURN_THROWS(); } php_converter_default_callback(return_value, ZEND_THIS, reason, error); @@ -142,7 +142,7 @@ static PHP_METHOD(UConverter, fromUCallback) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "lzzz", &reason, &source, &codePoint, &error) == FAILURE) { - return; + RETURN_THROWS(); } php_converter_default_callback(return_value, ZEND_THIS, reason, error); @@ -427,7 +427,7 @@ static void php_converter_do_set_encoding(UConverter **pcnv, INTERNAL_FUNCTION_P if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &enc, &enc_len) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "Bad arguments, " "expected one string argument", 0); - return; + RETURN_THROWS(); } intl_errors_reset(&objval->error); @@ -457,7 +457,7 @@ static void php_converter_do_get_encoding(php_converter_object *objval, UConvert if (zend_parse_parameters_none() == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "Expected no arguments", 0); - return; + RETURN_THROWS(); } intl_errors_reset(&objval->error); diff --git a/ext/intl/dateformat/dateformat_format_object.cpp b/ext/intl/dateformat/dateformat_format_object.cpp index 29950e889f..3d784a997c 100644 --- a/ext/intl/dateformat/dateformat_format_object.cpp +++ b/ext/intl/dateformat/dateformat_format_object.cpp @@ -79,7 +79,7 @@ U_CFUNC PHP_FUNCTION(datefmt_format_object) if (zend_parse_parameters(ZEND_NUM_ARGS(), "o|zs!", &object, &format, &locale_str, &locale_len) == FAILURE) { - return; + RETURN_THROWS(); } if (!locale_str) { diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c index 9faae99042..4aa7d3d42e 100644 --- a/ext/intl/grapheme/grapheme_string.c +++ b/ext/intl/grapheme/grapheme_string.c @@ -61,7 +61,7 @@ PHP_FUNCTION(grapheme_strlen) UErrorCode status; if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &string, &string_len) == FAILURE) { - return; + RETURN_THROWS(); } ret_len = grapheme_ascii_check((unsigned char *)string, string_len); @@ -112,7 +112,7 @@ PHP_FUNCTION(grapheme_strpos) zend_long ret_pos; if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|l", &haystack, &haystack_len, &needle, &needle_len, &loffset) == FAILURE) { - return; + RETURN_THROWS(); } if ( OUTSIDE_STRING(loffset, haystack_len) ) { @@ -173,7 +173,7 @@ PHP_FUNCTION(grapheme_stripos) int is_ascii; if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|l", &haystack, &haystack_len, &needle, &needle_len, &loffset) == FAILURE) { - return; + RETURN_THROWS(); } if ( OUTSIDE_STRING(loffset, haystack_len) ) { @@ -240,7 +240,7 @@ PHP_FUNCTION(grapheme_strrpos) int is_ascii; if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|l", &haystack, &haystack_len, &needle, &needle_len, &loffset) == FAILURE) { - return; + RETURN_THROWS(); } if ( OUTSIDE_STRING(loffset, haystack_len) ) { @@ -301,7 +301,7 @@ PHP_FUNCTION(grapheme_strripos) int is_ascii; if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|l", &haystack, &haystack_len, &needle, &needle_len, &loffset) == FAILURE) { - return; + RETURN_THROWS(); } if ( OUTSIDE_STRING(loffset, haystack_len) ) { @@ -379,7 +379,7 @@ PHP_FUNCTION(grapheme_substr) zend_bool no_length = 1; if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl|l!", &str, &str_len, &lstart, &length, &no_length) == FAILURE) { - return; + RETURN_THROWS(); } if ( OUTSIDE_STRING(lstart, str_len)) { @@ -584,7 +584,7 @@ static void strstr_common_handler(INTERNAL_FUNCTION_PARAMETERS, int f_ignore_cas zend_bool part = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|b", &haystack, &haystack_len, &needle, &needle_len, &part) == FAILURE) { - return; + RETURN_THROWS(); } if (needle_len == 0) { @@ -771,7 +771,7 @@ PHP_FUNCTION(grapheme_extract) zval *next = NULL; /* return offset of next part of the string */ if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl|llz", &str, &str_len, &size, &extract_type, &lstart, &next) == FAILURE) { - return; + RETURN_THROWS(); } if (lstart < 0) { diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c index 3b90e855c9..d59239b6ca 100644 --- a/ext/intl/idn/idn.c +++ b/ext/intl/idn/idn.c @@ -183,7 +183,7 @@ static void php_intl_idn_handoff(INTERNAL_FUNCTION_PARAMETERS, int mode) if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|llz", &domain, &option, &variant, &idna_info) == FAILURE) { - return; + RETURN_THROWS(); } if (variant != INTL_IDN_VARIANT_UTS46) { diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c index e5175abc88..0db2e70bde 100644 --- a/ext/intl/locale/locale_methods.c +++ b/ext/intl/locale/locale_methods.c @@ -208,7 +208,7 @@ static zend_off_t getSingletonPos(const char* str) PHP_NAMED_FUNCTION(zif_locale_get_default) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_STRING( intl_locale_get_default( ) ); @@ -229,7 +229,7 @@ PHP_NAMED_FUNCTION(zif_locale_set_default) if(zend_parse_parameters( ZEND_NUM_ARGS(), "S", &locale_name) == FAILURE) { - return; + RETURN_THROWS(); } if (ZSTR_LEN(locale_name) == 0) { @@ -396,7 +396,7 @@ static void get_icu_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAMETERS) if(zend_parse_parameters( ZEND_NUM_ARGS(), "s", &loc_name ,&loc_name_len ) == FAILURE) { - return; + RETURN_THROWS(); } if(loc_name_len == 0) { @@ -501,7 +501,7 @@ static void get_icu_disp_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAME &loc_name, &loc_name_len , &disp_loc_name ,&disp_loc_name_len ) == FAILURE) { - return; + RETURN_THROWS(); } if(loc_name_len > ULOC_FULLNAME_CAPACITY) { @@ -690,7 +690,7 @@ PHP_FUNCTION( locale_get_keywords ) if(zend_parse_parameters( ZEND_NUM_ARGS(), "s", &loc_name, &loc_name_len ) == FAILURE) { - return; + RETURN_THROWS(); } INTL_CHECK_LOCALE_LEN(strlen(loc_name)); @@ -909,7 +909,7 @@ PHP_FUNCTION(locale_compose) if(zend_parse_parameters( ZEND_NUM_ARGS(), "a", &arr) == FAILURE) { - return; + RETURN_THROWS(); } hash_arr = Z_ARRVAL_P( arr ); @@ -1095,7 +1095,7 @@ PHP_FUNCTION(locale_parse) if(zend_parse_parameters( ZEND_NUM_ARGS(), "s", &loc_name, &loc_name_len ) == FAILURE) { - return; + RETURN_THROWS(); } INTL_CHECK_LOCALE_LEN(strlen(loc_name)); @@ -1142,7 +1142,7 @@ PHP_FUNCTION(locale_get_all_variants) if(zend_parse_parameters( ZEND_NUM_ARGS(), "s", &loc_name, &loc_name_len ) == FAILURE) { - return; + RETURN_THROWS(); } if(loc_name_len == 0) { @@ -1245,7 +1245,7 @@ PHP_FUNCTION(locale_filter_matches) &lang_tag, &lang_tag_len , &loc_range , &loc_range_len , &boolCanonical) == FAILURE) { - return; + RETURN_THROWS(); } if(loc_range_len == 0) { @@ -1518,7 +1518,7 @@ PHP_FUNCTION(locale_lookup) if(zend_parse_parameters( ZEND_NUM_ARGS(), "as|bS!", &arr, &loc_range, &loc_range_len, &boolCanonical, &fallback_loc_str) == FAILURE) { - return; + RETURN_THROWS(); } if(loc_range_len == 0) { @@ -1571,7 +1571,7 @@ PHP_FUNCTION(locale_accept_from_http) if(zend_parse_parameters( ZEND_NUM_ARGS(), "s", &http_accept, &http_accept_len) == FAILURE) { - return; + RETURN_THROWS(); } if(http_accept_len > ULOC_FULLNAME_CAPACITY) { /* check each fragment, if any bigger than capacity, can't do it due to bug #72533 */ diff --git a/ext/intl/msgformat/msgformat_parse.c b/ext/intl/msgformat/msgformat_parse.c index f212f15ff6..2a71e59d47 100644 --- a/ext/intl/msgformat/msgformat_parse.c +++ b/ext/intl/msgformat/msgformat_parse.c @@ -99,7 +99,7 @@ PHP_FUNCTION( msgfmt_parse_message ) if( zend_parse_parameters( ZEND_NUM_ARGS(), "sss", &slocale, &slocale_len, &pattern, &pattern_len, &source, &src_len ) == FAILURE ) { - return; + RETURN_THROWS(); } INTL_CHECK_LOCALE_LEN(slocale_len); diff --git a/ext/intl/normalizer/normalizer_normalize.c b/ext/intl/normalizer/normalizer_normalize.c index ed0a79243b..791b800162 100644 --- a/ext/intl/normalizer/normalizer_normalize.c +++ b/ext/intl/normalizer/normalizer_normalize.c @@ -331,7 +331,7 @@ PHP_FUNCTION( normalizer_get_raw_decomposition ) intl_error_reset(NULL); if ((zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &input, &input_length, &form) == FAILURE)) { - return; + RETURN_THROWS(); } norm = intl_get_normalizer(form, &status); diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c index c00513a54a..634d75036b 100644 --- a/ext/intl/resourcebundle/resourcebundle_class.c +++ b/ext/intl/resourcebundle/resourcebundle_class.c @@ -325,7 +325,7 @@ PHP_FUNCTION( resourcebundle_locales ) if( zend_parse_parameters(ZEND_NUM_ARGS(), "s", &bundlename, &bundlename_len ) == FAILURE ) { - return; + RETURN_THROWS(); } if (bundlename_len >= MAXPATHLEN) { diff --git a/ext/intl/spoofchecker/spoofchecker_create.c b/ext/intl/spoofchecker/spoofchecker_create.c index 4af2ad8d94..6c4143a580 100644 --- a/ext/intl/spoofchecker/spoofchecker_create.c +++ b/ext/intl/spoofchecker/spoofchecker_create.c @@ -33,7 +33,7 @@ PHP_METHOD(Spoofchecker, __construct) SPOOFCHECKER_METHOD_INIT_VARS; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } zend_replace_error_handling(EH_THROW, IntlException_ce_ptr, &error_handling); diff --git a/ext/intl/spoofchecker/spoofchecker_main.c b/ext/intl/spoofchecker/spoofchecker_main.c index 918f89d3c9..42108ecf01 100644 --- a/ext/intl/spoofchecker/spoofchecker_main.c +++ b/ext/intl/spoofchecker/spoofchecker_main.c @@ -31,7 +31,7 @@ PHP_METHOD(Spoofchecker, isSuspicious) SPOOFCHECKER_METHOD_INIT_VARS; if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|z", &text, &text_len, &error_code)) { - return; + RETURN_THROWS(); } SPOOFCHECKER_METHOD_FETCH_OBJECT; @@ -64,7 +64,7 @@ PHP_METHOD(Spoofchecker, areConfusable) if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "ss|z", &s1, &s1_len, &s2, &s2_len, &error_code)) { - return; + RETURN_THROWS(); } SPOOFCHECKER_METHOD_FETCH_OBJECT; @@ -96,7 +96,7 @@ PHP_METHOD(Spoofchecker, setAllowedLocales) SPOOFCHECKER_METHOD_INIT_VARS; if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &locales, &locales_len)) { - return; + RETURN_THROWS(); } SPOOFCHECKER_METHOD_FETCH_OBJECT; @@ -119,7 +119,7 @@ PHP_METHOD(Spoofchecker, setChecks) SPOOFCHECKER_METHOD_INIT_VARS; if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "l", &checks)) { - return; + RETURN_THROWS(); } SPOOFCHECKER_METHOD_FETCH_OBJECT; @@ -142,7 +142,7 @@ PHP_METHOD(Spoofchecker, setRestrictionLevel) SPOOFCHECKER_METHOD_INIT_VARS; if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "l", &level)) { - return; + RETURN_THROWS(); } SPOOFCHECKER_METHOD_FETCH_OBJECT; diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp index 518d63c94a..defeb83b00 100644 --- a/ext/intl/timezone/timezone_methods.cpp +++ b/ext/intl/timezone/timezone_methods.cpp @@ -53,7 +53,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone) intl_error_reset(NULL); if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str_id, &str_id_len) == FAILURE) { - return; + RETURN_THROWS(); } UErrorCode status = UErrorCode(); @@ -78,7 +78,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone) if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &zv_timezone, php_date_get_timezone_ce()) == FAILURE) { - return; + RETURN_THROWS(); } tzobj = Z_PHPTIMEZONE_P(zv_timezone); @@ -115,7 +115,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_gmt) intl_error_reset(NULL); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } timezone_object_construct(TimeZone::getGMT(), return_value, 0); @@ -126,7 +126,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_unknown) intl_error_reset(NULL); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } timezone_object_construct(&TimeZone::getUnknown(), return_value, 0); @@ -141,7 +141,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_enumeration) /* double indirection to have the zend engine destroy the new zval that * results from separation */ if (zend_parse_parameters(ZEND_NUM_ARGS(), "|z", &arg) == FAILURE) { - return; + RETURN_THROWS(); } if (arg == NULL || Z_TYPE_P(arg) == IS_NULL) { @@ -201,7 +201,7 @@ U_CFUNC PHP_FUNCTION(intltz_count_equivalent_ids) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str_id, &str_id_len) == FAILURE) { - return; + RETURN_THROWS(); } UErrorCode status = UErrorCode(); @@ -230,7 +230,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration) if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|s!l!", &zoneType, ®ion, ®ion_len, &offset_arg, &arg3isnull) == FAILURE) { - return; + RETURN_THROWS(); } if (zoneType != UCAL_ZONE_TYPE_ANY && zoneType != UCAL_ZONE_TYPE_CANONICAL @@ -269,7 +269,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_canonical_id) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|z", &str_id, &str_id_len, &is_systemid) == FAILURE) { - return; + RETURN_THROWS(); } UErrorCode status = UErrorCode(); @@ -306,7 +306,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_region) if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str_id, &str_id_len) == FAILURE) { - return; + RETURN_THROWS(); } UErrorCode status = UErrorCode(); @@ -328,7 +328,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_tz_data_version) intl_error_reset(NULL); if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } UErrorCode status = UErrorCode(); @@ -347,7 +347,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_equivalent_id) intl_error_reset(NULL); if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl", &str_id, &str_id_len, &index) == FAILURE) { - return; + RETURN_THROWS(); } if (index < (zend_long)INT32_MIN || index > (zend_long)INT32_MAX) { @@ -611,7 +611,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_windows_id) UErrorCode error; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &id) == FAILURE) { - return; + RETURN_THROWS(); } error = U_ZERO_ERROR; @@ -649,7 +649,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_id_for_windows_id) UErrorCode error; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|S", &winID, ®ion) == FAILURE) { - return; + RETURN_THROWS(); } error = U_ZERO_ERROR; diff --git a/ext/intl/transliterator/transliterator_methods.c b/ext/intl/transliterator/transliterator_methods.c index bbda16b43a..7b8254c5ea 100644 --- a/ext/intl/transliterator/transliterator_methods.c +++ b/ext/intl/transliterator/transliterator_methods.c @@ -113,7 +113,7 @@ PHP_FUNCTION( transliterator_create ) if( zend_parse_parameters( ZEND_NUM_ARGS(), "s|l", &str_id, &str_id_len, &direction ) == FAILURE ) { - return; + RETURN_THROWS(); } object = return_value; @@ -145,7 +145,7 @@ PHP_FUNCTION( transliterator_create_from_rules ) if( zend_parse_parameters( ZEND_NUM_ARGS(), "s|l", &str_rules, &str_rules_len, &direction ) == FAILURE ) { - return; + RETURN_THROWS(); } if( ( direction != TRANSLITERATOR_FORWARD ) && (direction != TRANSLITERATOR_REVERSE ) ) @@ -242,7 +242,7 @@ PHP_FUNCTION( transliterator_list_ids ) if( zend_parse_parameters_none() == FAILURE ) { - return; + RETURN_THROWS(); } en = utrans_openIDs( &status ); @@ -304,7 +304,7 @@ PHP_FUNCTION( transliterator_transliterate ) if( zend_parse_parameters( ZEND_NUM_ARGS(), "zs|ll", &arg1, &str, &str_len, &start, &limit ) == FAILURE ) { - return; + RETURN_THROWS(); } if( Z_TYPE_P( arg1 ) == IS_OBJECT && @@ -336,7 +336,7 @@ PHP_FUNCTION( transliterator_transliterate ) else if( zend_parse_parameters( ZEND_NUM_ARGS(), "s|ll", &str, &str_len, &start, &limit ) == FAILURE ) { - return; + RETURN_THROWS(); } if( limit < -1 ) diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c index 3d6f7519cc..f9ed3153ad 100644 --- a/ext/intl/uchar/uchar.c +++ b/ext/intl/uchar/uchar.c @@ -56,7 +56,7 @@ IC_METHOD(chr) { int buffer_len = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zcp) == FAILURE) { - return; + RETURN_THROWS(); } if (convert_cp(&cp, zcp) == FAILURE) { @@ -84,7 +84,7 @@ IC_METHOD(ord) { zval *zcp; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zcp) == FAILURE) { - return; + RETURN_THROWS(); } if (convert_cp(&cp, zcp) == FAILURE) { @@ -106,7 +106,7 @@ IC_METHOD(hasBinaryProperty) { zval *zcp; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zl", &zcp, &prop) == FAILURE) { - return; + RETURN_THROWS(); } if (convert_cp(&cp, zcp) == FAILURE) { @@ -128,7 +128,7 @@ IC_METHOD(getIntPropertyValue) { zval *zcp; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zl", &zcp, &prop) == FAILURE) { - return; + RETURN_THROWS(); } if (convert_cp(&cp, zcp) == FAILURE) { @@ -147,7 +147,7 @@ IC_METHOD(getIntPropertyMinValue) { zend_long prop; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &prop) == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(u_getIntPropertyMinValue((UProperty)prop)); @@ -162,7 +162,7 @@ IC_METHOD(getIntPropertyMaxValue) { zend_long prop; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &prop) == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(u_getIntPropertyMaxValue((UProperty)prop)); @@ -178,7 +178,7 @@ IC_METHOD(getNumericValue) { zval *zcp; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zcp) == FAILURE) { - return; + RETURN_THROWS(); } if (convert_cp(&cp, zcp) == FAILURE) { @@ -228,7 +228,7 @@ IC_METHOD(enumCharTypes) { enumCharType_data context; if (zend_parse_parameters(ZEND_NUM_ARGS(), "f", &context.fci, &context.fci_cache) == FAILURE) { - return; + RETURN_THROWS(); } u_enumCharTypes((UCharEnumTypeRange*)enumCharType_callback, &context); } @@ -243,7 +243,7 @@ IC_METHOD(getBlockCode) { zval *zcp; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zcp) == FAILURE) { - return; + RETURN_THROWS(); } if (convert_cp(&cp, zcp) == FAILURE) { @@ -268,7 +268,7 @@ IC_METHOD(charName) { int32_t buffer_len; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|l", &zcp, &nameChoice) == FAILURE) { - return; + RETURN_THROWS(); } if (convert_cp(&cp, zcp) == FAILURE) { @@ -300,7 +300,7 @@ IC_METHOD(charFromName) { UErrorCode error = U_ZERO_ERROR; if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &name, &name_len, &nameChoice) == FAILURE) { - return; + RETURN_THROWS(); } ret = u_charFromName((UCharNameChoice)nameChoice, name, &error); @@ -354,7 +354,7 @@ IC_METHOD(enumCharNames) { UErrorCode error = U_ZERO_ERROR; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zzf|l", &zstart, &zlimit, &context.fci, &context.fci_cache, &nameChoice) == FAILURE) { - return; + RETURN_THROWS(); } if (convert_cp(&start, zstart) == FAILURE || convert_cp(&limit, zlimit) == FAILURE) { @@ -377,7 +377,7 @@ IC_METHOD(getPropertyName) { const char *ret; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &property, &nameChoice) == FAILURE) { - return; + RETURN_THROWS(); } ret = u_getPropertyName((UProperty)property, (UPropertyNameChoice)nameChoice); @@ -400,7 +400,7 @@ IC_METHOD(getPropertyEnum) { size_t alias_len; if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &alias, &alias_len) == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(u_getPropertyEnum(alias)); @@ -418,7 +418,7 @@ IC_METHOD(getPropertyValueName) { const char *ret; if (zend_parse_parameters(ZEND_NUM_ARGS(), "ll|l", &property, &value, &nameChoice) == FAILURE) { - return; + RETURN_THROWS(); } ret = u_getPropertyValueName((UProperty)property, value, (UPropertyNameChoice)nameChoice); @@ -443,7 +443,7 @@ IC_METHOD(getPropertyValueEnum) { size_t name_len; if (zend_parse_parameters(ZEND_NUM_ARGS(), "ls", &property, &name, &name_len) == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(u_getPropertyValueEnum((UProperty)property, name)); @@ -461,7 +461,7 @@ IC_METHOD(foldCase) { zend_long options = U_FOLD_CASE_DEFAULT; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|l", &zcp, &options) == FAILURE) { - return; + RETURN_THROWS(); } if (convert_cp(&cp, zcp) == FAILURE) { @@ -493,7 +493,7 @@ IC_METHOD(digit) { int ret; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|l", &zcp, &radix) == FAILURE) { - return; + RETURN_THROWS(); } if (convert_cp(&cp, zcp) == FAILURE) { @@ -519,7 +519,7 @@ IC_METHOD(forDigit) { zend_long digit, radix = 10; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &digit, &radix) == FAILURE) { - return; + RETURN_THROWS(); } RETURN_LONG(u_forDigit(digit, radix)); @@ -537,7 +537,7 @@ IC_METHOD(charAge) { int i; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zcp) == FAILURE) { - return; + RETURN_THROWS(); } if (convert_cp(&cp, zcp) == FAILURE) { @@ -560,7 +560,7 @@ IC_METHOD(getUnicodeVersion) { int i; if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } u_getUnicodeVersion(version); @@ -584,7 +584,7 @@ IC_METHOD(getFC_NFKC_Closure) { UErrorCode error = U_ZERO_ERROR; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zcp) == FAILURE) { - return; + RETURN_THROWS(); } if (convert_cp(&cp, zcp) == FAILURE) { |