cleanup some code, improve error handling

diff --git a/ext/intl/dateformat/dateformat.c b/ext/intl/dateformat/dateformat.c
index 0eac9e9c7bc7aaa8140eb4f877dd3956f6e5a14b..6f7432254ce59a404a201ab16a3542e926d1b3ca 100755 (executable)
--- a/ext/intl/dateformat/dateformat.c
+++ b/ext/intl/dateformat/dateformat.c
@@ -181,8 +181,7 @@ PHP_METHOD( IntlDateFormatter, __construct )
  */
 PHP_FUNCTION( datefmt_get_error_code )
 {
-       zval*                    object  = NULL;
-       IntlDateFormatter_object*  dfo     = NULL;
+       DATE_FORMAT_METHOD_INIT_VARS;
 
        /* Parse parameters. */
        if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
@@ -208,8 +207,7 @@ PHP_FUNCTION( datefmt_get_error_code )
 PHP_FUNCTION( datefmt_get_error_message )
 {
        char*                    message = NULL;
-       zval*                    object  = NULL;
-       IntlDateFormatter_object*  dfo     = NULL;
+       DATE_FORMAT_METHOD_INIT_VARS;
 
        /* Parse parameters. */
        if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
@@ -224,7 +222,7 @@ PHP_FUNCTION( datefmt_get_error_message )
        dfo = (IntlDateFormatter_object *) zend_object_store_get_object( object TSRMLS_CC );
 
        /* Return last error message. */
-       message = intl_error_get_message( &dfo->datef_data.error TSRMLS_CC );
+       message = intl_error_get_message( INTL_DATA_ERROR_P(dfo) TSRMLS_CC );
        RETURN_STRING( message, 0);
 }
 /* }}} */

diff --git a/ext/intl/formatter/formatter_main.c b/ext/intl/formatter/formatter_main.c
index e2454d50538dc915b0f89378e8cfca2a0ad4530d..8fa17560b89577ee21fe33e51117f9be46164a59 100755 (executable)
--- a/ext/intl/formatter/formatter_main.c
+++ b/ext/intl/formatter/formatter_main.c
@@ -141,7 +141,7 @@ PHP_FUNCTION( numfmt_get_error_message )
        nfo = (NumberFormatter_object *) zend_object_store_get_object( object TSRMLS_CC );
 
        /* Return last error message. */
-       message = intl_error_get_message( &INTL_DATA_ERROR(nfo) TSRMLS_CC );
+       message = intl_error_get_message( INTL_DATA_ERROR_P(nfo) TSRMLS_CC );
        RETURN_STRING( message, 0);
 }
 /* }}} */

diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c
index edac518c6e3556b9ae84ecda312a681bc1194d7b..ba883f34a84f2f0ead5d78ff11434e639fb88c77 100755 (executable)
--- a/ext/intl/grapheme/grapheme_string.c
+++ b/ext/intl/grapheme/grapheme_string.c
@@ -83,7 +83,7 @@ PHP_FUNCTION(grapheme_strlen)
                intl_error_set_code( NULL, status TSRMLS_CC );
 
                /* Set error messages. */
-               intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 1 TSRMLS_CC );
+               intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
                efree( ustring );
                RETURN_NULL();
        }
@@ -446,7 +446,7 @@ PHP_FUNCTION(grapheme_substr)
                intl_error_set_code( NULL, status TSRMLS_CC );
 
                /* Set error messages. */
-               intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 1 TSRMLS_CC );
+               intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
                efree( ustr );
                RETURN_FALSE;
        }
@@ -507,7 +507,7 @@ PHP_FUNCTION(grapheme_substr)
                        intl_error_set_code( NULL, status TSRMLS_CC );
 
                        /* Set error messages. */
-                       intl_error_set_custom_msg( NULL, "Error converting output string to UTF-8", 1 TSRMLS_CC );
+                       intl_error_set_custom_msg( NULL, "Error converting output string to UTF-8", 0 TSRMLS_CC );
 
                        efree( sub_str );
 
@@ -563,7 +563,7 @@ PHP_FUNCTION(grapheme_substr)
                intl_error_set_code( NULL, status TSRMLS_CC );
 
                /* Set error messages. */
