Use RETURN_THROWS() after zend_parse_method_parameters()

diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
index 3a17410b1375b0400472b38891f588f0869df397..717186295e32193300e1b9a73d6718b636619e3d 100644 (file)
--- a/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@ -196,7 +196,7 @@ ZEND_METHOD(Closure, bind)
        zend_class_entry *ce, *called_scope;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oo!|z", &zclosure, zend_ce_closure, &newthis, &scope_arg) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        closure = (zend_closure *)Z_OBJ_P(zclosure);

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 13fd7e005e3765d35c9077e07251e83ed2697a0c..74f85d29feb81743ef0b377789de1eef7d1e0d4f 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2838,7 +2838,7 @@ PHP_FUNCTION(date_format)
        size_t       format_len;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &object, date_ce_interface, &format, &format_len) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
        dateobj = Z_PHPDATE_P(object);
        DATE_CHECK_INITIALIZED(dateobj->time, DateTime);
@@ -2924,7 +2924,7 @@ PHP_FUNCTION(date_modify)
        size_t        modify_len;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &object, date_ce_date, &modify, &modify_len) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
 
        if (!php_date_modify(object, modify, modify_len)) {
@@ -2982,7 +2982,7 @@ PHP_FUNCTION(date_add)
        zval *object, *interval;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &object, date_ce_date, &interval, date_ce_interval) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
 
        php_date_add(object, interval, return_value);
@@ -3039,7 +3039,7 @@ PHP_FUNCTION(date_sub)
        zval *object, *interval;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &object, date_ce_date, &interval, date_ce_interval) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
 
        php_date_sub(object, interval, return_value);
@@ -3096,7 +3096,7 @@ PHP_FUNCTION(date_timezone_get)
        php_date_obj     *dateobj;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, date_ce_interface) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
        dateobj = Z_PHPDATE_P(object);
        DATE_CHECK_INITIALIZED(dateobj->time, DateTime);
@@ -3143,7 +3143,7 @@ PHP_FUNCTION(date_timezone_set)
        zval *timezone_object;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &object, date_ce_date, &timezone_object, date_ce_timezone) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
 
        php_date_timezone_set(object, timezone_object, return_value);
@@ -3182,7 +3182,7 @@ PHP_FUNCTION(date_offset_get)
        timelib_time_offset *offset;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, date_ce_interface) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
        dateobj = Z_PHPDATE_P(object);
        DATE_CHECK_INITIALIZED(dateobj->time, DateTime);
@@ -3229,7 +3229,7 @@ PHP_FUNCTION(date_time_set)
        zend_long  h, i, s = 0, ms = 0;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oll|ll", &object, date_ce_date, &h, &i, &s, &ms) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
 
        php_date_time_set(object, h, i, s, ms, return_value);
@@ -3279,7 +3279,7 @@ PHP_FUNCTION(date_date_set)
        zend_long  y, m, d;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Olll", &object, date_ce_date, &y, &m, &d) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
 
        php_date_date_set(object, y, m, d, return_value);
@@ -3333,7 +3333,7 @@ PHP_FUNCTION(date_isodate_set)
        zend_long  y, w, d = 1;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oll|l", &object, date_ce_date, &y, &w, &d) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
 
        php_date_isodate_set(object, y, w, d, return_value);
@@ -3382,7 +3382,7 @@ PHP_FUNCTION(date_timestamp_set)
        zend_long  timestamp;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &object, date_ce_date, &timestamp) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
 
        php_date_timestamp_set(object, timestamp, return_value);
@@ -3422,7 +3422,7 @@ PHP_FUNCTION(date_timestamp_get)
        int           error;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, date_ce_interface) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
        dateobj = Z_PHPDATE_P(object);
        DATE_CHECK_INITIALIZED(dateobj->time, DateTime);
@@ -3448,7 +3448,7 @@ PHP_FUNCTION(date_diff)
        zend_bool      absolute = 0;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO|b", &object1, date_ce_interface, &object2, date_ce_interface, &absolute) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
        dateobj1 = Z_PHPDATE_P(object1);
        dateobj2 = Z_PHPDATE_P(object2);
@@ -3606,7 +3606,7 @@ PHP_FUNCTION(timezone_name_get)
        php_timezone_obj *tzobj;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, date_ce_timezone) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
        tzobj = Z_PHPTIMEZONE_P(object);
        DATE_CHECK_INITIALIZED(tzobj->initialized, DateTimeZone);
@@ -3652,7 +3652,7 @@ PHP_FUNCTION(timezone_offset_get)
        timelib_time_offset *offset;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &object, date_ce_timezone, &dateobject, date_ce_interface) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
        tzobj = Z_PHPTIMEZONE_P(object);
        DATE_CHECK_INITIALIZED(tzobj->initialized, DateTimeZone);
@@ -3686,7 +3686,7 @@ PHP_FUNCTION(timezone_transitions_get)
        zend_long            timestamp_begin = ZEND_LONG_MIN, timestamp_end = ZEND_LONG_MAX;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|ll", &object, date_ce_timezone, &timestamp_begin, &timestamp_end) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
        tzobj = Z_PHPTIMEZONE_P(object);
        DATE_CHECK_INITIALIZED(tzobj->initialized, DateTimeZone);
@@ -3765,7 +3765,7 @@ PHP_FUNCTION(timezone_location_get)
        php_timezone_obj    *tzobj;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, date_ce_timezone) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
        tzobj = Z_PHPTIMEZONE_P(object);
        DATE_CHECK_INITIALIZED(tzobj->initialized, DateTimeZone);
@@ -4195,7 +4195,7 @@ PHP_FUNCTION(date_interval_format)
        size_t            format_len;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &object, date_ce_interval, &format, &format_len) == FAILURE) {
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
        diobj = Z_PHPINTERVAL_P(object);
        DATE_CHECK_INITIALIZED(diobj->initialized, DateInterval);

diff --git a/ext/intl/calendar/calendar_methods.cpp b/ext/intl/calendar/calendar_methods.cpp
index 76a50e0a1092c288c1f2f71b34c2882c4ce29ce2..55cb9536118fe76a2c73636e4882609081b87bce 100644 (file)
--- a/ext/intl/calendar/calendar_methods.cpp
+++ b/ext/intl/calendar/calendar_methods.cpp
@@ -218,7 +218,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        if (field < 0 || field >= UCAL_FIELD_COUNT) {
@@ -249,7 +249,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_time)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, Calendar_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -268,7 +268,7 @@ U_CFUNC PHP_FUNCTION(intlcal_set_time)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Od",
                        &object, Calendar_ce_ptr, &time_arg) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -287,7 +287,7 @@ U_CFUNC PHP_FUNCTION(intlcal_add)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Oll", &object, Calendar_ce_ptr, &field, &amount) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if (field < 0 || field >= UCAL_FIELD_COUNT) {
