]> granicus.if.org Git - php/commitdiff
Intl: Don't separately report "bad arguments" errors
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 5 Mar 2019 11:55:33 +0000 (12:55 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 11 Mar 2019 10:32:20 +0000 (11:32 +0100)
zpp will be throwing for these now, don't report them in addition to
that.

35 files changed:
ext/intl/breakiterator/breakiterator_iterators.cpp
ext/intl/breakiterator/breakiterator_methods.cpp
ext/intl/breakiterator/codepointiterator_methods.cpp
ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
ext/intl/calendar/calendar_methods.cpp
ext/intl/calendar/gregoriancalendar_methods.cpp
ext/intl/collator/collator_attr.c
ext/intl/collator/collator_compare.c
ext/intl/collator/collator_create.c
ext/intl/collator/collator_error.c
ext/intl/collator/collator_locale.c
ext/intl/collator/collator_sort.c
ext/intl/common/common_enum.cpp
ext/intl/common/common_error.c
ext/intl/converter/converter.c
ext/intl/dateformat/dateformat.c
ext/intl/dateformat/dateformat_attr.c
ext/intl/dateformat/dateformat_attrcpp.cpp
ext/intl/dateformat/dateformat_create.cpp
ext/intl/dateformat/dateformat_parse.c
ext/intl/formatter/formatter_attr.c
ext/intl/formatter/formatter_format.c
ext/intl/formatter/formatter_main.c
ext/intl/formatter/formatter_parse.c
ext/intl/grapheme/grapheme_string.c
ext/intl/idn/idn.c
ext/intl/locale/locale_methods.c
ext/intl/msgformat/msgformat.c
ext/intl/msgformat/msgformat_attr.c
ext/intl/msgformat/msgformat_format.c
ext/intl/msgformat/msgformat_parse.c
ext/intl/normalizer/normalizer_normalize.c
ext/intl/resourcebundle/resourcebundle_class.c
ext/intl/timezone/timezone_methods.cpp
ext/intl/transliterator/transliterator_methods.c

index 9969561206029ccb650a61efdb2cf51c3be8395f..e5f5aae74b6fa10f62d6071bc3b3c4b51fdf040a 100644 (file)
@@ -277,8 +277,6 @@ U_CFUNC PHP_METHOD(IntlPartsIterator, getBreakIterator)
        INTLITERATOR_METHOD_INIT_VARS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "IntlPartsIterator::getBreakIterator: bad arguments", 0);
                return;
        }
 
index 6d6211db736901fbd6719d2d29bedfccb4e17f48..34509376c844803fedbafb6c839c173b68498501 100644 (file)
@@ -55,9 +55,6 @@ static void _breakiter_factory(const char *func_name,
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!",
                        &locale_str, &dummy) == FAILURE) {
-               spprintf(&msg, 0, "%s: bad arguments", func_name);
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1);
-               efree(msg);
                RETURN_NULL();
        }
 
@@ -118,8 +115,6 @@ U_CFUNC PHP_FUNCTION(breakiter_create_code_point_instance)
        intl_error_reset(NULL);
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "breakiter_create_code_point_instance: bad arguments", 0);
                RETURN_NULL();
        }
 
@@ -133,8 +128,6 @@ U_CFUNC PHP_FUNCTION(breakiter_get_text)
        object = ZEND_THIS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "breakiter_get_text: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -155,8 +148,6 @@ U_CFUNC PHP_FUNCTION(breakiter_set_text)
        object = ZEND_THIS;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &text) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "breakiter_set_text: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -189,9 +180,6 @@ static void _breakiter_no_args_ret_int32(
        object = ZEND_THIS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               spprintf(&msg, 0, "%s: bad arguments", func_name);
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1);
-               efree(msg);
                RETURN_FALSE;
        }
 
@@ -213,9 +201,6 @@ static void _breakiter_int32_ret_int32(
        object = ZEND_THIS;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &arg) == FAILURE) {
-               spprintf(&msg, 0, "%s: bad arguments", func_name);
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1);
-               efree(msg);
                RETURN_FALSE;
        }
 
@@ -290,8 +275,6 @@ U_CFUNC PHP_FUNCTION(breakiter_current)
        object = ZEND_THIS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                               "breakiter_current: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -324,8 +307,6 @@ U_CFUNC PHP_FUNCTION(breakiter_is_boundary)
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "l",
                        &offset) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                               "breakiter_is_boundary: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -350,8 +331,6 @@ U_CFUNC PHP_FUNCTION(breakiter_get_locale)
        object = ZEND_THIS;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &locale_type) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "breakiter_get_locale: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -378,8 +357,6 @@ U_CFUNC PHP_FUNCTION(breakiter_get_parts_iterator)
        object = ZEND_THIS;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &key_type) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "breakiter_get_parts_iterator: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -403,8 +380,6 @@ U_CFUNC PHP_FUNCTION(breakiter_get_error_code)
        object = ZEND_THIS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "breakiter_get_error_code: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -423,8 +398,6 @@ U_CFUNC PHP_FUNCTION(breakiter_get_error_message)
        object = ZEND_THIS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "breakiter_get_error_message: bad arguments", 0 );
                RETURN_FALSE;
        }
 
index f1dd0960e69a63c81fc7e7b26ed2fa11a45bd61f..dac50dcab63d46dd26da602a21ff767e6d62be66 100644 (file)
@@ -33,8 +33,6 @@ U_CFUNC PHP_FUNCTION(cpbi_get_last_code_point)
        object = ZEND_THIS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "cpbi_get_last_code_point: bad arguments", 0);
                RETURN_FALSE;
        }
 
index 5529d0671807f1a0697713e19b3b9edce6c93d44..65023af089a4147ad5d6d2207ef704390eff3f89 100644 (file)
@@ -43,8 +43,6 @@ static void _php_intlrbbi_constructor_body(INTERNAL_FUNCTION_PARAMETERS)
 
        if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "s|b",
                        &rules, &rules_len, &compiled) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "rbbi_create_instance: bad arguments", 0);
                return;
        }
 