-               intl_error_set_custom_msg( NULL, "Error converting output string to UTF-8", 1 TSRMLS_CC );
+               intl_error_set_custom_msg( NULL, "Error converting output string to UTF-8", 0 TSRMLS_CC );
 
                if ( NULL != sub_str )
                        efree( sub_str );
@@ -870,7 +870,7 @@ PHP_FUNCTION(grapheme_extract)
                intl_error_set_code( NULL, status TSRMLS_CC );
 
                /* Set error messages. */
-               intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 1 TSRMLS_CC );
+               intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
 
                if ( NULL != ustr )
                        efree( ustr );

diff --git a/ext/intl/grapheme/grapheme_util.c b/ext/intl/grapheme/grapheme_util.c
index 375c695b7dd916ac312efabe7fc508c78912dbce..1978d274a0fd3b2b9f207ab8be2d3cff83fd9796 100755 (executable)
--- a/ext/intl/grapheme/grapheme_util.c
+++ b/ext/intl/grapheme/grapheme_util.c
@@ -169,7 +169,7 @@ grapheme_strrpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned c
         intl_error_set_code( NULL, status TSRMLS_CC );
 
         /* Set error messages. */
-        intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 1 TSRMLS_CC );
+        intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
         efree( uhaystack );
         return -1;
     }
@@ -202,7 +202,7 @@ grapheme_strrpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned c
         intl_error_set_code( NULL, status TSRMLS_CC );
 
         /* Set error messages. */
-        intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 1 TSRMLS_CC );
+        intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
         efree( uhaystack );
         efree( uneedle );
         ubrk_close (bi);
@@ -294,7 +294,7 @@ grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned ch
                intl_error_set_code( NULL, status TSRMLS_CC );
 
                /* Set error messages. */
-               intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 1 TSRMLS_CC );
+               intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
                efree( uhaystack );
                return -1;
        }
@@ -331,7 +331,7 @@ grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned ch
                intl_error_set_code( NULL, status TSRMLS_CC );
 
                /* Set error messages. */
-               intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 1 TSRMLS_CC );
+               intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
                efree( uhaystack );
                efree( uneedle );
                ubrk_close (bi);

diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c
index bced9fa310555e56d0bb313149067088cc3a4f15..e7a3b6a6d2d962df4422a470b9421082490d9b9e 100644 (file)
--- a/ext/intl/idn/idn.c
+++ b/ext/intl/idn/idn.c
@@ -84,7 +84,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS, int mode)
                intl_error_set_code(NULL, status TSRMLS_CC);
 
                /* Set error messages. */
-               intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 1 TSRMLS_CC );
+               intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
                efree(ustring);
                RETURN_FALSE;
        } else {
@@ -111,7 +111,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS, int mode)
                        intl_error_set_code(NULL, status TSRMLS_CC);
 
                        /* Set error messages. */
-                       intl_error_set_custom_msg( NULL, "Error converting output string to UTF-8", 1 TSRMLS_CC );
+                       intl_error_set_custom_msg( NULL, "Error converting output string to UTF-8", 0 TSRMLS_CC );
                        efree(converted_utf8);
                        RETURN_FALSE;
                }

diff --git a/ext/intl/intl_error.c b/ext/intl/intl_error.c
index 79ae153bbee4d65dfa6c9358d578321eb1807da4..9c2e13dfd5c47fef161b5184449911d4efa60ac3 100755 (executable)
--- a/ext/intl/intl_error.c
+++ b/ext/intl/intl_error.c
@@ -44,10 +44,9 @@ static void intl_free_custom_error_msg( intl_error* err TSRMLS_DC )
        if( !err && !( err = intl_g_error_get( TSRMLS_C ) ) )
                return;
 
-       if( !err->free_custom_error_message )
-               return;
-
-       efree( err->custom_error_message );
+       if(err->free_custom_error_message ) {
+               efree( err->custom_error_message );
+       }
 
        err->custom_error_message      = NULL;
        err->free_custom_error_message = 0;
@@ -181,6 +180,16 @@ void intl_error_set( intl_error* err, UErrorCode code, char* msg, int copyMsg TS
 }
 /* }}} */
 