@@ -317,7 +317,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -349,7 +349,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -407,7 +407,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        for (i = 0; i < variant; i++) {
@@ -464,12 +464,12 @@ 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) {
-                       return;
+                       RETURN_THROWS();
                }
                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) {
-               return;
+               RETURN_THROWS();
        }
 
        if (field < 0 || field >= UCAL_FIELD_COUNT) {
@@ -506,7 +506,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -534,7 +534,7 @@ U_CFUNC PHP_FUNCTION(intlcal_field_difference)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Odl", &object, Calendar_ce_ptr, &when, &field) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if (field < 0 || field >= UCAL_FIELD_COUNT) {
@@ -572,7 +572,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        if (dow < UCAL_SUNDAY || dow > UCAL_SATURDAY) {
@@ -597,7 +597,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -620,7 +620,7 @@ static void _php_intlcal_field_ret_in32t_method(
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, Calendar_ce_ptr, &field) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if (field < 0 || field >= UCAL_FIELD_COUNT) {
@@ -657,7 +657,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_locale)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, Calendar_ce_ptr, &locale_type) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if (locale_type != ULOC_ACTUAL_LOCALE && locale_type != ULOC_VALID_LOCALE) {
@@ -688,7 +688,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -712,7 +712,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_time_zone)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, Calendar_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -733,7 +733,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_type)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, Calendar_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -748,7 +748,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_weekend_transition)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, Calendar_ce_ptr, &dow) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if (dow < UCAL_SUNDAY || dow > UCAL_SATURDAY) {
@@ -773,7 +773,7 @@ U_CFUNC PHP_FUNCTION(intlcal_in_daylight_time)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, Calendar_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -794,7 +794,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        other_co = Z_INTL_CALENDAR_P(other_object);
@@ -815,7 +815,7 @@ U_CFUNC PHP_FUNCTION(intlcal_is_lenient)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, Calendar_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -830,7 +830,7 @@ U_CFUNC PHP_FUNCTION(intlcal_is_set)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, Calendar_ce_ptr, &field) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if (field < 0 || field >= UCAL_FIELD_COUNT) {
@@ -852,7 +852,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -875,7 +875,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        if (dow < UCAL_SUNDAY || dow > UCAL_SATURDAY) {
@@ -898,7 +898,7 @@ U_CFUNC PHP_FUNCTION(intlcal_set_lenient)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ob", &object, Calendar_ce_ptr, &is_lenient) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -915,7 +915,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        if (num_days < 1 || num_days > 7) {
@@ -941,7 +941,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -964,7 +964,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -978,7 +978,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -993,7 +993,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        if (option != UCAL_WALLTIME_FIRST && option != UCAL_WALLTIME_LAST) {
@@ -1016,7 +1016,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        if (option != UCAL_WALLTIME_FIRST && option != UCAL_WALLTIME_LAST
@@ -1128,7 +1128,7 @@ U_CFUNC PHP_FUNCTION(intlcal_to_date_time)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, Calendar_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -1206,7 +1206,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_error_code)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, Calendar_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object (without resetting its last error code ). */
@@ -1224,7 +1224,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_error_message)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, Calendar_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
 

diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp
index f258e2661ae4ebbe5c758d5af96d39b3e69e530e..72cbb1d2c61ffc15fb3403944ea42c29636d7a4b 100644 (file)
--- a/ext/intl/calendar/gregoriancalendar_methods.cpp
+++ b/ext/intl/calendar/gregoriancalendar_methods.cpp
@@ -207,7 +207,7 @@ U_CFUNC PHP_FUNCTION(intlgregcal_set_gregorian_change)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Od", &object, GregorianCalendar_ce_ptr, &date) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -225,7 +225,7 @@ U_CFUNC PHP_FUNCTION(intlgregcal_get_gregorian_change)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, GregorianCalendar_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        CALENDAR_METHOD_FETCH_OBJECT;
@@ -240,7 +240,7 @@ U_CFUNC PHP_FUNCTION(intlgregcal_is_leap_year)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Ol", &object, GregorianCalendar_ce_ptr, &year) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if (year < INT32_MIN || year > INT32_MAX) {

diff --git a/ext/intl/collator/collator_attr.c b/ext/intl/collator/collator_attr.c
index ff30cc3fd52ee000b39a21ac93329e9c1886ff2b..144a9dc171bb688bb2a50713d701e9e49f6c24dd 100644 (file)
--- a/ext/intl/collator/collator_attr.c
+++ b/ext/intl/collator/collator_attr.c
@@ -39,7 +39,7 @@ PHP_FUNCTION( collator_get_attribute )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ol",
                &object, Collator_ce_ptr, &attribute ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -67,7 +67,7 @@ PHP_FUNCTION( collator_set_attribute )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Oll",
                &object, Collator_ce_ptr, &attribute, &value ) == FAILURE)
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -94,7 +94,7 @@ PHP_FUNCTION( collator_get_strength )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, Collator_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -120,7 +120,7 @@ PHP_FUNCTION( collator_set_strength )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ol",
                &object, Collator_ce_ptr, &strength ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */

diff --git a/ext/intl/collator/collator_compare.c b/ext/intl/collator/collator_compare.c
index 17d5aff12ef9b1b5ea2bafcfc387a6a7f03db1fc..f4afc757860b86b17a2da9c27a0a807b85e47890 100644 (file)
--- a/ext/intl/collator/collator_compare.c
+++ b/ext/intl/collator/collator_compare.c
@@ -47,7 +47,7 @@ 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 )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */

diff --git a/ext/intl/collator/collator_error.c b/ext/intl/collator/collator_error.c
index 337696fb2f153d9ffe9752059325b588a0860c58..679c4557b458b69618cde5429f6144bf67298757 100644 (file)
--- a/ext/intl/collator/collator_error.c
+++ b/ext/intl/collator/collator_error.c
@@ -34,7 +34,7 @@ PHP_FUNCTION( collator_get_error_code )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, Collator_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object (without resetting its last error code). */
@@ -62,7 +62,7 @@ PHP_FUNCTION( collator_get_error_message )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, Collator_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object (without resetting its last error code). */

diff --git a/ext/intl/collator/collator_locale.c b/ext/intl/collator/collator_locale.c
index 66390c2d327766be7b534fa636727ddf998d5ace..dcf3a4917eab52609512989cc78b821666bb7802 100644 (file)
--- a/ext/intl/collator/collator_locale.c
+++ b/ext/intl/collator/collator_locale.c
@@ -40,7 +40,7 @@ PHP_FUNCTION( collator_get_locale )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ol",
                &object, Collator_ce_ptr, &type ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */

diff --git a/ext/intl/collator/collator_sort.c b/ext/intl/collator/collator_sort.c
index bd235d804d722cf1d88fd9a6a0758d042dadeeea..cc3e6b6236a7ff469e048e9847f327bf8fa9f009 100644 (file)
--- a/ext/intl/collator/collator_sort.c
+++ b/ext/intl/collator/collator_sort.c
@@ -301,7 +301,7 @@ 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 )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -392,7 +392,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Oa",
                &object, Collator_ce_ptr, &array ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -555,7 +555,7 @@ PHP_FUNCTION( collator_get_sort_key )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os",
                &object, Collator_ce_ptr, &str, &str_len ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */

diff --git a/ext/intl/dateformat/dateformat.c b/ext/intl/dateformat/dateformat.c
index 0338c3199de45f18b7fb5eb0f072e65b6089fa16..79e1a3f492288f3a2e77d4a3d0f27e841d73f771 100644 (file)
--- a/ext/intl/dateformat/dateformat.c
+++ b/ext/intl/dateformat/dateformat.c
@@ -75,7 +75,7 @@ PHP_FUNCTION( datefmt_get_error_code )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, IntlDateFormatter_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        dfo = Z_INTL_DATEFORMATTER_P( object );
@@ -99,7 +99,7 @@ PHP_FUNCTION( datefmt_get_error_message )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, IntlDateFormatter_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        dfo = Z_INTL_DATEFORMATTER_P( object );

diff --git a/ext/intl/dateformat/dateformat_attr.c b/ext/intl/dateformat/dateformat_attr.c
index e784880972363802166a922b6ca48a826f240be5..4ce478c1fcd7fadd240b11d81e4922a798304844 100644 (file)
--- a/ext/intl/dateformat/dateformat_attr.c
+++ b/ext/intl/dateformat/dateformat_attr.c
@@ -36,7 +36,7 @@ PHP_FUNCTION( datefmt_get_datetype )
        /* Parse parameters. */
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O", &object, IntlDateFormatter_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -60,7 +60,7 @@ PHP_FUNCTION( datefmt_get_timetype )
        /* Parse parameters. */
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O", &object, IntlDateFormatter_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -89,7 +89,7 @@ PHP_FUNCTION( datefmt_get_pattern )
        /* Parse parameters. */
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O", &object, IntlDateFormatter_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -132,7 +132,7 @@ PHP_FUNCTION( datefmt_set_pattern )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os",
                &object, IntlDateFormatter_ce_ptr,  &value, &value_len ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        DATE_FORMAT_METHOD_FETCH_OBJECT;
@@ -169,7 +169,7 @@ PHP_FUNCTION( datefmt_get_locale )
                &object, IntlDateFormatter_ce_ptr,&loc_type) == FAILURE )
        {
 
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -196,7 +196,7 @@ PHP_FUNCTION( datefmt_is_lenient )
                &object, IntlDateFormatter_ce_ptr ) == FAILURE )
        {
 
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -221,7 +221,7 @@ PHP_FUNCTION( datefmt_set_lenient )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ob",
        &object, IntlDateFormatter_ce_ptr,&isLenient ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */

diff --git a/ext/intl/dateformat/dateformat_attrcpp.cpp b/ext/intl/dateformat/dateformat_attrcpp.cpp
index 8b808fbe9ed561de329910030ce8cf2fac773e3b..c37c451565d88eb0d837a11fb9c844552f066771 100644 (file)
--- a/ext/intl/dateformat/dateformat_attrcpp.cpp
+++ b/ext/intl/dateformat/dateformat_attrcpp.cpp
@@ -47,7 +47,7 @@ U_CFUNC PHP_FUNCTION(datefmt_get_timezone_id)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, IntlDateFormatter_ce_ptr ) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        DATE_FORMAT_METHOD_FETCH_OBJECT;
@@ -71,7 +71,7 @@ U_CFUNC PHP_FUNCTION(datefmt_get_timezone)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, IntlDateFormatter_ce_ptr ) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        DATE_FORMAT_METHOD_FETCH_OBJECT;
@@ -99,7 +99,7 @@ U_CFUNC PHP_FUNCTION(datefmt_set_timezone)
 
        if ( zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "Oz", &object, IntlDateFormatter_ce_ptr, &timezone_zv) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        DATE_FORMAT_METHOD_FETCH_OBJECT;
@@ -124,7 +124,7 @@ U_CFUNC PHP_FUNCTION(datefmt_get_calendar)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, IntlDateFormatter_ce_ptr ) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        DATE_FORMAT_METHOD_FETCH_OBJECT;
@@ -149,7 +149,7 @@ U_CFUNC PHP_FUNCTION(datefmt_get_calendar_object)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, IntlDateFormatter_ce_ptr ) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        DATE_FORMAT_METHOD_FETCH_OBJECT;
@@ -183,7 +183,7 @@ U_CFUNC PHP_FUNCTION(datefmt_set_calendar)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oz",
                        &object, IntlDateFormatter_ce_ptr, &calendar_zv) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        DATE_FORMAT_METHOD_FETCH_OBJECT;

diff --git a/ext/intl/dateformat/dateformat_format.c b/ext/intl/dateformat/dateformat_format.c
index 9f77baa7457668977723c6dc33780ac19f0f35d6..3c70089b7ab58de42d13acbc78c6655f1bf9f217 100644 (file)
--- a/ext/intl/dateformat/dateformat_format.c
+++ b/ext/intl/dateformat/dateformat_format.c
@@ -161,7 +161,7 @@ PHP_FUNCTION(datefmt_format)
                        &object, IntlDateFormatter_ce_ptr, &zarg) == FAILURE) {
                intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_format: unable "
                                "to parse input params", 0 );
-               return;
+               RETURN_THROWS();
        }
 
        DATE_FORMAT_METHOD_FETCH_OBJECT;

diff --git a/ext/intl/dateformat/dateformat_parse.c b/ext/intl/dateformat/dateformat_parse.c
index 0e0431eb1f664fd902e659d42cab1c859ce4001d..c6fc4fa9ca8c03fb3d9cc9341278e75569e915cf 100644 (file)
--- a/ext/intl/dateformat/dateformat_parse.c
+++ b/ext/intl/dateformat/dateformat_parse.c
@@ -135,7 +135,7 @@ 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 ){
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -179,7 +179,7 @@ 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 ){
-               return;
+               RETURN_THROWS();
        }
 
     /* Fetch the object. */