@@ -105,8 +103,6 @@ U_CFUNC PHP_FUNCTION(rbbi_get_rules)
        object = ZEND_THIS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "rbbi_get_rules: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -132,8 +128,6 @@ U_CFUNC PHP_FUNCTION(rbbi_get_rule_status)
        object = ZEND_THIS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "rbbi_get_rule_status: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -148,8 +142,6 @@ U_CFUNC PHP_FUNCTION(rbbi_get_rule_status_vec)
        object = ZEND_THIS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "rbbi_get_rule_status_vec: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -188,8 +180,6 @@ U_CFUNC PHP_FUNCTION(rbbi_get_binary_rules)
        object = ZEND_THIS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "rbbi_get_binary_rules: bad arguments", 0);
                RETURN_FALSE;
        }
 
index 2188fb82765c3d3cecd85e2b845b34d7e05598ae..0571b62c7d96298c930493a3c2f8e9f851ddc086 100644 (file)
@@ -63,8 +63,6 @@ U_CFUNC PHP_FUNCTION(intlcal_create_instance)
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "|zs!",
                        &zv_timezone, &locale_str, &dummy) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_create_calendar: bad arguments", 0);
                RETURN_NULL();
        }
 
@@ -154,8 +152,6 @@ 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) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_keyword_values_for_locale: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -190,8 +186,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_now)
        intl_error_reset(NULL);
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_now: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -203,8 +197,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_available_locales)
        intl_error_reset(NULL);
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_available_locales: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -228,9 +220,6 @@ static void _php_intlcal_field_uec_ret_in32t_method(
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, Calendar_ce_ptr, &field) == FAILURE) {
-               spprintf(&message, 0, "%s: bad arguments", method_name);
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, message, 1);
-               efree(message);
                RETURN_FALSE;
        }
 
@@ -262,8 +251,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_time)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, Calendar_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_time: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -283,8 +270,6 @@ U_CFUNC PHP_FUNCTION(intlcal_set_time)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Od",
                        &object, Calendar_ce_ptr, &time_arg) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_set_time: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -304,8 +289,6 @@ U_CFUNC PHP_FUNCTION(intlcal_add)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Oll", &object, Calendar_ce_ptr, &field, &amount) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_add: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -336,8 +319,6 @@ U_CFUNC PHP_FUNCTION(intlcal_set_time_zone)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Oz!", &object, Calendar_ce_ptr, &zv_timezone) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_set_time_zone: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -370,8 +351,6 @@ static void _php_intlcal_before_after(
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "OO", &object, Calendar_ce_ptr, &when_object, Calendar_ce_ptr)
                        == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_before/after: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -430,8 +409,6 @@ U_CFUNC PHP_FUNCTION(intlcal_set)
                        zend_parse_method_parameters(ZEND_NUM_ARGS(), object,
                        "Oll|llll",     &object, Calendar_ce_ptr, &arg1, &arg2, &arg3, &arg4,
                        &arg5, &arg6) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_set: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -489,15 +466,11 @@ U_CFUNC PHP_FUNCTION(intlcal_roll)
                if (zend_parse_method_parameters(ZEND_NUM_ARGS(), object,
                                "Olb", &object, Calendar_ce_ptr, &field, &bool_variant_val)
                                == FAILURE) {
-                       intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                               "intlcal_roll: bad arguments", 0);
                        RETURN_FALSE;
                }
                bool_variant_val = Z_TYPE(args[1]) == IS_TRUE? 1 : 0;
        } else if (zend_parse_method_parameters(ZEND_NUM_ARGS(), object,
                        "Oll", &object, Calendar_ce_ptr, &field, &value) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_roll: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -535,8 +508,6 @@ U_CFUNC PHP_FUNCTION(intlcal_clear)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(),
                        getThis(), "O|l!", &object, Calendar_ce_ptr, &field, &field_is_null) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_clear: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -565,8 +536,6 @@ U_CFUNC PHP_FUNCTION(intlcal_field_difference)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Odl", &object, Calendar_ce_ptr, &when, &field) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_field_difference: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -605,8 +574,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_day_of_week_type)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, Calendar_ce_ptr, &dow) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_day_of_week_type: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -632,8 +599,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_first_day_of_week)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, Calendar_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_first_day_of_week: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -657,9 +622,6 @@ static void _php_intlcal_field_ret_in32t_method(
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, Calendar_ce_ptr, &field) == FAILURE) {
-               spprintf(&message, 0, "%s: bad arguments", method_name);
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, message, 1);
-               efree(message);
                RETURN_FALSE;
        }
 
@@ -697,8 +659,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_locale)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, Calendar_ce_ptr, &locale_type) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_locale: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -730,8 +690,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_minimal_days_in_first_week)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, Calendar_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_minimal_days_in_first_week: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -756,8 +714,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_time_zone)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, Calendar_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_time_zone: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -779,8 +735,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_type)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, Calendar_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_type: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -796,8 +750,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_weekend_transition)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, Calendar_ce_ptr, &dow) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_weekend_transition: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -823,8 +775,6 @@ U_CFUNC PHP_FUNCTION(intlcal_in_daylight_time)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, Calendar_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_in_daylight_time: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -846,8 +796,6 @@ U_CFUNC PHP_FUNCTION(intlcal_is_equivalent_to)
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "OO", &object, Calendar_ce_ptr, &other_object, Calendar_ce_ptr)
                        == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_is_equivalent_to: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -869,8 +817,6 @@ U_CFUNC PHP_FUNCTION(intlcal_is_lenient)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, Calendar_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_is_lenient: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -886,8 +832,6 @@ U_CFUNC PHP_FUNCTION(intlcal_is_set)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, Calendar_ce_ptr, &field) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_is_set: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -910,8 +854,6 @@ U_CFUNC PHP_FUNCTION(intlcal_is_weekend)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                                "O|d!", &object, Calendar_ce_ptr, &date, &date_is_null) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_is_weekend: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -935,8 +877,6 @@ U_CFUNC PHP_FUNCTION(intlcal_set_first_day_of_week)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, Calendar_ce_ptr, &dow) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_set_first_day_of_week: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -960,8 +900,6 @@ U_CFUNC PHP_FUNCTION(intlcal_set_lenient)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ob", &object, Calendar_ce_ptr, &is_lenient) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_set_lenient: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -979,8 +917,6 @@ U_CFUNC PHP_FUNCTION(intlcal_set_minimal_days_in_first_week)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, Calendar_ce_ptr, &num_days) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_set_minimal_days_in_first_week: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -1007,8 +943,6 @@ U_CFUNC PHP_FUNCTION(intlcal_equals)
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "OO", &object, Calendar_ce_ptr, &other_object, Calendar_ce_ptr)
                        == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_equals: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -1032,8 +966,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_repeated_wall_time_option)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, Calendar_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_repeated_wall_time_option: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -1048,8 +980,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_skipped_wall_time_option)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, Calendar_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_skipped_wall_time_option: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -1065,8 +995,6 @@ U_CFUNC PHP_FUNCTION(intlcal_set_repeated_wall_time_option)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, Calendar_ce_ptr, &option) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_set_repeated_wall_time_option: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -1090,8 +1018,6 @@ U_CFUNC PHP_FUNCTION(intlcal_set_skipped_wall_time_option)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, Calendar_ce_ptr, &option) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_set_skipped_wall_time_option: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -1125,8 +1051,6 @@ 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) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_from_date_time: bad arguments", 0);
                RETURN_NULL();
        }
 