+/* {{{ void intl_errors_set( intl_error* err, UErrorCode code, char* msg, int copyMsg )
+ * Set error code and message.
+ */
+void intl_errors_set( intl_error* err, UErrorCode code, char* msg, int copyMsg TSRMLS_DC )
+{
+       intl_errors_set_code( err, code TSRMLS_CC );
+       intl_errors_set_custom_msg( err, msg, copyMsg TSRMLS_CC );
+}
+/* }}} */
+
 /* {{{ void intl_errors_reset( intl_error* err )
  */
 void intl_errors_reset( intl_error* err TSRMLS_DC )

diff --git a/ext/intl/intl_error.h b/ext/intl/intl_error.h
index 5c469e1fca3a7c6c314c9fb01a42e59371eb975a..3adae8547419955ddd1c74bb4b643e997e73d2b8 100755 (executable)
--- a/ext/intl/intl_error.h
+++ b/ext/intl/intl_error.h
@@ -42,5 +42,6 @@ char*       intl_error_get_message( intl_error* err TSRMLS_DC );
 void        intl_errors_reset( intl_error* err TSRMLS_DC );
 void        intl_errors_set_custom_msg( intl_error* err, char* msg, int copyMsg TSRMLS_DC );
 void        intl_errors_set_code( intl_error* err, UErrorCode err_code TSRMLS_DC );
+void        intl_errors_set( intl_error* err, UErrorCode code, char* msg, int copyMsg TSRMLS_DC );
 
 #endif // INTL_ERROR_H

diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c
index f3401e5e0dd265dffad54c36f8aeb34380988fa4..ff98edfd5d0445b3dc11f7c526491bc5ab7c9c0e 100755 (executable)
--- a/ext/intl/locale/locale_methods.c
+++ b/ext/intl/locale/locale_methods.c
@@ -389,7 +389,7 @@ static void get_icu_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAMETERS)
                intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,  msg , 1 TSRMLS_CC );
                efree(msg);
 
-               RETURN_NULL();
+               RETURN_FALSE;
     }
 
        if(loc_name_len == 0) {
@@ -1129,10 +1129,10 @@ PHP_FUNCTION(locale_get_all_variants)
        if(zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "s",
        &loc_name, &loc_name_len ) == FAILURE)
        {
-       intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
+               intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
             "locale_parse: unable to parse input params", 0 TSRMLS_CC );
 
-       RETURN_FALSE;
+               RETURN_FALSE;
        }
 
        if(loc_name_len == 0) {
@@ -1524,7 +1524,7 @@ PHP_FUNCTION(locale_lookup)
        if(zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "as|bs", &arr, &loc_range, &loc_range_len,
                &boolCanonical, &fallback_loc, &fallback_loc_len) == FAILURE) {
                intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "locale_lookup: unable to parse input params", 0 TSRMLS_CC );
-               RETURN_NULL();
+               RETURN_FALSE;
        }
 
        if(loc_range_len == 0) {
@@ -1571,7 +1571,7 @@ PHP_FUNCTION(locale_accept_from_http)
        {
                intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
                "locale_accept_from_http: unable to parse input parameters", 0 TSRMLS_CC );
-               RETURN_NULL();
+               RETURN_FALSE;
        }
        
        available = ures_openAvailableLocales(NULL, &status);

diff --git a/ext/intl/normalizer/normalizer_normalize.c b/ext/intl/normalizer/normalizer_normalize.c
index edc8447269eae2413a5f69356a6f46904064ab57..482c4a01e5912b3e1859eaa361029311d2e6154a 100755 (executable)
--- a/ext/intl/normalizer/normalizer_normalize.c
+++ b/ext/intl/normalizer/normalizer_normalize.c
@@ -57,9 +57,9 @@ PHP_FUNCTION( normalizer_normalize )
                                &input, &input_len, &form ) == FAILURE )
        {
                intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                                                "normalizer_normalize: unable to parse input params", 1 TSRMLS_CC );
+                                                "normalizer_normalize: unable to parse input params", 0 TSRMLS_CC );
 
-               RETURN_NULL();
+               RETURN_FALSE;
        }
 
        expansion_factor = 1;
@@ -78,8 +78,8 @@ PHP_FUNCTION( normalizer_normalize )
                        break;
                default:
                        intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                                               "normalizer_normalize: illegal normalization form", 1 TSRMLS_CC );