diff --git a/ext/intl/formatter/formatter_attr.c b/ext/intl/formatter/formatter_attr.c
index 5b128d48531ded4922adfca62fe7e7a0d0472360..49b11c62ba7cfc5739a6167359a0fc97ac0c9d49 100644 (file)
--- a/ext/intl/formatter/formatter_attr.c
+++ b/ext/intl/formatter/formatter_attr.c
@@ -37,7 +37,7 @@ PHP_FUNCTION( numfmt_get_attribute )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ol",
                &object, NumberFormatter_ce_ptr, &attribute ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -107,7 +107,7 @@ PHP_FUNCTION( numfmt_get_text_attribute )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ol",
                &object, NumberFormatter_ce_ptr, &attribute ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -145,7 +145,7 @@ PHP_FUNCTION( numfmt_set_attribute )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Olz",
                &object, NumberFormatter_ce_ptr, &attribute, &value ) == FAILURE)
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -205,7 +205,7 @@ PHP_FUNCTION( numfmt_set_text_attribute )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ols",
                &object, NumberFormatter_ce_ptr, &attribute, &value, &len ) == FAILURE)
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -243,7 +243,7 @@ PHP_FUNCTION( numfmt_get_symbol )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ol",
                &object, NumberFormatter_ce_ptr, &symbol ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        if(symbol >= UNUM_FORMAT_SYMBOL_COUNT || symbol < 0) {
@@ -289,7 +289,7 @@ PHP_FUNCTION( numfmt_set_symbol )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ols",
                &object, NumberFormatter_ce_ptr, &symbol, &value, &value_len ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        if (symbol >= UNUM_FORMAT_SYMBOL_COUNT || symbol < 0) {
@@ -331,7 +331,7 @@ PHP_FUNCTION( numfmt_get_pattern )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, NumberFormatter_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -371,7 +371,7 @@ PHP_FUNCTION( numfmt_set_pattern )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os",
                &object, NumberFormatter_ce_ptr, &value, &value_len ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        FORMATTER_METHOD_FETCH_OBJECT;
@@ -406,7 +406,7 @@ PHP_FUNCTION( numfmt_get_locale )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O|l",
                &object, NumberFormatter_ce_ptr, &type ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */

diff --git a/ext/intl/formatter/formatter_format.c b/ext/intl/formatter/formatter_format.c
index 14a921e8dbc1394d96114d316ed3b805d35c3d81..2a042ce08e71fb71bb1a78966be2f21a8c7b383f 100644 (file)
--- a/ext/intl/formatter/formatter_format.c
+++ b/ext/intl/formatter/formatter_format.c
@@ -42,7 +42,7 @@ PHP_FUNCTION( numfmt_format )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Oz|l",
                &object, NumberFormatter_ce_ptr,  &number, &type ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -145,7 +145,7 @@ PHP_FUNCTION( numfmt_format_currency )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ods",
                &object, NumberFormatter_ce_ptr,  &number, &currency, &currency_len ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */

diff --git a/ext/intl/formatter/formatter_main.c b/ext/intl/formatter/formatter_main.c
index 33c53daa4525445cc5d95e2aaf50b1868d83a1fc..be5e6afdda66ed069697a20125f8f7f3f3b280c4 100644 (file)
--- a/ext/intl/formatter/formatter_main.c
+++ b/ext/intl/formatter/formatter_main.c
@@ -112,7 +112,7 @@ PHP_FUNCTION( numfmt_get_error_code )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, NumberFormatter_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        nfo = Z_INTL_NUMBERFORMATTER_P(object);
@@ -136,7 +136,7 @@ PHP_FUNCTION( numfmt_get_error_message )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, NumberFormatter_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        nfo = Z_INTL_NUMBERFORMATTER_P(object);

diff --git a/ext/intl/formatter/formatter_parse.c b/ext/intl/formatter/formatter_parse.c
index 76d6715d542966d14c2091fc488f768b9861a767..1278c014d539bad7ddfc52c45c8330c25bc153c6 100644 (file)
--- a/ext/intl/formatter/formatter_parse.c
+++ b/ext/intl/formatter/formatter_parse.c
@@ -52,7 +52,7 @@ 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 )
        {
-               return;
+               RETURN_THROWS();
        }
 
        if(zposition) {
@@ -134,7 +134,7 @@ 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 )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */

diff --git a/ext/intl/msgformat/msgformat.c b/ext/intl/msgformat/msgformat.c
index 1b98411d930597650ce1a2c46c9297399116b596..8e8ca8d0c8721c7ff6da404417239851ab5491bd 100644 (file)
--- a/ext/intl/msgformat/msgformat.c
+++ b/ext/intl/msgformat/msgformat.c
@@ -132,7 +132,7 @@ PHP_FUNCTION( msgfmt_get_error_code )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, MessageFormatter_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        mfo = Z_INTL_MESSAGEFORMATTER_P( object );
@@ -157,7 +157,7 @@ PHP_FUNCTION( msgfmt_get_error_message )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, MessageFormatter_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        mfo = Z_INTL_MESSAGEFORMATTER_P( object );

diff --git a/ext/intl/msgformat/msgformat_attr.c b/ext/intl/msgformat/msgformat_attr.c
index 1d9996566a0095f93ca3b5c2e2cabf63bf2e7329..02e220de5468fde8cb7b040eeac94b66c695f1ab 100644 (file)
--- a/ext/intl/msgformat/msgformat_attr.c
+++ b/ext/intl/msgformat/msgformat_attr.c
@@ -36,7 +36,7 @@ PHP_FUNCTION( msgfmt_get_pattern )
        /* Parse parameters. */
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O", &object, MessageFormatter_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -67,7 +67,7 @@ PHP_FUNCTION( msgfmt_set_pattern )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os",
                &object, MessageFormatter_ce_ptr, &value, &value_len ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        MSG_FORMAT_METHOD_FETCH_OBJECT;
@@ -121,7 +121,7 @@ PHP_FUNCTION( msgfmt_get_locale )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, MessageFormatter_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */

diff --git a/ext/intl/msgformat/msgformat_format.c b/ext/intl/msgformat/msgformat_format.c
index e36a40f492461ecb8102cc64f4e865922387aa15..56a3a11782219a96c8eda1067ce30fb21d7aa5f4 100644 (file)
--- a/ext/intl/msgformat/msgformat_format.c
+++ b/ext/intl/msgformat/msgformat_format.c
@@ -63,7 +63,7 @@ PHP_FUNCTION( msgfmt_format )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Oa",
                &object, MessageFormatter_ce_ptr,  &args ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */
@@ -94,7 +94,7 @@ PHP_FUNCTION( msgfmt_format_message )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "ssa",
                  &slocale, &slocale_len, &pattern, &pattern_len, &args ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        INTL_CHECK_LOCALE_LEN(slocale_len);

diff --git a/ext/intl/msgformat/msgformat_parse.c b/ext/intl/msgformat/msgformat_parse.c
index 2a71e59d47e924ec508a8918dd97e625e50b0803..006d9d8999aa73bde6ee72fe129d619fe575081f 100644 (file)
--- a/ext/intl/msgformat/msgformat_parse.c
+++ b/ext/intl/msgformat/msgformat_parse.c
@@ -67,7 +67,7 @@ PHP_FUNCTION( msgfmt_parse )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os",
                &object, MessageFormatter_ce_ptr,  &source, &source_len ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object. */

diff --git a/ext/intl/normalizer/normalizer_normalize.c b/ext/intl/normalizer/normalizer_normalize.c
index 791b8001627cdd393145f4ee3388bce10dcd5e7c..5a768730f6914bf14abd75c3d3aa77a3409cd282 100644 (file)
--- a/ext/intl/normalizer/normalizer_normalize.c
+++ b/ext/intl/normalizer/normalizer_normalize.c
@@ -107,7 +107,7 @@ PHP_FUNCTION( normalizer_normalize )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "s|l",
                                &input, &input_len, &form ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        expansion_factor = 1;
@@ -244,7 +244,7 @@ PHP_FUNCTION( normalizer_is_normalized )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "s|l",
                                &input, &input_len, &form) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        switch(form) {

diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c
index 634d75036be4f44edf0513e993d08442ff129562..8aa18e9f8ef4b2570ad1151fc48607010fe052f9 100644 (file)
--- a/ext/intl/resourcebundle/resourcebundle_class.c
+++ b/ext/intl/resourcebundle/resourcebundle_class.c
@@ -254,7 +254,7 @@ PHP_FUNCTION( resourcebundle_get )
        zval *      object;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oz|b",    &object, ResourceBundle_ce_ptr, &offset, &fallback ) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        resourcebundle_array_fetch(Z_OBJ_P(object), offset, return_value, fallback);
@@ -293,7 +293,7 @@ PHP_FUNCTION( resourcebundle_count )
        RESOURCEBUNDLE_METHOD_INIT_VARS;
 
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O", &object, ResourceBundle_ce_ptr ) == FAILURE ) {
-               return;
+               RETURN_THROWS();
        }
 
        RESOURCEBUNDLE_METHOD_FETCH_OBJECT;