@@ -1206,8 +1130,6 @@ U_CFUNC PHP_FUNCTION(intlcal_to_date_time)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, Calendar_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_to_date_time: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -1286,8 +1208,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_error_code)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, Calendar_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_error_code: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -1306,8 +1226,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_error_message)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, Calendar_ce_ptr) == FAILURE) {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlcal_get_error_message: bad arguments", 0 );
                RETURN_FALSE;
        }
 
index ce70aaacd7d0f31b667c5a8c6ca112a328684eff..0c0c80b1cd666eec0f2b3483704e81e6e825ee9f 100644 (file)
@@ -87,8 +87,6 @@ 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) {
-                       intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                               "intlgregcal_create_instance: bad arguments", 0);
                        if (!is_constructor) {
                                zval_ptr_dtor(return_value);
                                RETVAL_NULL();
@@ -99,8 +97,6 @@ static void _php_intlgregcal_constructor_body(
        if (variant > 2 && zend_parse_parameters(ZEND_NUM_ARGS(),
                        "lll|lll", &largs[0], &largs[1], &largs[2], &largs[3], &largs[4],
                        &largs[5]) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlgregcal_create_instance: bad arguments", 0);
                if (!is_constructor) {
                        zval_ptr_dtor(return_value);
                        RETVAL_NULL();
@@ -231,8 +227,6 @@ U_CFUNC PHP_FUNCTION(intlgregcal_set_gregorian_change)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Od", &object, GregorianCalendar_ce_ptr, &date) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlgregcal_set_gregorian_change: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -251,8 +245,6 @@ U_CFUNC PHP_FUNCTION(intlgregcal_get_gregorian_change)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, GregorianCalendar_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlgregcal_get_gregorian_change: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -268,8 +260,6 @@ U_CFUNC PHP_FUNCTION(intlgregcal_is_leap_year)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, GregorianCalendar_ce_ptr, &year) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intlgregcal_is_leap_year: bad arguments", 0);
                RETURN_FALSE;
        }
 
index 5170d4c720cf5eafbdafa150bb0541ad27111938..6710a60b15fcab0f5ff88e4c074df84fee5757e2 100644 (file)
@@ -41,9 +41,6 @@ PHP_FUNCTION( collator_get_attribute )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ol",
                &object, Collator_ce_ptr, &attribute ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "collator_get_attribute: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -72,9 +69,6 @@ PHP_FUNCTION( collator_set_attribute )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Oll",
                &object, Collator_ce_ptr, &attribute, &value ) == FAILURE)
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                        "collator_set_attribute: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -102,9 +96,6 @@ PHP_FUNCTION( collator_get_strength )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, Collator_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                        "collator_get_strength: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -131,9 +122,6 @@ PHP_FUNCTION( collator_set_strength )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ol",
                &object, Collator_ce_ptr, &strength ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                        "collator_set_strength: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index c95d144f1af4c3f7e098f465dd65f6a2f20b241f..c3f6b3bc52c0868c8a7ec9ba0a673c4810ddc04f 100644 (file)
@@ -49,9 +49,6 @@ PHP_FUNCTION( collator_compare )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Oss",
                &object, Collator_ce_ptr, &str1, &str1_len, &str2, &str2_len ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                        "collator_compare: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index e674e90f89f4aa02682bb334b0e3499479c26ae4..e5bc724b48a35d3f2fdde13d838c7b69dba6714c 100644 (file)
@@ -38,8 +38,6 @@ static int collator_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor)
        if( zend_parse_parameters( ZEND_NUM_ARGS(), "s",
                &locale, &locale_len ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "collator_create: unable to parse input params", 0 );
                return FAILURE;
        }
 
index b485cf14f1a922f4f9fb0f09eb40cf8252f6c07d..6781f13d8e91d25ed2df6f9f538f020ff772333f 100644 (file)
@@ -36,9 +36,6 @@ PHP_FUNCTION( collator_get_error_code )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, Collator_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "collator_get_error_code: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -67,9 +64,6 @@ PHP_FUNCTION( collator_get_error_message )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, Collator_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "collator_get_error_message: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index 2a379bc97713f4666c7b1c440cfc95767b66dd8b..2c9bf72b303bc01dfc2664c8602981297362bd1a 100644 (file)
@@ -42,9 +42,6 @@ PHP_FUNCTION( collator_get_locale )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ol",
                &object, Collator_ce_ptr, &type ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "collator_get_locale: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index 292391c43b77274b5ef8eb0f031621b364f80d1b..e3f967537505b200b17fa11540734bd6efd39cb4 100644 (file)
@@ -303,9 +303,6 @@ static void collator_sort_internal( int renumber, INTERNAL_FUNCTION_PARAMETERS )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Oa/|l",
                &object, Collator_ce_ptr, &array, &sort_flags ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "collator_sort_internal: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -397,9 +394,6 @@ PHP_FUNCTION( collator_sort_with_sort_keys )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Oa",
                &object, Collator_ce_ptr, &array ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "collator_sort_with_sort_keys: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -563,9 +557,6 @@ PHP_FUNCTION( collator_get_sort_key )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os",
                &object, Collator_ce_ptr, &str, &str_len ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                        "collator_get_sort_key: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index 5c5e1ca9906085c7de02b65e60359883f10dba14..0fc7b31cde8a6e7c7fe6b9aa1d9577da14effd72 100644 (file)
