felipe Mon Aug 18 00:36:04 2008 UTC Modified files: /php-src/ext/mbstring mbstring.c php_mbregex.c /php-src/ext/mbstring/tests ini_language.phpt mb_output_handler_pattern-01.phpt mb_output_handler_pattern-02.phpt mb_output_handler_pattern-03.phpt mb_output_handler_pattern-04.phpt mb_output_handler_pattern-05.phpt mb_output_handler_pattern-06.phpt mb_output_handler_pattern-07.phpt mb_output_handler_pattern-08.phpt mb_output_handler_pattern-09.phpt mb_output_handler_pattern-10.phpt mb_output_handler_pattern-11.phpt mb_output_handler_pattern-12.phpt mb_parse_str.phpt mb_regex_encoding_error1.phpt mb_regex_encoding_variation1.phpt mb_strtolower_basic.phpt mb_substr_error1.phpt mb_substr_variation1.phpt mb_substr_variation2.phpt Log: - New parameter parsing API - Fixed tests
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.296&r2=1.297&diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.296 php-src/ext/mbstring/mbstring.c:1.297 --- php-src/ext/mbstring/mbstring.c:1.296 Mon Aug 11 15:40:41 2008 +++ php-src/ext/mbstring/mbstring.c Mon Aug 18 00:36:03 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.296 2008/08/11 15:40:41 nlopess Exp $ */ +/* $Id: mbstring.c,v 1.297 2008/08/18 00:36:03 felipe Exp $ */ /* * PHP 4 Multibyte String module "mbstring" @@ -3466,37 +3466,30 @@ #define PHP_MBSTR_STACK_BLOCK_SIZE 32 -/* {{{ proto string mb_convert_variables(string to-encoding, mixed from-encoding [, mixed ...]) +/* {{{ proto string mb_convert_variables(string to-encoding, mixed from-encoding, mixed vars [, ...]) Converts the string resource in variables to desired encoding */ PHP_FUNCTION(mb_convert_variables) { - zval ***args, ***stack, **var, **hash_entry; + zval ***args, ***stack, **var, **hash_entry, **zfrom_enc; HashTable *target_hash; mbfl_string string, result, *ret; enum mbfl_no_encoding from_encoding, to_encoding; mbfl_encoding_detector *identd; mbfl_buffer_converter *convd; - int n, argc, stack_level, stack_max, elistsz; + int n, to_enc_len, argc, stack_level, stack_max, elistsz; enum mbfl_no_encoding *elist; - char *name; + char *name, *to_enc; void *ptmp; - argc = ZEND_NUM_ARGS(); - if (argc < 3) { - WRONG_PARAM_COUNT; - } - args = (zval ***)ecalloc(argc, sizeof(zval **)); - if (zend_get_parameters_array_ex(argc, args) == FAILURE) { - efree((void *)args); - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sZ+", &to_enc, &to_enc_len, &zfrom_enc, &args, &argc) == FAILURE) { + return; } /* new encoding */ - convert_to_string_ex(args[0]); - to_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(args[0])); + to_encoding = mbfl_name2no_encoding(to_enc); if (to_encoding == mbfl_no_encoding_invalid) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(args[0])); - efree((void *)args); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", to_enc); + efree(args); RETURN_FALSE; } @@ -3510,13 +3503,13 @@ /* pre-conversion encoding */ elist = NULL; elistsz = 0; - switch (Z_TYPE_PP(args[1])) { + switch (Z_TYPE_PP(zfrom_enc)) { case IS_ARRAY: - php_mb_parse_encoding_array(*args[1], &elist, &elistsz, 0 TSRMLS_CC); + php_mb_parse_encoding_array(*zfrom_enc, &elist, &elistsz, 0 TSRMLS_CC); break; default: - convert_to_string_ex(args[1]); - php_mb_parse_encoding_list(Z_STRVAL_PP(args[1]), Z_STRLEN_PP(args[1]), &elist, &elistsz, 0 TSRMLS_CC); + convert_to_string_ex(zfrom_enc); + php_mb_parse_encoding_list(Z_STRVAL_PP(zfrom_enc), Z_STRLEN_PP(zfrom_enc), &elist, &elistsz, 0 TSRMLS_CC); break; } if (elistsz <= 0) { @@ -3531,7 +3524,7 @@ stack_level = 0; identd = mbfl_encoding_detector_new(elist, elistsz, MBSTRG(strict_detection)); if (identd != NULL) { - n = 2; + n = 0; while (n < argc || stack_level > 0) { if (stack_level <= 0) { var = args[n++]; @@ -3612,7 +3605,7 @@ stack_max = PHP_MBSTR_STACK_BLOCK_SIZE; stack = (zval ***)safe_emalloc(stack_max, sizeof(zval **), 0); stack_level = 0; - n = 2; + n = 0; while (n < argc || stack_level > 0) { if (stack_level <= 0) { var = args[n++]; @@ -3678,7 +3671,7 @@ mbfl_buffer_converter_delete(convd); } - efree((void *)args); + efree(args); name = (char *)mbfl_no_encoding2name(from_encoding); if (name != NULL) { http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.c?r1=1.64&r2=1.65&diff_format=u Index: php-src/ext/mbstring/php_mbregex.c diff -u php-src/ext/mbstring/php_mbregex.c:1.64 php-src/ext/mbstring/php_mbregex.c:1.65 --- php-src/ext/mbstring/php_mbregex.c:1.64 Fri Jul 25 14:04:39 2008 +++ php-src/ext/mbstring/php_mbregex.c Mon Aug 18 00:36:03 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mbregex.c,v 1.64 2008/07/25 14:04:39 moriyoshi Exp $ */ +/* $Id: php_mbregex.c,v 1.65 2008/08/18 00:36:03 felipe Exp $ */ #ifdef HAVE_CONFIG_H @@ -653,29 +653,33 @@ Returns the current encoding for regex as a string. */ PHP_FUNCTION(mb_regex_encoding) { - zval **arg1; + size_t argc = ZEND_NUM_ARGS(); + char *encoding; + int encoding_len; OnigEncoding mbctype; - if (ZEND_NUM_ARGS() == 0) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &encoding, &encoding_len) == FAILURE) { + return; + } + + if (argc == 0) { const char *retval = _php_mb_regex_mbctype2name(MBREX(current_mbctype)); - if ( retval != NULL ) { - RETVAL_STRING((char *)retval, 1); - } else { - RETVAL_FALSE; + + if (retval == NULL) { + RETURN_FALSE; } - } else if (ZEND_NUM_ARGS() == 1 && - zend_get_parameters_ex(1, &arg1) != FAILURE) { - convert_to_string_ex(arg1); - mbctype = _php_mb_regex_name2mbctype(Z_STRVAL_PP(arg1)); + + RETURN_STRING((char *)retval, 1); + } else if (argc == 1) { + mbctype = _php_mb_regex_name2mbctype(encoding); + if (mbctype == ONIG_ENCODING_UNDEF) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(arg1)); - RETVAL_FALSE; - } else { - MBREX(current_mbctype) = mbctype; - RETVAL_TRUE; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", encoding); + RETURN_FALSE; } - } else { - WRONG_PARAM_COUNT; + + MBREX(current_mbctype) = mbctype; + RETURN_TRUE; } } /* }}} */ @@ -1104,38 +1108,28 @@ static void _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode) { - zval **arg_pattern, **arg_options; + size_t argc = ZEND_NUM_ARGS(); + char *arg_pattern, *arg_options; + int arg_pattern_len, arg_options_len; int n, i, err, pos, len, beg, end; OnigOptionType option; OnigUChar *str; OnigSyntaxType *syntax; + if (zend_parse_parameters(argc TSRMLS_CC, "|ss", &arg_pattern, &arg_pattern_len, &arg_options, &arg_options_len) == FAILURE) { + return; + } + option = MBREX(regex_default_options); - switch (ZEND_NUM_ARGS()) { - case 0: - break; - case 1: - if (zend_get_parameters_ex(1, &arg_pattern) == FAILURE) { - WRONG_PARAM_COUNT; - } - break; - case 2: - if (zend_get_parameters_ex(2, &arg_pattern, &arg_options) == FAILURE) { - WRONG_PARAM_COUNT; - } - convert_to_string_ex(arg_options); + + if (argc == 2) { option = 0; - _php_mb_regex_init_options(Z_STRVAL_PP(arg_options), Z_STRLEN_PP(arg_options), &option, &syntax, NULL); - break; - default: - WRONG_PARAM_COUNT; - break; + _php_mb_regex_init_options(arg_options, arg_options_len, &option, &syntax, NULL); } - if (ZEND_NUM_ARGS() > 0) { - /* create regex pattern buffer */ - convert_to_string_ex(arg_pattern); - if ((MBREX(search_re) = php_mbregex_compile_pattern(Z_STRVAL_PP(arg_pattern), Z_STRLEN_PP(arg_pattern), option, MBREX(current_mbctype), MBREX(regex_default_syntax) TSRMLS_CC)) == NULL) { + if (argc > 0) { + /* create regex pattern buffer */ + if ((MBREX(search_re) = php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, option, MBREX(current_mbctype), MBREX(regex_default_syntax) TSRMLS_CC)) == NULL) { RETURN_FALSE; } } @@ -1244,41 +1238,28 @@ Initialize string and regular expression for search. */ PHP_FUNCTION(mb_ereg_search_init) { - zval **arg_str, **arg_pattern, **arg_options; + size_t argc = ZEND_NUM_ARGS(); + zval *arg_str; + char *arg_pattern, *arg_options; + int arg_pattern_len, arg_options_len; OnigSyntaxType *syntax = NULL; OnigOptionType option; + if (zend_parse_parameters(argc TSRMLS_CC, "z|ss", &arg_str, &arg_pattern, &arg_pattern_len, &arg_options, &arg_options_len) == FAILURE) { + return; + } + option = MBREX(regex_default_options); syntax = MBREX(regex_default_syntax); - switch (ZEND_NUM_ARGS()) { - case 1: - if (zend_get_parameters_ex(1, &arg_str) == FAILURE) { - WRONG_PARAM_COUNT; - } - break; - case 2: - if (zend_get_parameters_ex(2, &arg_str, &arg_pattern) == FAILURE) { - WRONG_PARAM_COUNT; - } - break; - case 3: - if (zend_get_parameters_ex(3, &arg_str, &arg_pattern, &arg_options) == FAILURE) { - WRONG_PARAM_COUNT; - } - convert_to_string_ex(arg_options); + + if (argc == 3) { option = 0; - _php_mb_regex_init_options(Z_STRVAL_PP(arg_options), Z_STRLEN_PP(arg_options), &option, &syntax, NULL); - break; - default: - WRONG_PARAM_COUNT; - break; + _php_mb_regex_init_options(arg_options, arg_options_len, &option, &syntax, NULL); } - convert_to_string_ex(arg_str); - if (ZEND_NUM_ARGS() > 1) { - /* create regex pattern buffer */ - convert_to_string_ex(arg_pattern); - if ((MBREX(search_re) = php_mbregex_compile_pattern(Z_STRVAL_PP(arg_pattern), Z_STRLEN_PP(arg_pattern), option, MBREX(current_mbctype), syntax TSRMLS_CC)) == NULL) { + if (argc > 1) { + /* create regex pattern buffer */ + if ((MBREX(search_re) = php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, option, MBREX(current_mbctype), syntax TSRMLS_CC)) == NULL) { RETURN_FALSE; } } @@ -1288,7 +1269,7 @@ MBREX(search_str) = (zval *)NULL; } - MBREX(search_str) = *arg_str; + MBREX(search_str) = arg_str; Z_ADDREF_P(MBREX(search_str)); SEPARATE_ZVAL_IF_NOT_REF(&MBREX(search_str)); @@ -1343,22 +1324,20 @@ Set search start position */ PHP_FUNCTION(mb_ereg_search_setpos) { - zval **arg_pos; - int n; + long position; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg_pos) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &position) == FAILURE) { + return; } - convert_to_long_ex(arg_pos); - n = Z_LVAL_PP(arg_pos); - if (n < 0 || (MBREX(search_str) != NULL && Z_TYPE_P(MBREX(search_str)) == IS_STRING && n >= Z_STRLEN_P(MBREX(search_str)))) { + + if (position < 0 || (MBREX(search_str) != NULL && Z_TYPE_P(MBREX(search_str)) == IS_STRING && position >= Z_STRLEN_P(MBREX(search_str)))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Position is out of range"); MBREX(search_pos) = 0; - RETVAL_FALSE; - } else { - MBREX(search_pos) = n; - RETVAL_TRUE; + RETURN_FALSE; } + + MBREX(search_pos) = position; + RETURN_TRUE; } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/ini_language.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/ini_language.phpt diff -u php-src/ext/mbstring/tests/ini_language.phpt:1.2 php-src/ext/mbstring/tests/ini_language.phpt:1.3 --- php-src/ext/mbstring/tests/ini_language.phpt:1.2 Fri Aug 8 10:53:54 2003 +++ php-src/ext/mbstring/tests/ini_language.phpt Mon Aug 18 00:36:03 2008 @@ -11,5 +11,5 @@ var_dump(mb_internal_encoding()); ?> --EXPECT-- -string(9) "Shift_JIS" +unicode(9) "Shift_JIS" string(4) "SJIS" http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_output_handler_pattern-01.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mbstring/tests/mb_output_handler_pattern-01.phpt diff -u php-src/ext/mbstring/tests/mb_output_handler_pattern-01.phpt:1.1 php-src/ext/mbstring/tests/mb_output_handler_pattern-01.phpt:1.2 --- php-src/ext/mbstring/tests/mb_output_handler_pattern-01.phpt:1.1 Thu Jul 24 12:58:37 2008 +++ php-src/ext/mbstring/tests/mb_output_handler_pattern-01.phpt Mon Aug 18 00:36:03 2008 @@ -15,4 +15,4 @@ var_dump(bin2hex(ob_get_clean())); ?> --EXPECT-- -string(12) "a5c6a5b9a5c8" +unicode(12) "a5c6a5b9a5c8" http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_output_handler_pattern-02.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mbstring/tests/mb_output_handler_pattern-02.phpt diff -u php-src/ext/mbstring/tests/mb_output_handler_pattern-02.phpt:1.1 php-src/ext/mbstring/tests/mb_output_handler_pattern-02.phpt:1.2 --- php-src/ext/mbstring/tests/mb_output_handler_pattern-02.phpt:1.1 Thu Jul 24 12:58:37 2008 +++ php-src/ext/mbstring/tests/mb_output_handler_pattern-02.phpt Mon Aug 18 00:36:03 2008 @@ -15,4 +15,4 @@ var_dump(bin2hex(ob_get_clean())); ?> --EXPECT-- -string(12) "a5c6a5b9a5c8" +unicode(12) "a5c6a5b9a5c8" http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_output_handler_pattern-03.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mbstring/tests/mb_output_handler_pattern-03.phpt diff -u php-src/ext/mbstring/tests/mb_output_handler_pattern-03.phpt:1.1 php-src/ext/mbstring/tests/mb_output_handler_pattern-03.phpt:1.2 --- php-src/ext/mbstring/tests/mb_output_handler_pattern-03.phpt:1.1 Thu Jul 24 12:58:37 2008 +++ php-src/ext/mbstring/tests/mb_output_handler_pattern-03.phpt Mon Aug 18 00:36:03 2008 @@ -15,4 +15,4 @@ var_dump(bin2hex(ob_get_clean())); ?> --EXPECT-- -string(12) "a5c6a5b9a5c8" +unicode(12) "a5c6a5b9a5c8" http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_output_handler_pattern-04.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mbstring/tests/mb_output_handler_pattern-04.phpt diff -u php-src/ext/mbstring/tests/mb_output_handler_pattern-04.phpt:1.1 php-src/ext/mbstring/tests/mb_output_handler_pattern-04.phpt:1.2 --- php-src/ext/mbstring/tests/mb_output_handler_pattern-04.phpt:1.1 Thu Jul 24 12:58:37 2008 +++ php-src/ext/mbstring/tests/mb_output_handler_pattern-04.phpt Mon Aug 18 00:36:03 2008 @@ -15,4 +15,4 @@ var_dump(bin2hex(ob_get_clean())); ?> --EXPECT-- -string(18) "e38386e382b9e38388" +unicode(18) "e38386e382b9e38388" http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_output_handler_pattern-05.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mbstring/tests/mb_output_handler_pattern-05.phpt diff -u php-src/ext/mbstring/tests/mb_output_handler_pattern-05.phpt:1.1 php-src/ext/mbstring/tests/mb_output_handler_pattern-05.phpt:1.2 --- php-src/ext/mbstring/tests/mb_output_handler_pattern-05.phpt:1.1 Thu Jul 24 12:58:37 2008 +++ php-src/ext/mbstring/tests/mb_output_handler_pattern-05.phpt Mon Aug 18 00:36:03 2008 @@ -14,4 +14,4 @@ var_dump(bin2hex(ob_get_clean())); ?> --EXPECT-- -string(12) "a5c6a5b9a5c8" +unicode(12) "a5c6a5b9a5c8" http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_output_handler_pattern-06.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mbstring/tests/mb_output_handler_pattern-06.phpt diff -u php-src/ext/mbstring/tests/mb_output_handler_pattern-06.phpt:1.1 php-src/ext/mbstring/tests/mb_output_handler_pattern-06.phpt:1.2 --- php-src/ext/mbstring/tests/mb_output_handler_pattern-06.phpt:1.1 Thu Jul 24 12:58:37 2008 +++ php-src/ext/mbstring/tests/mb_output_handler_pattern-06.phpt Mon Aug 18 00:36:03 2008 @@ -15,4 +15,4 @@ var_dump(bin2hex(ob_get_clean())); ?> --EXPECT-- -string(12) "a5c6a5b9a5c8" +unicode(12) "a5c6a5b9a5c8" http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_output_handler_pattern-07.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_output_handler_pattern-07.phpt diff -u php-src/ext/mbstring/tests/mb_output_handler_pattern-07.phpt:1.2 php-src/ext/mbstring/tests/mb_output_handler_pattern-07.phpt:1.3 --- php-src/ext/mbstring/tests/mb_output_handler_pattern-07.phpt:1.2 Thu Jul 24 13:49:28 2008 +++ php-src/ext/mbstring/tests/mb_output_handler_pattern-07.phpt Mon Aug 18 00:36:03 2008 @@ -16,4 +16,4 @@ var_dump(bin2hex(ob_get_clean())); ?> --EXPECT-- -string(12) "a5c6a5b9a5c8" +unicode(12) "a5c6a5b9a5c8" http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_output_handler_pattern-08.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_output_handler_pattern-08.phpt diff -u php-src/ext/mbstring/tests/mb_output_handler_pattern-08.phpt:1.2 php-src/ext/mbstring/tests/mb_output_handler_pattern-08.phpt:1.3 --- php-src/ext/mbstring/tests/mb_output_handler_pattern-08.phpt:1.2 Thu Jul 24 13:49:28 2008 +++ php-src/ext/mbstring/tests/mb_output_handler_pattern-08.phpt Mon Aug 18 00:36:03 2008 @@ -16,4 +16,4 @@ var_dump(bin2hex(ob_get_clean())); ?> --EXPECT-- -string(18) "e38386e382b9e38388" +unicode(18) "e38386e382b9e38388" http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_output_handler_pattern-09.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_output_handler_pattern-09.phpt diff -u php-src/ext/mbstring/tests/mb_output_handler_pattern-09.phpt:1.2 php-src/ext/mbstring/tests/mb_output_handler_pattern-09.phpt:1.3 --- php-src/ext/mbstring/tests/mb_output_handler_pattern-09.phpt:1.2 Thu Jul 24 13:49:28 2008 +++ php-src/ext/mbstring/tests/mb_output_handler_pattern-09.phpt Mon Aug 18 00:36:03 2008 @@ -16,4 +16,4 @@ var_dump(bin2hex(ob_get_clean())); ?> --EXPECT-- -string(12) "a5c6a5b9a5c8" +unicode(12) "a5c6a5b9a5c8" http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_output_handler_pattern-10.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_output_handler_pattern-10.phpt diff -u php-src/ext/mbstring/tests/mb_output_handler_pattern-10.phpt:1.2 php-src/ext/mbstring/tests/mb_output_handler_pattern-10.phpt:1.3 --- php-src/ext/mbstring/tests/mb_output_handler_pattern-10.phpt:1.2 Thu Jul 24 13:49:28 2008 +++ php-src/ext/mbstring/tests/mb_output_handler_pattern-10.phpt Mon Aug 18 00:36:03 2008 @@ -16,4 +16,4 @@ var_dump(bin2hex(ob_get_clean())); ?> --EXPECT-- -string(18) "e38386e382b9e38388" +unicode(18) "e38386e382b9e38388" http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_output_handler_pattern-11.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mbstring/tests/mb_output_handler_pattern-11.phpt diff -u php-src/ext/mbstring/tests/mb_output_handler_pattern-11.phpt:1.1 php-src/ext/mbstring/tests/mb_output_handler_pattern-11.phpt:1.2 --- php-src/ext/mbstring/tests/mb_output_handler_pattern-11.phpt:1.1 Thu Jul 24 12:58:37 2008 +++ php-src/ext/mbstring/tests/mb_output_handler_pattern-11.phpt Mon Aug 18 00:36:03 2008 @@ -14,4 +14,4 @@ var_dump(bin2hex(ob_get_clean())); ?> --EXPECT-- -string(12) "a5c6a5b9a5c8" +unicode(12) "a5c6a5b9a5c8" http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_output_handler_pattern-12.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mbstring/tests/mb_output_handler_pattern-12.phpt diff -u php-src/ext/mbstring/tests/mb_output_handler_pattern-12.phpt:1.1 php-src/ext/mbstring/tests/mb_output_handler_pattern-12.phpt:1.2 --- php-src/ext/mbstring/tests/mb_output_handler_pattern-12.phpt:1.1 Thu Jul 24 12:58:37 2008 +++ php-src/ext/mbstring/tests/mb_output_handler_pattern-12.phpt Mon Aug 18 00:36:03 2008 @@ -15,4 +15,4 @@ var_dump(bin2hex(ob_get_clean())); ?> --EXPECT-- -string(12) "a5c6a5b9a5c8" +unicode(12) "a5c6a5b9a5c8" http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_parse_str.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mbstring/tests/mb_parse_str.phpt diff -u php-src/ext/mbstring/tests/mb_parse_str.phpt:1.3 php-src/ext/mbstring/tests/mb_parse_str.phpt:1.4 --- php-src/ext/mbstring/tests/mb_parse_str.phpt:1.3 Tue Mar 7 00:20:53 2006 +++ php-src/ext/mbstring/tests/mb_parse_str.phpt Mon Aug 18 00:36:03 2008 @@ -28,27 +28,27 @@ ?> --EXPECT-- array(2) { - ["foo"]=> + [u"foo"]=> string(3) "abc" - ["bar"]=> + [u"bar"]=> string(3) "def" } -string(0) "" -string(0) "" -string(3) "abc" -string(3) "def" +unicode(0) "" +unicode(0) "" +unicode(3) "abc" +unicode(3) "def" array(2) { - ["+foo"]=> + [u"+foo"]=> string(3) "def" - ["-bar"]=> + [u"-bar"]=> string(3) "jkl" } -string(0) "" -string(0) "" -string(0) "" -string(0) "" +unicode(0) "" +unicode(0) "" +unicode(0) "" +unicode(0) "" array(2) { - ["foo"]=> + [u"foo"]=> array(3) { [0]=> string(3) "abc" @@ -57,14 +57,14 @@ [2]=> string(3) "ghi" } - ["bar"]=> + [u"bar"]=> array(1) { [0]=> string(3) "jkl" } } -string(0) "" -string(0) "" +unicode(0) "" +unicode(0) "" array(3) { [0]=> string(3) "abc" http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt diff -u php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt:1.3 php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt:1.4 --- php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt:1.3 Tue May 27 18:16:04 2008 +++ php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt Mon Aug 18 00:36:03 2008 @@ -31,6 +31,6 @@ -- Testing mb_regex_encoding() function with more than expected no. of arguments -- -Warning: Wrong parameter count for mb_regex_encoding() in %s on line %d +Warning: mb_regex_encoding() expects at most 1 parameter, 2 given in %s on line %d NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt:1.3 php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt:1.4 --- php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt:1.3 Tue May 27 18:16:04 2008 +++ php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt Mon Aug 18 00:36:03 2008 @@ -210,6 +210,6 @@ -- Iteration 24 -- -Warning: mb_regex_encoding(): Unknown encoding "Resource id #%d" in %s on line %d -bool(false) -Done \ No newline at end of file +Warning: mb_regex_encoding() expects parameter 1 to be binary string, resource given in %s on line %d +NULL +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtolower_basic.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mbstring/tests/mb_strtolower_basic.phpt diff -u php-src/ext/mbstring/tests/mb_strtolower_basic.phpt:1.3 php-src/ext/mbstring/tests/mb_strtolower_basic.phpt:1.4 --- php-src/ext/mbstring/tests/mb_strtolower_basic.phpt:1.3 Tue May 27 18:16:04 2008 +++ php-src/ext/mbstring/tests/mb_strtolower_basic.phpt Mon Aug 18 00:36:03 2008 @@ -16,7 +16,7 @@ * Test basic functionality of mb_strtolower */ -echo "*** Testing mb_strtolower() : basic functionality***\n"; +echo "**** Testing mb_strtolower() : basic functionality****\n"; $ascii_lower = 'abcdefghijklmnopqrstuvwxyz'; $ascii_upper = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_error1.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_error1.phpt diff -u php-src/ext/mbstring/tests/mb_substr_error1.phpt:1.3 php-src/ext/mbstring/tests/mb_substr_error1.phpt:1.4 --- php-src/ext/mbstring/tests/mb_substr_error1.phpt:1.3 Tue May 27 18:16:04 2008 +++ php-src/ext/mbstring/tests/mb_substr_error1.phpt Mon Aug 18 00:36:03 2008 @@ -39,11 +39,11 @@ -- Testing mb_substr() function with more than expected no. of arguments -- -Warning: Wrong parameter count for mb_substr() in %s on line %d +Warning: mb_substr() expects at most 4 parameters, 5 given in %s on line %d NULL -- Testing mb_substr() function with less than expected no. of arguments -- -Warning: Wrong parameter count for mb_substr() in %s on line %d +Warning: mb_substr() expects at least 2 parameters, 1 given in %s on line %d NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_variation1.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_substr_variation1.phpt:1.3 php-src/ext/mbstring/tests/mb_substr_variation1.phpt:1.4 --- php-src/ext/mbstring/tests/mb_substr_variation1.phpt:1.3 Tue May 27 18:16:04 2008 +++ php-src/ext/mbstring/tests/mb_substr_variation1.phpt Mon Aug 18 00:36:03 2008 @@ -175,5 +175,7 @@ string(0) "" -- Iteration 24 -- -string(5) "Resou" + +Warning: mb_substr() expects parameter 1 to be binary string, resource given in %s on line %d +NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_variation2.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mbstring/tests/mb_substr_variation2.phpt diff -u php-src/ext/mbstring/tests/mb_substr_variation2.phpt:1.3 php-src/ext/mbstring/tests/mb_substr_variation2.phpt:1.4 --- php-src/ext/mbstring/tests/mb_substr_variation2.phpt:1.3 Tue May 27 18:16:04 2008 +++ php-src/ext/mbstring/tests/mb_substr_variation2.phpt Mon Aug 18 00:36:03 2008 @@ -215,6 +215,6 @@ -- Iteration 24 -- -Warning: mb_substr(): Unknown encoding "Resource id #%d" in %s on line %d -bool(false) +Warning: mb_substr() expects parameter 4 to be binary string, resource given in %s on line %d +NULL Done
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php