@@ -368,7 +368,7 @@ PHP_FUNCTION( resourcebundle_get_error_code )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, ResourceBundle_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        rb = Z_INTL_RESOURCEBUNDLE_P( object );
@@ -394,7 +394,7 @@ PHP_FUNCTION( resourcebundle_get_error_message )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, ResourceBundle_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        rb = Z_INTL_RESOURCEBUNDLE_P( object );

diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp
index defeb83b0011ecc7d769f1733f44ed4a959b5e8a..d7f426dcb13bb4dd9fd1d75a57db0dda705d2a99 100644 (file)
--- a/ext/intl/timezone/timezone_methods.cpp
+++ b/ext/intl/timezone/timezone_methods.cpp
@@ -377,7 +377,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_id)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, TimeZone_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        TIMEZONE_METHOD_FETCH_OBJECT;
@@ -400,7 +400,7 @@ U_CFUNC PHP_FUNCTION(intltz_use_daylight_time)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, TimeZone_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        TIMEZONE_METHOD_FETCH_OBJECT;
@@ -421,7 +421,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        TIMEZONE_METHOD_FETCH_OBJECT;
@@ -445,7 +445,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_raw_offset)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, TimeZone_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        TIMEZONE_METHOD_FETCH_OBJECT;
@@ -462,7 +462,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
        TIMEZONE_METHOD_FETCH_OBJECT;
        other_to = Z_INTL_TIMEZONE_P(other_object);
@@ -493,7 +493,7 @@ 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) {
-               return;
+               RETURN_THROWS();
        }
 
        bool found = false;
@@ -530,7 +530,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_dst_savings)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, TimeZone_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        TIMEZONE_METHOD_FETCH_OBJECT;
@@ -545,7 +545,7 @@ U_CFUNC PHP_FUNCTION(intltz_to_date_time_zone)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(),
                        "O", &object, TimeZone_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        TIMEZONE_METHOD_FETCH_OBJECT;
@@ -566,7 +566,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_error_code)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, TimeZone_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object (without resetting its last error code ). */
@@ -584,7 +584,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_error_message)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                        &object, TimeZone_ce_ptr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
 

diff --git a/ext/intl/transliterator/transliterator_methods.c b/ext/intl/transliterator/transliterator_methods.c
index 7b8254c5eac9fddf32eaeca0f12ff9a886399204..db3634f075da6c12c4a33535de1a93c843f0207c 100644 (file)
--- a/ext/intl/transliterator/transliterator_methods.c
+++ b/ext/intl/transliterator/transliterator_methods.c
@@ -208,7 +208,7 @@ PHP_FUNCTION( transliterator_create_inverse )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, Transliterator_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        TRANSLITERATOR_METHOD_FETCH_OBJECT;
@@ -462,7 +462,7 @@ PHP_FUNCTION( transliterator_get_error_code )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, Transliterator_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
        /* Fetch the object (without resetting its last error code ). */
@@ -487,7 +487,7 @@ PHP_FUNCTION( transliterator_get_error_message )
        if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "O",
                &object, Transliterator_ce_ptr ) == FAILURE )
        {
-               return;
+               RETURN_THROWS();
        }
 
 

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index f036bc7c4770ff6e3c7139207ffa73e2c5550abd..f9404af4d8f972d65458f7b71355f7ef31960fe9 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -1196,7 +1196,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
                zend_string *class_name = NULL;
 
                if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|Sa", &mysql_result, mysqli_result_class_entry, &class_name, &ctor_params) == FAILURE) {