@@ -211,8 +211,6 @@ static PHP_METHOD(IntlIterator, current)
        INTLITERATOR_METHOD_INIT_VARS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "IntlIterator::current: bad arguments", 0);
                return;
        }
 
@@ -228,8 +226,6 @@ static PHP_METHOD(IntlIterator, key)
        INTLITERATOR_METHOD_INIT_VARS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "IntlIterator::key: bad arguments", 0);
                return;
        }
 
@@ -247,8 +243,6 @@ static PHP_METHOD(IntlIterator, next)
        INTLITERATOR_METHOD_INIT_VARS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "IntlIterator::next: bad arguments", 0);
                return;
        }
 
@@ -264,8 +258,6 @@ static PHP_METHOD(IntlIterator, rewind)
        INTLITERATOR_METHOD_INIT_VARS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "IntlIterator::rewind: bad arguments", 0);
                return;
        }
 
@@ -283,8 +275,6 @@ static PHP_METHOD(IntlIterator, valid)
        INTLITERATOR_METHOD_INIT_VARS;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "IntlIterator::valid: bad arguments", 0);
                return;
        }
 
index a4a4e56b0a076c502288c526ce7282167623a8bf..29b15d456d08918b18697e3bc0303878fb8a0475 100644 (file)
@@ -54,9 +54,6 @@ PHP_FUNCTION( intl_is_failure )
        if( zend_parse_parameters( ZEND_NUM_ARGS(), "l",
                &err_code ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intl_is_failure: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -76,9 +73,6 @@ PHP_FUNCTION( intl_error_name )
        if( zend_parse_parameters( ZEND_NUM_ARGS(), "l",
                &err_code ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intl_error_name: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index 09fa699b0095c925053a8009dec90c775d87ed68..6eab9a1713aa01f748ac92964d0b30e97ea162fb 100644 (file)
@@ -586,8 +586,6 @@ static PHP_METHOD(UConverter, setSubstChars) {
        int ret = 1;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &chars, &chars_len) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "UConverter::setSubstChars(): bad arguments", 0);
                RETURN_FALSE;
        }
        intl_errors_reset(&objval->error);
@@ -721,8 +719,6 @@ static PHP_METHOD(UConverter, reasonText) {
        zend_long reason;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &reason) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "UConverter::reasonText(): bad arguments", 0);
                RETURN_FALSE;
        }
        intl_error_reset(NULL);
@@ -756,8 +752,6 @@ static PHP_METHOD(UConverter, convert) {
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|b",
                                  &str, &str_len, &reverse) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "UConverter::convert(): bad arguments", 0);
                RETURN_FALSE;
        }
        intl_errors_reset(&objval->error);
@@ -790,8 +784,6 @@ static PHP_METHOD(UConverter, transcode) {
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "sss|a!",
                        &str, &str_len, &dest, &dest_len, &src, &src_len, &options) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "UConverter::transcode(): bad arguments", 0);
                RETURN_FALSE;
        }
        intl_error_reset(NULL);
@@ -910,8 +902,6 @@ static PHP_METHOD(UConverter, getAliases) {
        uint16_t i, count;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "UConverter::getAliases(): bad arguments", 0);
                RETURN_FALSE;
        }
        intl_error_reset(NULL);
index b1821ce0d386a23f1ae721ffdf5d68924e79cb27..e64b687a5b6105c7339602e5f8fa75392faf07a9 100644 (file)
@@ -77,8 +77,6 @@ PHP_FUNCTION( datefmt_get_error_code )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, IntlDateFormatter_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "datefmt_get_error_code: unable to parse input params", 0 );
                RETURN_FALSE;
        }
 
@@ -103,9 +101,6 @@ PHP_FUNCTION( datefmt_get_error_message )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, IntlDateFormatter_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "datefmt_get_error_message: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index d44b3d178996676fd82105c7fac0f13d01ebda3d..5e8f3b4454ac5cd283ee5f7704827380ec64e4be 100644 (file)
@@ -38,8 +38,6 @@ PHP_FUNCTION( datefmt_get_datetype )
        /* Parse parameters. */
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O", &object, IntlDateFormatter_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "datefmt_get_datetype: unable to parse input params", 0 );
                RETURN_FALSE;
        }
 
@@ -64,8 +62,6 @@ PHP_FUNCTION( datefmt_get_timetype )
        /* Parse parameters. */
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O", &object, IntlDateFormatter_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "datefmt_get_timetype: unable to parse input params", 0 );
                RETURN_FALSE;
        }
 
@@ -95,8 +91,6 @@ PHP_FUNCTION( datefmt_get_pattern )
        /* Parse parameters. */
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O", &object, IntlDateFormatter_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "datefmt_get_pattern: unable to parse input params", 0 );
                RETURN_FALSE;
        }
 
@@ -140,8 +134,6 @@ PHP_FUNCTION( datefmt_set_pattern )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os",
                &object, IntlDateFormatter_ce_ptr,  &value, &value_len ) == FAILURE )
        {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "datefmt_set_pattern: unable to parse input params", 0);
                RETURN_FALSE;
        }
 
@@ -178,8 +170,6 @@ PHP_FUNCTION( datefmt_get_locale )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O|l",
                &object, IntlDateFormatter_ce_ptr,&loc_type) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "datefmt_get_locale: unable to parse input params", 0 );
 
                RETURN_FALSE;
        }
@@ -207,8 +197,6 @@ PHP_FUNCTION( datefmt_is_lenient )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, IntlDateFormatter_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "datefmt_is_lenient: unable to parse input params", 0 );
 
                RETURN_FALSE;
        }
@@ -235,8 +223,6 @@ PHP_FUNCTION( datefmt_set_lenient )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ob",
        &object, IntlDateFormatter_ce_ptr,&isLenient ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "datefmt_set_lenient: unable to parse input params", 0 );
                RETURN_FALSE;
        }
 