-                       RETURN_NULL();
+                                               "normalizer_normalize: illegal normalization form", 0 TSRMLS_CC );
+                       RETURN_FALSE;
        }
 
        /*
@@ -95,9 +95,9 @@ PHP_FUNCTION( normalizer_normalize )
                intl_error_set_code( NULL, status TSRMLS_CC );
 
                /* Set error messages. */
-               intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 1 TSRMLS_CC );
+               intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
                efree( uinput );
-               RETURN_NULL();
+               RETURN_FALSE;
        }
 
 
@@ -134,10 +134,10 @@ PHP_FUNCTION( normalizer_normalize )
                /* Bail out if an unexpected error occured. */
                if( U_FAILURE(status)  ) {
                        /* Set error messages. */
-                       intl_error_set_custom_msg( NULL,"Error normalizing string", 1 TSRMLS_CC );
+                       intl_error_set_custom_msg( NULL,"Error normalizing string", 0 TSRMLS_CC );
                        efree( uret_buf );
                        efree( uinput );
-                       RETURN_NULL();
+                       RETURN_FALSE;
                }
        }
 
@@ -152,8 +152,8 @@ PHP_FUNCTION( normalizer_normalize )
        if( U_FAILURE( status ) )
        {
                intl_error_set( NULL, status,
-                               "normalizer_normalize: error converting normalized text UTF-8", 1 TSRMLS_CC );
-               RETURN_NULL();
+                               "normalizer_normalize: error converting normalized text UTF-8", 0 TSRMLS_CC );
+               RETURN_FALSE;
        }
 
        /* Return it. */
@@ -186,7 +186,7 @@ PHP_FUNCTION( normalizer_is_normalized )
                                &input, &input_len, &form) == FAILURE )
        {
                intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                               "normalizer_is_normalized: unable to parse input params", 1 TSRMLS_CC );
+                               "normalizer_is_normalized: unable to parse input params", 0 TSRMLS_CC );
 
                RETURN_FALSE;
        }
@@ -201,8 +201,8 @@ PHP_FUNCTION( normalizer_is_normalized )
                        break;
                default:
                        intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                                               "normalizer_normalize: illegal normalization form", 1 TSRMLS_CC );
-                       RETURN_NULL();
+                                               "normalizer_normalize: illegal normalization form", 0 TSRMLS_CC );
+                       RETURN_FALSE;
        }
 
 
@@ -219,7 +219,7 @@ PHP_FUNCTION( normalizer_is_normalized )
                intl_error_set_code( NULL, status TSRMLS_CC );
 
                /* Set error messages. */
-               intl_error_set_custom_msg( NULL, "Error converting string to UTF-16.", 1 TSRMLS_CC );
+               intl_error_set_custom_msg( NULL, "Error converting string to UTF-16.", 0 TSRMLS_CC );
                efree( uinput );
                RETURN_FALSE;
        }
@@ -233,7 +233,7 @@ PHP_FUNCTION( normalizer_is_normalized )
        /* Bail out if an unexpected error occured. */
        if( U_FAILURE(status)  ) {
                /* Set error messages. */
-               intl_error_set_custom_msg( NULL,"Error testing if string is the given normalization form.", 1 TSRMLS_CC );
+               intl_error_set_custom_msg( NULL,"Error testing if string is the given normalization form.", 0 TSRMLS_CC );
                RETURN_FALSE;
        }
 

diff --git a/ext/intl/tests/badargs.phpt b/ext/intl/tests/badargs.phpt
new file mode 100755 (executable)
index 0000000..9232bbf
--- /dev/null
+++ b/ext/intl/tests/badargs.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Check that bad argumens return the same
+--SKIPIF--
+<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+--FILE--
+<?php
+$funcs = get_extension_funcs("intl");
+function ignore_err() {}
+set_error_handler("ignore_err");
+$arg = new stdClass();
+foreach($funcs as $func) {
+        $rfunc = new ReflectionFunction($func);
+        if($rfunc->getNumberOfRequiredParameters() == 0) {
+                continue;
+        }
+        $res = $func($arg);
+        if($res != false) {
+                echo "$func: ";
+                var_dump($res);
+        }
+}
+echo "OK!\n";
+?>
+--EXPECT--
+OK!