-                       return;
+                       RETURN_THROWS();
                }
                if (class_name == NULL) {
                        ce = zend_standard_class_def;

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index a2043d04980dc315c23d85bb35bfbf746b9434bf..05c1a729c37fde3656888ed36b1864c8211d8beb 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -142,7 +142,7 @@ PHP_FUNCTION(mysqli_affected_rows)
        my_ulonglong    rc;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
@@ -164,7 +164,7 @@ PHP_FUNCTION(mysqli_autocommit)
        zend_bool       automode;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ob", &mysql_link, mysqli_link_class_entry, &automode) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -333,7 +333,7 @@ PHP_FUNCTION(mysqli_stmt_bind_param)
 
        if (zend_parse_method_parameters((getThis()) ? 1:2, getThis(), "Os", &mysql_stmt, mysqli_stmt_class_entry,
                                                                        &types, &types_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
@@ -587,7 +587,7 @@ PHP_FUNCTION(mysqli_stmt_bind_result)
        zval            *mysql_stmt;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O+", &mysql_stmt, mysqli_stmt_class_entry, &args, &argc) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
@@ -616,7 +616,7 @@ PHP_FUNCTION(mysqli_change_user)
 #endif
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Osss!", &mysql_link, mysqli_link_class_entry, &user, &user_len, &password, &password_len, &dbname, &dbname_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -658,7 +658,7 @@ PHP_FUNCTION(mysqli_character_set_name)
        const char      *cs_name;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
@@ -718,7 +718,7 @@ PHP_FUNCTION(mysqli_close)
        MY_MYSQL        *mysql;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED);
@@ -743,7 +743,7 @@ PHP_FUNCTION(mysqli_commit)
        size_t                  name_len = 0;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|ls", &mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -767,7 +767,7 @@ PHP_FUNCTION(mysqli_data_seek)
        zend_long               offset;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &mysql_result, mysqli_result_class_entry, &offset) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
@@ -810,7 +810,7 @@ PHP_FUNCTION(mysqli_dump_debug_info)
        zval            *mysql_link;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -826,7 +826,7 @@ PHP_FUNCTION(mysqli_errno)
        zval            *mysql_link;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
        RETURN_LONG(mysql_errno(mysql->mysql));
@@ -842,7 +842,7 @@ PHP_FUNCTION(mysqli_error)
        const char      *err;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
        err = mysql_error(mysql->mysql);
@@ -863,7 +863,7 @@ PHP_FUNCTION(mysqli_stmt_execute)
 #endif
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -948,7 +948,7 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS)
 
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -1117,7 +1117,7 @@ void mysqli_stmt_fetch_mysqlnd(INTERNAL_FUNCTION_PARAMETERS)
        zend_bool       fetched_anything;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -1183,7 +1183,7 @@ PHP_FUNCTION(mysqli_fetch_field)
        const MYSQL_FIELD       *field;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
@@ -1208,7 +1208,7 @@ PHP_FUNCTION(mysqli_fetch_fields)
        unsigned int i, num_fields;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
@@ -1237,7 +1237,7 @@ PHP_FUNCTION(mysqli_fetch_field_direct)
        zend_long               offset;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &mysql_result, mysqli_result_class_entry, &offset) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
@@ -1270,7 +1270,7 @@ PHP_FUNCTION(mysqli_fetch_lengths)
 #endif
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
@@ -1305,7 +1305,7 @@ PHP_FUNCTION(mysqli_field_count)
        zval            *mysql_link;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -1323,7 +1323,7 @@ PHP_FUNCTION(mysqli_field_seek)
        zend_long       fieldnr;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &mysql_result, mysqli_result_class_entry, &fieldnr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
 
@@ -1345,7 +1345,7 @@ PHP_FUNCTION(mysqli_field_tell)
        zval            *mysql_result;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
 
@@ -1361,7 +1361,7 @@ PHP_FUNCTION(mysqli_free_result)
        zval            *mysql_result;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
 
@@ -1413,7 +1413,7 @@ PHP_FUNCTION(mysqli_get_host_info)
        zval            *mysql_link = NULL;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 #if !defined(MYSQLI_USE_MYSQLND)
@@ -1432,7 +1432,7 @@ PHP_FUNCTION(mysqli_get_proto_info)
        zval            *mysql_link = NULL;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
        RETURN_LONG(mysql_get_proto_info(mysql->mysql));
@@ -1448,7 +1448,7 @@ PHP_FUNCTION(mysqli_get_server_info)
        const char      *info;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -1467,7 +1467,7 @@ PHP_FUNCTION(mysqli_get_server_version)
        zval            *mysql_link = NULL;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -1484,7 +1484,7 @@ PHP_FUNCTION(mysqli_info)
        const char      *info;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -1562,7 +1562,7 @@ PHP_FUNCTION(mysqli_insert_id)
        zval                    *mysql_link;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
        rc = mysql_insert_id(mysql->mysql);
@@ -1579,7 +1579,7 @@ PHP_FUNCTION(mysqli_kill)
        zend_long               processid;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &mysql_link, mysqli_link_class_entry, &processid) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -1604,7 +1604,7 @@ PHP_FUNCTION(mysqli_more_results)
        zval            *mysql_link;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -1619,7 +1619,7 @@ PHP_FUNCTION(mysqli_next_result) {
        zval            *mysql_link;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -1636,7 +1636,7 @@ PHP_FUNCTION(mysqli_stmt_more_results)
        zval            *mysql_stmt;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -1651,7 +1651,7 @@ PHP_FUNCTION(mysqli_stmt_next_result) {
        zval            *mysql_stmt;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -1668,7 +1668,7 @@ PHP_FUNCTION(mysqli_num_fields)
        zval            *mysql_result;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
 
@@ -1684,7 +1684,7 @@ PHP_FUNCTION(mysqli_num_rows)
        zval            *mysql_result;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
 
@@ -1775,7 +1775,7 @@ PHP_FUNCTION(mysqli_options)
        int                             expected_type;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Olz", &mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED);
 
@@ -1827,7 +1827,7 @@ PHP_FUNCTION(mysqli_ping)
        zend_long               rc;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
        rc = mysql_ping(mysql->mysql);
@@ -1849,7 +1849,7 @@ PHP_FUNCTION(mysqli_prepare)
        MYSQLI_RESOURCE *mysqli_resource;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os",&mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -1939,7 +1939,7 @@ PHP_FUNCTION(mysqli_real_query)
        size_t          query_len;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -1970,7 +1970,7 @@ PHP_FUNCTION(mysqli_real_escape_string) {
        zend_string *newstr;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &mysql_link, mysqli_link_class_entry, &escapestr, &escapestr_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -1993,7 +1993,7 @@ PHP_FUNCTION(mysqli_rollback)
        size_t                  name_len = 0;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|ls", &mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -2019,7 +2019,7 @@ PHP_FUNCTION(mysqli_stmt_send_long_data)
        size_t          data_len;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ols", &mysql_stmt, mysqli_stmt_class_entry, &param_nr, &data, &data_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -2043,7 +2043,7 @@ PHP_FUNCTION(mysqli_stmt_affected_rows)
        my_ulonglong    rc;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -2063,7 +2063,7 @@ PHP_FUNCTION(mysqli_stmt_close)
        zval            *mysql_stmt;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -2084,7 +2084,7 @@ PHP_FUNCTION(mysqli_stmt_data_seek)
        zend_long               offset;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &mysql_stmt, mysqli_stmt_class_entry, &offset) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        if (offset < 0) {
                php_error_docref(NULL, E_WARNING, "Offset must be positive");
@@ -2105,7 +2105,7 @@ PHP_FUNCTION(mysqli_stmt_field_count)
        zval            *mysql_stmt;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -2121,7 +2121,7 @@ PHP_FUNCTION(mysqli_stmt_free_result)
        zval            *mysql_stmt;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
@@ -2139,7 +2139,7 @@ PHP_FUNCTION(mysqli_stmt_insert_id)
        zval                    *mysql_stmt;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
        rc = mysql_stmt_insert_id(stmt->stmt);
@@ -2155,7 +2155,7 @@ PHP_FUNCTION(mysqli_stmt_param_count)
        zval            *mysql_stmt;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -2171,7 +2171,7 @@ PHP_FUNCTION(mysqli_stmt_reset)
        zval            *mysql_stmt;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
@@ -2192,7 +2192,7 @@ PHP_FUNCTION(mysqli_stmt_num_rows)
        my_ulonglong    rc;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
@@ -2212,7 +2212,7 @@ PHP_FUNCTION(mysqli_select_db)
        size_t                  dbname_len;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &mysql_link, mysqli_link_class_entry, &dbname, &dbname_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -2233,7 +2233,7 @@ PHP_FUNCTION(mysqli_sqlstate)
        const char      *state;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
        state = mysql_sqlstate(mysql->mysql);
@@ -2253,7 +2253,7 @@ PHP_FUNCTION(mysqli_ssl_set)
        size_t                  ssl_parm_len[5], i;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Osssss", &mysql_link, mysqli_link_class_entry, &ssl_parm[0], &ssl_parm_len[0], &ssl_parm[1], &ssl_parm_len[1], &ssl_parm[2], &ssl_parm_len[2], &ssl_parm[3], &ssl_parm_len[3], &ssl_parm[4], &ssl_parm_len[4])   == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED);
 
@@ -2282,7 +2282,7 @@ PHP_FUNCTION(mysqli_stat)
 #endif
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -2311,7 +2311,7 @@ PHP_FUNCTION(mysqli_refresh)
        zend_long options;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &mysql_link, mysqli_link_class_entry, &options) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED);
 #ifdef MYSQLI_USE_MYSQLND
@@ -2337,7 +2337,7 @@ PHP_FUNCTION(mysqli_stmt_attr_set)
        void    *mode_p;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oll", &mysql_stmt, mysqli_stmt_class_entry, &attr, &mode_in) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -2380,7 +2380,7 @@ PHP_FUNCTION(mysqli_stmt_attr_get)
        int             rc;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &mysql_stmt, mysqli_stmt_class_entry, &attr) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -2404,7 +2404,7 @@ PHP_FUNCTION(mysqli_stmt_errno)
        zval    *mysql_stmt;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_INITIALIZED);
 