index fec8eb1a67fe7315549038f149dd28594ee3507f..c6cae6757b70b006577aadf082c89eed9c1b64a4 100644 (file)
@@ -49,8 +49,6 @@ U_CFUNC PHP_FUNCTION(datefmt_get_timezone_id)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, IntlDateFormatter_ce_ptr ) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,  "datefmt_get_timezone_"
-                               "id: unable to parse input params", 0);
                RETURN_FALSE;
        }
 
@@ -75,8 +73,6 @@ U_CFUNC PHP_FUNCTION(datefmt_get_timezone)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, IntlDateFormatter_ce_ptr ) == FAILURE) {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "datefmt_get_timezone: unable to parse input params", 0 );
                RETURN_FALSE;
        }
 
@@ -105,8 +101,6 @@ U_CFUNC PHP_FUNCTION(datefmt_set_timezone)
 
        if ( zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Oz", &object, IntlDateFormatter_ce_ptr, &timezone_zv) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_set_timezone: "
-                               "unable to parse input params", 0);
                RETURN_FALSE;
        }
 
@@ -132,8 +126,6 @@ U_CFUNC PHP_FUNCTION(datefmt_get_calendar)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, IntlDateFormatter_ce_ptr ) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "datefmt_get_calendar: unable to parse input params", 0);
                RETURN_FALSE;
        }
 
@@ -159,9 +151,6 @@ U_CFUNC PHP_FUNCTION(datefmt_get_calendar_object)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, IntlDateFormatter_ce_ptr ) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                               "datefmt_get_calendar_object: unable to parse input params",
-                               0);
                RETURN_FALSE;
        }
 
@@ -196,8 +185,6 @@ U_CFUNC PHP_FUNCTION(datefmt_set_calendar)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oz",
                        &object, IntlDateFormatter_ce_ptr, &calendar_zv) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "datefmt_set_calendar: unable to parse input params", 0);
                RETURN_FALSE;
        }
 
index 7406ca38ea019667654d0dfb5eedecf700e5da8e..fbff95743e88b64b293fcd89e83117fecc5e8286 100644 (file)
@@ -72,8 +72,6 @@ static int datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor)
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "sll|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;
        }
 
index af960952423b786c17196e81a4bc1069df68e4fa..2507713c8a8ff976ef63906494f8db2424925e87 100644 (file)
@@ -137,7 +137,6 @@ PHP_FUNCTION(datefmt_parse)
        /* Parse parameters. */
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os|z!",
                &object, IntlDateFormatter_ce_ptr, &text_to_parse, &text_len, &z_parse_pos ) == FAILURE ){
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_parse: unable to parse input params", 0 );
                RETURN_FALSE;
        }
 
@@ -182,7 +181,6 @@ PHP_FUNCTION(datefmt_localtime)
        /* Parse parameters. */
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os|z!",
                &object, IntlDateFormatter_ce_ptr, &text_to_parse, &text_len, &z_parse_pos ) == FAILURE ){
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_parse_to_localtime: unable to parse input params", 0 );
                RETURN_FALSE;
        }
 
index b04c33eaad361833c7a65287c777dfa18d344461..049304d3857513b7277c1603a8aec36af83ca465 100644 (file)
@@ -39,9 +39,6 @@ PHP_FUNCTION( numfmt_get_attribute )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ol",
                &object, NumberFormatter_ce_ptr, &attribute ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "numfmt_get_attribute: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -112,9 +109,6 @@ PHP_FUNCTION( numfmt_get_text_attribute )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ol",
                &object, NumberFormatter_ce_ptr, &attribute ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "numfmt_get_text_attribute: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -153,9 +147,6 @@ PHP_FUNCTION( numfmt_set_attribute )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Olz",
                &object, NumberFormatter_ce_ptr, &attribute, &value ) == FAILURE)
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "numfmt_set_attribute: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -216,9 +207,6 @@ PHP_FUNCTION( numfmt_set_text_attribute )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ols",
                &object, NumberFormatter_ce_ptr, &attribute, &value, &len ) == FAILURE)
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "numfmt_set_text_attribute: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -257,9 +245,6 @@ PHP_FUNCTION( numfmt_get_symbol )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ol",
                &object, NumberFormatter_ce_ptr, &symbol ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "numfmt_get_symbol: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -306,9 +291,6 @@ PHP_FUNCTION( numfmt_set_symbol )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ols",
                &object, NumberFormatter_ce_ptr, &symbol, &value, &value_len ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "numfmt_set_symbol: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -351,9 +333,6 @@ PHP_FUNCTION( numfmt_get_pattern )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, NumberFormatter_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "numfmt_get_pattern: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -394,9 +373,6 @@ PHP_FUNCTION( numfmt_set_pattern )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os",
                &object, NumberFormatter_ce_ptr, &value, &value_len ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "numfmt_set_pattern: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -432,9 +408,6 @@ PHP_FUNCTION( numfmt_get_locale )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O|l",
                &object, NumberFormatter_ce_ptr, &type ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "numfmt_get_locale: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index 05ef6789ef9d7bb8ba5fd4e3f34ad4f254ad1a67..2f812d3ddeb78b57c70527f2e574e243354e8eee 100644 (file)
@@ -44,9 +44,6 @@ PHP_FUNCTION( numfmt_format )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Oz|l",
                &object, NumberFormatter_ce_ptr,  &number, &type ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "numfmt_format: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -150,9 +147,6 @@ PHP_FUNCTION( numfmt_format_currency )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ods",
                &object, NumberFormatter_ce_ptr,  &number, &currency, &currency_len ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "numfmt_format_currency: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index 561d68addf9131e98e502ad0d751caec5bb40aae..959fcd71dde20176f3999712babf7891b19042bd 100644 (file)
@@ -39,8 +39,6 @@ static int numfmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor)
        if( zend_parse_parameters( ZEND_NUM_ARGS(), "sl|s",
                &locale, &locale_len, &style, &pattern, &pattern_len ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "numfmt_create: unable to parse input parameters", 0 );
                return FAILURE;
        }
 