@@ -2421,7 +2421,7 @@ PHP_FUNCTION(mysqli_stmt_error)
        const char * err;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_INITIALIZED);
 
@@ -2443,7 +2443,7 @@ PHP_FUNCTION(mysqli_stmt_init)
        MYSQLI_RESOURCE *mysqli_resource;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",&mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -2475,7 +2475,7 @@ PHP_FUNCTION(mysqli_stmt_prepare)
        size_t          query_len;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &mysql_stmt, mysqli_stmt_class_entry, &query, &query_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_INITIALIZED);
 
@@ -2499,7 +2499,7 @@ PHP_FUNCTION(mysqli_stmt_result_metadata)
        MYSQLI_RESOURCE *mysqli_resource;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -2523,7 +2523,7 @@ PHP_FUNCTION(mysqli_stmt_store_result)
        zval    *mysql_stmt;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -2573,7 +2573,7 @@ PHP_FUNCTION(mysqli_stmt_sqlstate)
        const char * state;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -2596,7 +2596,7 @@ PHP_FUNCTION(mysqli_store_result)
 
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|l", &mysql_link, mysqli_link_class_entry, &flags) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 #if MYSQLI_USE_MYSQLND
@@ -2627,7 +2627,7 @@ PHP_FUNCTION(mysqli_thread_id)
        zval            *mysql_link;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -2657,7 +2657,7 @@ PHP_FUNCTION(mysqli_use_result)
        MYSQLI_RESOURCE *mysqli_resource;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -2684,7 +2684,7 @@ PHP_FUNCTION(mysqli_warning_count)
        zval            *mysql_link;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 

diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index b43d94f85da3af02d6db8b7c45346cc6475f51a2..a988e11d3b86512e4b6fe4a544152a0e5a47e4ec 100644 (file)
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -101,7 +101,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
                /* We have flags too */
                if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|s!s!s!s!l!s!l", &object, mysqli_link_class_entry,
                                &hostname, &hostname_len, &username, &username_len, &passwd, &passwd_len, &dbname, &dbname_len, &port, &port_is_null, &socket, &socket_len, &flags) == FAILURE) {
-                       return;
+                       RETURN_THROWS();
                }
 
                mysqli_resource = (Z_MYSQLI_P(object))->ptr;
@@ -440,7 +440,7 @@ PHP_FUNCTION(mysqli_fetch_all)
        zend_long               mode = MYSQLND_FETCH_NUM;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|l", &mysql_result, mysqli_result_class_entry, &mode) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
 
@@ -474,7 +474,7 @@ PHP_FUNCTION(mysqli_get_connection_stats)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                                                                         &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -491,7 +491,7 @@ PHP_FUNCTION(mysqli_error_list)
        zval            *mysql_link;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 #if defined(MYSQLI_USE_MYSQLND)
@@ -537,7 +537,7 @@ PHP_FUNCTION(mysqli_stmt_error_list)
        zval    *mysql_stmt;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_INITIALIZED);
 #if defined(MYSQLI_USE_MYSQLND)
@@ -593,7 +593,7 @@ PHP_FUNCTION(mysqli_multi_query)
        size_t          query_len;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -643,7 +643,7 @@ PHP_FUNCTION(mysqli_query)
        zend_long                               resultmode = MYSQLI_STORE_RESULT;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os|l", &mysql_link, mysqli_link_class_entry, &query, &query_len, &resultmode) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if (!query_len) {
@@ -903,7 +903,7 @@ PHP_FUNCTION(mysqli_reap_async_query)
        MYSQL_RES                       *result = NULL;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
@@ -956,7 +956,7 @@ PHP_FUNCTION(mysqli_stmt_get_result)
        zval                    *mysql_stmt;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
 
@@ -982,7 +982,7 @@ PHP_FUNCTION(mysqli_get_warnings)
        MYSQLI_WARNING          *w;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -1011,7 +1011,7 @@ PHP_FUNCTION(mysqli_stmt_get_warnings)
        MYSQLI_WARNING          *w;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &stmt_link, mysqli_stmt_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_STMT(stmt, stmt_link, MYSQLI_STATUS_VALID);
 