@@ -116,9 +114,6 @@ PHP_FUNCTION( numfmt_get_error_code )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, NumberFormatter_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "numfmt_get_error_code: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -143,9 +138,6 @@ PHP_FUNCTION( numfmt_get_error_message )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, NumberFormatter_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "numfmt_get_error_message: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index a2a20f147dc73f9a45888852db9fe040c69ce796..68fcd36e2ac114c50dc8dd107536a95cfb82f6c1 100644 (file)
@@ -54,9 +54,6 @@ PHP_FUNCTION( numfmt_parse )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os|lz!",
                &object, NumberFormatter_ce_ptr,  &str, &str_len, &type, &zposition ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "number_parse: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -139,9 +136,6 @@ PHP_FUNCTION( numfmt_parse_currency )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Osz/|z!",
                &object, NumberFormatter_ce_ptr,  &str, &str_len, &zcurrency, &zposition ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "number_parse_currency: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index 6e5fc4ffb49ed1e44c100cbd58eed5d7c1d5ea51..0417958b26e43619d89b9be6396f6cffe45d2b9b 100644 (file)
@@ -63,8 +63,6 @@ PHP_FUNCTION(grapheme_strlen)
        UErrorCode status;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &string, &string_len) == FAILURE) {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                        "grapheme_strlen: unable to parse input param", 0 );
                RETURN_FALSE;
        }
 
@@ -116,8 +114,6 @@ 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) {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                        "grapheme_strpos: unable to parse input param", 0 );
                RETURN_FALSE;
        }
 
@@ -179,8 +175,6 @@ PHP_FUNCTION(grapheme_stripos)
        int is_ascii;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|l", &haystack, &haystack_len, &needle, &needle_len, &loffset) == FAILURE) {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                        "grapheme_stripos: unable to parse input param", 0 );
                RETURN_FALSE;
        }
 
@@ -248,8 +242,6 @@ PHP_FUNCTION(grapheme_strrpos)
        int is_ascii;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|l", &haystack, &haystack_len, &needle, &needle_len, &loffset) == FAILURE) {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                        "grapheme_strrpos: unable to parse input param", 0 );
                RETURN_FALSE;
        }
 
@@ -311,8 +303,6 @@ PHP_FUNCTION(grapheme_strripos)
        int is_ascii;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|l", &haystack, &haystack_len, &needle, &needle_len, &loffset) == FAILURE) {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                        "grapheme_strrpos: unable to parse input param", 0 );
                RETURN_FALSE;
        }
 
@@ -391,8 +381,6 @@ 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) {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                        "grapheme_substr: unable to parse input param", 0 );
                RETURN_FALSE;
        }
 
@@ -598,10 +586,6 @@ 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) {
-
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                        "grapheme_strstr: unable to parse input param", 0 );
-
                RETURN_FALSE;
        }
 
@@ -789,8 +773,6 @@ 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) {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                        "grapheme_extract: unable to parse input param", 0 );
                RETURN_FALSE;
        }
 
index afcb44ac576e768feda67225ffb4639ea94f4259..513b2187cce775de1f693652995fb3cb96c23cd2 100644 (file)
@@ -185,7 +185,6 @@ 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) {
-               php_intl_bad_args("bad arguments");
                RETURN_NULL(); /* don't set FALSE because that's not the way it was before... */
        }
 
index f03aa72928171c6c12cf51c7fece6839be990d09..20a156af914611c62c8a4182ab5330ca05524fd0 100644 (file)
@@ -227,9 +227,6 @@ PHP_NAMED_FUNCTION(zif_locale_set_default)
 
        if(zend_parse_parameters( ZEND_NUM_ARGS(),  "S", &locale_name) == FAILURE)
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                               "locale_set_default: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -397,10 +394,6 @@ 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) {
-               spprintf(&msg , 0, "locale_get_%s : unable to parse input params", tag_name );
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,  msg , 1 );
-               efree(msg);
-
                RETURN_FALSE;
     }
 
@@ -506,9 +499,6 @@ 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)
        {
-               spprintf(&msg , 0, "locale_get_display_%s : unable to parse input params", tag_name );
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,  msg , 1 );
-               efree(msg);
                RETURN_FALSE;
        }
 
@@ -698,9 +688,6 @@ PHP_FUNCTION( locale_get_keywords )
     if(zend_parse_parameters( ZEND_NUM_ARGS(), "s",
         &loc_name, &loc_name_len ) == FAILURE)
     {
-        intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-             "locale_get_keywords: unable to parse input params", 0 );
-
         RETURN_FALSE;
     }
 
@@ -920,8 +907,6 @@ PHP_FUNCTION(locale_compose)
        if(zend_parse_parameters( ZEND_NUM_ARGS(), "a",
                &arr) == FAILURE)
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                        "locale_compose: unable to parse input params", 0 );
                RETURN_FALSE;
        }
 
@@ -1108,9 +1093,6 @@ PHP_FUNCTION(locale_parse)
     if(zend_parse_parameters( ZEND_NUM_ARGS(), "s",
         &loc_name, &loc_name_len ) == FAILURE)
     {
-        intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-             "locale_parse: unable to parse input params", 0 );
-
         RETURN_FALSE;
     }
 
@@ -1158,9 +1140,6 @@ PHP_FUNCTION(locale_get_all_variants)
        if(zend_parse_parameters( ZEND_NUM_ARGS(), "s",
        &loc_name, &loc_name_len ) == FAILURE)
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-            "locale_parse: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -1264,9 +1243,6 @@ PHP_FUNCTION(locale_filter_matches)
                &lang_tag, &lang_tag_len , &loc_range , &loc_range_len ,
                &boolCanonical) == FAILURE)
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-               "locale_filter_matches: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -1540,7 +1516,6 @@ PHP_FUNCTION(locale_lookup)
 
        if(zend_parse_parameters( ZEND_NUM_ARGS(), "as|bS", &arr, &loc_range, &loc_range_len,
                &boolCanonical, &fallback_loc_str) == FAILURE) {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "locale_lookup: unable to parse input params", 0 );
                RETURN_FALSE;
        }
 
@@ -1594,8 +1569,6 @@ PHP_FUNCTION(locale_accept_from_http)
 
        if(zend_parse_parameters( ZEND_NUM_ARGS(), "s", &http_accept, &http_accept_len) == FAILURE)
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-               "locale_accept_from_http: unable to parse input parameters", 0 );
                RETURN_FALSE;
        }
        if(http_accept_len > ULOC_FULLNAME_CAPACITY) {
index f9e30f861673432f258fb331dd3e699612b7e07f..dd4420a6ad3d61c082689d17cae49782963d74d8 100644 (file)
@@ -43,8 +43,6 @@ static int msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor)
        if( zend_parse_parameters( ZEND_NUM_ARGS(), "ss",
                &locale, &locale_len, &pattern, &pattern_len ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "msgfmt_create: unable to parse input parameters", 0 );
                return FAILURE;
        }
 
@@ -136,9 +134,6 @@ PHP_FUNCTION( msgfmt_get_error_code )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, MessageFormatter_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "msgfmt_get_error_code: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -164,9 +159,6 @@ PHP_FUNCTION( msgfmt_get_error_message )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, MessageFormatter_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "msgfmt_get_error_message: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index 51d9df049f94f80a2a05782c412f2d9745d0e862..d9f36c6ac372ddad2ab80204f254c771965ef635 100644 (file)
@@ -38,8 +38,6 @@ PHP_FUNCTION( msgfmt_get_pattern )
        /* Parse parameters. */
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O", &object, MessageFormatter_ce_ptr ) == FAILURE )
        {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "msgfmt_get_pattern: unable to parse input params", 0 );
                RETURN_FALSE;
        }
 
@@ -71,8 +69,6 @@ PHP_FUNCTION( msgfmt_set_pattern )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os",
                &object, MessageFormatter_ce_ptr, &value, &value_len ) == FAILURE )
        {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "msgfmt_set_pattern: unable to parse input params", 0);
                RETURN_FALSE;
        }
 
@@ -127,9 +123,6 @@ PHP_FUNCTION( msgfmt_get_locale )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, MessageFormatter_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "msgfmt_get_locale: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index a11c167a4bc30ae94564f04d7b88dca8ec120374..58c5dcb99a46e3c816de37c94cc872f97711edbb 100644 (file)
@@ -65,9 +65,6 @@ PHP_FUNCTION( msgfmt_format )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Oa",
                &object, MessageFormatter_ce_ptr,  &args ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "msgfmt_format: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -99,9 +96,6 @@ PHP_FUNCTION( msgfmt_format_message )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "ssa",
                  &slocale, &slocale_len, &pattern, &pattern_len, &args ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "msgfmt_format_message: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index c517288bff2c8e045125965ce3e3e4372fc938ac..e1de6a883f9dcaf69c3875ba70e4cd4845ef8256 100644 (file)
@@ -69,9 +69,6 @@ PHP_FUNCTION( msgfmt_parse )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os",
                &object, MessageFormatter_ce_ptr,  &source, &source_len ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "msgfmt_parse: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -104,9 +101,6 @@ PHP_FUNCTION( msgfmt_parse_message )
        if( zend_parse_parameters( ZEND_NUM_ARGS(), "sss",
                  &slocale, &slocale_len, &pattern, &pattern_len, &source, &src_len ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "msgfmt_parse_message: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index 6c56cdcf2afc76177555de811739bca05d91e2ad..a6aa66e385e508e82c20b06aeec88480dd956b26 100644 (file)
@@ -109,9 +109,6 @@ PHP_FUNCTION( normalizer_normalize )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "s|l",
                                &input, &input_len, &form ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                                                "normalizer_normalize: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -249,9 +246,6 @@ PHP_FUNCTION( normalizer_is_normalized )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "s|l",
                                &input, &input_len, &form) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                               "normalizer_is_normalized: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
index 2b7d3d8e133d8e57a6b3c3a7ac46c1eeada871cf..d20fe7d55fa0c981ef8818526462c6f183cfb511 100644 (file)
@@ -91,8 +91,6 @@ static int resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constr
        if( zend_parse_parameters( ZEND_NUM_ARGS(), "s!s!|b",
                &locale, &locale_len, &bundlename, &bundlename_len, &fallback ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "resourcebundle_ctor: unable to parse input parameters", 0 );
                return FAILURE;
        }
 
@@ -258,8 +256,6 @@ PHP_FUNCTION( resourcebundle_get )
        zval *      object;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oz|b",    &object, ResourceBundle_ce_ptr, &offset, &fallback ) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "resourcebundle_get: unable to parse input params", 0);
                RETURN_FALSE;
        }
 
@@ -299,8 +295,6 @@ PHP_FUNCTION( resourcebundle_count )
        RESOURCEBUNDLE_METHOD_INIT_VARS;
 
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O", &object, ResourceBundle_ce_ptr ) == FAILURE ) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "resourcebundle_count: unable to parse input params", 0);
                RETURN_FALSE;
        }
 
@@ -333,8 +327,6 @@ PHP_FUNCTION( resourcebundle_locales )
 
        if( zend_parse_parameters(ZEND_NUM_ARGS(), "s", &bundlename, &bundlename_len ) == FAILURE )
        {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "resourcebundle_locales: unable to parse input params", 0);
                RETURN_FALSE;
        }
 
@@ -378,8 +370,6 @@ PHP_FUNCTION( resourcebundle_get_error_code )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, ResourceBundle_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "resourcebundle_get_error_code: unable to parse input params", 0 );
                RETURN_FALSE;
        }
 
@@ -406,8 +396,6 @@ PHP_FUNCTION( resourcebundle_get_error_message )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, ResourceBundle_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "resourcebundle_get_error_message: unable to parse input params", 0 );
                RETURN_FALSE;
        }
 
index 3f91db3130da247671eda95ad91de55ab0315a59..e70c9b41951ea9b69b4d202e958ecb8fbebcb92c 100644 (file)
@@ -55,8 +55,6 @@ 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) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_create_time_zone: bad arguments", 0);
                RETURN_NULL();
        }
 
@@ -82,8 +80,6 @@ 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) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_from_date_time_zone: bad arguments", 0);
                RETURN_NULL();
        }
 
@@ -109,8 +105,6 @@ U_CFUNC PHP_FUNCTION(intltz_create_default)
        intl_error_reset(NULL);
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_create_default: bad arguments", 0);
                RETURN_NULL();
        }
 
@@ -123,8 +117,6 @@ U_CFUNC PHP_FUNCTION(intltz_get_gmt)
        intl_error_reset(NULL);
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_get_gmt: bad arguments", 0);
                RETURN_NULL();
        }
 