@@ -1038,7 +1038,7 @@ PHP_FUNCTION(mysqli_set_charset)
        size_t          csname_len;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &mysql_link, mysqli_link_class_entry, &cs_name, &csname_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -1066,7 +1066,7 @@ PHP_FUNCTION(mysqli_get_charset)
 #endif
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
@@ -1173,7 +1173,7 @@ PHP_FUNCTION(mysqli_begin_transaction)
        zend_bool       err = FALSE;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|ls", &mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
        if (flags < 0) {
@@ -1225,7 +1225,7 @@ PHP_FUNCTION(mysqli_savepoint)
        size_t                  name_len = -1;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &mysql_link, mysqli_link_class_entry, &name, &name_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
        if (!name || !name_len) {
@@ -1254,7 +1254,7 @@ PHP_FUNCTION(mysqli_release_savepoint)
        size_t                  name_len = -1;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &mysql_link, mysqli_link_class_entry, &name, &name_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
        if (!name || !name_len) {

diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c
index 4173acb03158d8092f3c55af4516cfd837cdff2c..c2c67abe0ed8b787acd645a2d766f87da7c80cdf 100644 (file)
--- a/ext/mysqli/mysqli_warning.c
+++ b/ext/mysqli/mysqli_warning.c
@@ -181,7 +181,7 @@ PHP_METHOD(mysqli_warning, next)
        if (obj->ptr) {
                if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O",
                                                                                 &mysqli_warning, mysqli_warning_class_entry) == FAILURE) {
-                       return;
+                       RETURN_THROWS();
                }
 
                MYSQLI_FETCH_RESOURCE(w, MYSQLI_WARNING *, mysqli_warning, "mysqli_warning", MYSQLI_STATUS_VALID);

diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index b045ffa29a54f04e28bba97b9a6d7e5624b7b6b1..252b97ffb40b19fa0f1fdd093a8e0268f5e61816 100644 (file)
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -1273,7 +1273,7 @@ static PHP_FUNCTION(tidy_get_opt_doc)
        zval *object;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &object, tidy_ce_doc, &optname, &optname_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        obj = Z_TIDY_P(object);
@@ -1427,7 +1427,7 @@ static PHP_FUNCTION(tidy_getopt)
        zval *object;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &object, tidy_ce_doc, &optname, &optname_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        obj = Z_TIDY_P(object);

diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c
index 5a629135bd8c6033591267e32481645cf78a5814..fc1eb822d03d15e403d2946cf3118d0e9ff3f002 100644 (file)
--- a/ext/xmlwriter/php_xmlwriter.c
+++ b/ext/xmlwriter/php_xmlwriter.c
@@ -340,7 +340,7 @@ static void php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAMETERS, xmlwriter_rea
        zval *self;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &self, xmlwriter_class_entry_ce, &name, &name_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -365,7 +365,7 @@ static void php_xmlwriter_end(INTERNAL_FUNCTION_PARAMETERS, xmlwriter_read_int_t
        zval *self;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &self, xmlwriter_class_entry_ce) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -389,7 +389,7 @@ static PHP_FUNCTION(xmlwriter_set_indent)
        zval *self;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ob", &self, xmlwriter_class_entry_ce, &indent) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -440,7 +440,7 @@ static PHP_FUNCTION(xmlwriter_start_attribute_ns)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Osss!", &self, xmlwriter_class_entry_ce,
                &prefix, &prefix_len, &name, &name_len, &uri, &uri_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -469,7 +469,7 @@ static PHP_FUNCTION(xmlwriter_write_attribute)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss", &self, xmlwriter_class_entry_ce,
                &name, &name_len, &content, &content_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -498,7 +498,7 @@ static PHP_FUNCTION(xmlwriter_write_attribute_ns)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Osss!s", &self, xmlwriter_class_entry_ce,
                &prefix, &prefix_len, &name, &name_len, &uri, &uri_len, &content, &content_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -535,7 +535,7 @@ static PHP_FUNCTION(xmlwriter_start_element_ns)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!ss!", &self, xmlwriter_class_entry_ce,
                &prefix, &prefix_len, &name, &name_len, &uri, &uri_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -581,7 +581,7 @@ static PHP_FUNCTION(xmlwriter_write_element)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os|s!", &self, xmlwriter_class_entry_ce,
                &name, &name_len, &content, &content_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -621,7 +621,7 @@ static PHP_FUNCTION(xmlwriter_write_element_ns)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!ss!|s!", &self, xmlwriter_class_entry_ce,
                &prefix, &prefix_len, &name, &name_len, &uri, &uri_len, &content, &content_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -677,7 +677,7 @@ static PHP_FUNCTION(xmlwriter_write_pi)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss", &self, xmlwriter_class_entry_ce,
                &name, &name_len, &content, &content_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -703,7 +703,7 @@ static PHP_FUNCTION(xmlwriter_start_cdata)
        zval *self;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &self, xmlwriter_class_entry_ce) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -759,7 +759,7 @@ static PHP_FUNCTION(xmlwriter_start_comment)
        zval *self;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &self, xmlwriter_class_entry_ce) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -801,7 +801,7 @@ static PHP_FUNCTION(xmlwriter_start_document)
        zval *self;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|s!s!s!", &self, xmlwriter_class_entry_ce, &version, &version_len, &enc, &enc_len, &alone, &alone_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -835,7 +835,7 @@ static PHP_FUNCTION(xmlwriter_start_dtd)
        zval *self;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os|s!s!", &self, xmlwriter_class_entry_ce, &name, &name_len, &pubid, &pubid_len, &sysid, &sysid_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -869,7 +869,7 @@ static PHP_FUNCTION(xmlwriter_write_dtd)
        zval *self;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os|s!s!s!", &self, xmlwriter_class_entry_ce, &name, &name_len, &pubid, &pubid_len, &sysid, &sysid_len, &subset, &subset_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -912,7 +912,7 @@ static PHP_FUNCTION(xmlwriter_write_dtd_element)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss", &self, xmlwriter_class_entry_ce,
                &name, &name_len, &content, &content_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -957,7 +957,7 @@ static PHP_FUNCTION(xmlwriter_write_dtd_attlist)
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss", &self, xmlwriter_class_entry_ce,
                &name, &name_len, &content, &content_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -986,7 +986,7 @@ static PHP_FUNCTION(xmlwriter_start_dtd_entity)
        zval *self;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Osb", &self, xmlwriter_class_entry_ce, &name, &name_len, &isparm) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -1028,7 +1028,7 @@ static PHP_FUNCTION(xmlwriter_write_dtd_entity)
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss|bsss", &self, xmlwriter_class_entry_ce,
                &name, &name_len, &content, &content_len, &pe, &pubid, &pubid_len,
                &sysid, &sysid_len, &ndataid, &ndataid_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);
 
@@ -1162,7 +1162,7 @@ static void php_xmlwriter_flush(INTERNAL_FUNCTION_PARAMETERS, int force_string)
        zval *self;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|b", &self, xmlwriter_class_entry_ce, &empty) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        XMLWRITER_FROM_OBJECT(ptr, self);