@@ -136,8 +128,6 @@ U_CFUNC PHP_FUNCTION(intltz_get_unknown)
        intl_error_reset(NULL);
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_get_unknown: bad arguments", 0);
                RETURN_NULL();
        }
 
@@ -153,8 +143,6 @@ 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) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_create_enumeration: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -213,8 +201,6 @@ U_CFUNC PHP_FUNCTION(intltz_count_equivalent_ids)
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "s",
                        &str_id, &str_id_len) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_count_equivalent_ids: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -244,8 +230,6 @@ U_CFUNC PHP_FUNCTION(intltz_create_time_zone_id_enumeration)
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|s!l!",
                        &zoneType, &region, &region_len, &offset_arg, &arg3isnull) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_create_time_zone_id_enumeration: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -285,8 +269,6 @@ 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) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_get_canonical_id: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -324,8 +306,6 @@ U_CFUNC PHP_FUNCTION(intltz_get_region)
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "s",
                        &str_id, &str_id_len) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_get_region: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -348,8 +328,6 @@ U_CFUNC PHP_FUNCTION(intltz_get_tz_data_version)
        intl_error_reset(NULL);
 
        if (zend_parse_parameters_none() == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_get_tz_data_version: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -371,8 +349,6 @@ U_CFUNC PHP_FUNCTION(intltz_get_equivalent_id)
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl",
                        &str_id, &str_id_len, &index) == FAILURE ||
                        index < (zend_long)INT32_MIN || index > (zend_long)INT32_MAX) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_get_equivalent_id: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -399,8 +375,6 @@ U_CFUNC PHP_FUNCTION(intltz_get_id)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, TimeZone_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_get_id: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -424,8 +398,6 @@ U_CFUNC PHP_FUNCTION(intltz_use_daylight_time)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, TimeZone_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_use_daylight_time: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -447,8 +419,6 @@ U_CFUNC PHP_FUNCTION(intltz_get_offset)
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Odbz/z/", &object, TimeZone_ce_ptr, &date, &local, &rawOffsetArg,
                        &dstOffsetArg) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_get_offset: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -473,8 +443,6 @@ U_CFUNC PHP_FUNCTION(intltz_get_raw_offset)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, TimeZone_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_get_raw_offset: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -492,8 +460,6 @@ U_CFUNC PHP_FUNCTION(intltz_has_same_rules)
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "OO", &object, TimeZone_ce_ptr, &other_object, TimeZone_ce_ptr)
                        == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_has_same_rules: bad arguments", 0);
                RETURN_FALSE;
        }
        TIMEZONE_METHOD_FETCH_OBJECT;
@@ -525,8 +491,6 @@ U_CFUNC PHP_FUNCTION(intltz_get_display_name)
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O|bls!", &object, TimeZone_ce_ptr, &daylight, &display_type,
                        &locale_str, &dummy) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_get_display_name: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -564,8 +528,6 @@ U_CFUNC PHP_FUNCTION(intltz_get_dst_savings)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, TimeZone_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_get_dst_savings: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -581,8 +543,6 @@ U_CFUNC PHP_FUNCTION(intltz_to_date_time_zone)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, TimeZone_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_to_date_time_zone: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -604,8 +564,6 @@ U_CFUNC PHP_FUNCTION(intltz_get_error_code)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, TimeZone_ce_ptr) == FAILURE) {
-               intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_get_error_code: bad arguments", 0);
                RETURN_FALSE;
        }
 
@@ -624,8 +582,6 @@ U_CFUNC PHP_FUNCTION(intltz_get_error_message)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, TimeZone_ce_ptr) == FAILURE) {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "intltz_get_error_message: bad arguments", 0 );
                RETURN_FALSE;
        }
 
index 25d0b9a4dae21aac23587251c1b4c914a76460e8..fb438e2362eff54897f439aff651f6b82a91c323 100644 (file)
@@ -115,8 +115,6 @@ PHP_FUNCTION( transliterator_create )
        if( zend_parse_parameters( ZEND_NUM_ARGS(), "s|l",
                &str_id, &str_id_len, &direction ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "transliterator_create: bad arguments", 0 );
                RETURN_NULL();
        }
 
@@ -149,8 +147,6 @@ PHP_FUNCTION( transliterator_create_from_rules )
        if( zend_parse_parameters( ZEND_NUM_ARGS(), "s|l",
                &str_rules, &str_rules_len, &direction ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "transliterator_create_from_rules: bad arguments", 0 );
                RETURN_NULL();
        }
 
@@ -214,8 +210,6 @@ PHP_FUNCTION( transliterator_create_inverse )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, Transliterator_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "transliterator_create_inverse: bad arguments", 0 );
                RETURN_NULL();
        }
 
@@ -250,12 +244,7 @@ PHP_FUNCTION( transliterator_list_ids )
 
        if( zend_parse_parameters_none() == FAILURE )
        {
-               /* seems to be the convention in this lib to return false instead of
-                * null on bad parameter types, except on constructors and factory
-                * methods */
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "transliterator_list_ids: bad arguments", 0 );
-               RETURN_FALSE;
+               return;
        }
 
        en = utrans_openIDs( &status );
@@ -317,8 +306,6 @@ PHP_FUNCTION( transliterator_transliterate )
                if( zend_parse_parameters( ZEND_NUM_ARGS(), "zs|ll",
                        &arg1, &str, &str_len, &start, &limit ) == FAILURE )
                {
-                       intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                               "transliterator_transliterate: bad arguments", 0 );
                        RETURN_FALSE;
                }
 
@@ -352,8 +339,6 @@ PHP_FUNCTION( transliterator_transliterate )
        else if( zend_parse_parameters( ZEND_NUM_ARGS(), "s|ll",
                &str, &str_len, &start, &limit ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "transliterator_transliterate: bad arguments", 0 );
                RETURN_FALSE;
        }
 
@@ -480,9 +465,6 @@ PHP_FUNCTION( transliterator_get_error_code )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, Transliterator_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "transliterator_get_error_code: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }
 
@@ -508,9 +490,6 @@ PHP_FUNCTION( transliterator_get_error_message )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, Transliterator_ce_ptr ) == FAILURE )
        {
-               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                       "transliterator_get_error_message: unable to parse input params", 0 );
-
                RETURN_FALSE;
        }