diff options
Diffstat (limited to 'ext/intl/tests')
69 files changed, 185 insertions, 185 deletions
diff --git a/ext/intl/tests/badargs.phpt b/ext/intl/tests/badargs.phpt index d6ce48317b..c3d7a331c2 100644 --- a/ext/intl/tests/badargs.phpt +++ b/ext/intl/tests/badargs.phpt @@ -13,7 +13,7 @@ foreach($funcs as $func) { if($rfunc->getNumberOfRequiredParameters() == 0) { continue; } - + try { $res = $func($arg); } catch (Exception $e) { diff --git a/ext/intl/tests/bug61487.phpt b/ext/intl/tests/bug61487.phpt index 2270b25cce..b303e00710 100644 --- a/ext/intl/tests/bug61487.phpt +++ b/ext/intl/tests/bug61487.phpt @@ -1,7 +1,7 @@ --TEST-- grapheme() str[i]pos limits --SKIPIF-- -<?php if( !extension_loaded( 'intl' ) ) die('skip'); +<?php if( !extension_loaded( 'intl' ) ) die('skip'); if (PHP_INT_SIZE != 8) die('skip 64-bit only'); ?> --FILE-- diff --git a/ext/intl/tests/bug62915.phpt b/ext/intl/tests/bug62915.phpt index e541d72d63..2277cde9d5 100644 --- a/ext/intl/tests/bug62915.phpt +++ b/ext/intl/tests/bug62915.phpt @@ -9,7 +9,7 @@ if (!extension_loaded('intl')) class foo extends IntlTimeZone { public $foo = 'test'; - + public function __construct() { } } diff --git a/ext/intl/tests/bug71020.phpt b/ext/intl/tests/bug71020.phpt index 368d967efd..9f9b8eede3 100644 --- a/ext/intl/tests/bug71020.phpt +++ b/ext/intl/tests/bug71020.phpt @@ -4,7 +4,7 @@ Bug #71020 (Use after free in Collator::sortWithSortKeys) <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> --FILE-- <?php - + $var_3=new Collator("Whatever"); for($x=0;$x<0xbb;$x++) $myarray[substr(md5(microtime()),rand(0,26),9) . strval($x)]= substr(md5(microtime()),rand(0,26),9) . strval($x); diff --git a/ext/intl/tests/calendar_fieldDifference_basic.phpt b/ext/intl/tests/calendar_fieldDifference_basic.phpt index 3432420df4..0287e259c1 100644 --- a/ext/intl/tests/calendar_fieldDifference_basic.phpt +++ b/ext/intl/tests/calendar_fieldDifference_basic.phpt @@ -19,7 +19,7 @@ var_dump( IntlCalendar::FIELD_SECOND), $intlcal->get(IntlCalendar::FIELD_HOUR_OF_DAY)); - + $intlcal->setTime(strtotime('2012-02-29 05:06:07 +0000') * 1000); var_dump( intlcal_field_difference( diff --git a/ext/intl/tests/calendar_getXMaximum_basic.phpt b/ext/intl/tests/calendar_getXMaximum_basic.phpt index 9b840212d9..2e6d1a3fa9 100644 --- a/ext/intl/tests/calendar_getXMaximum_basic.phpt +++ b/ext/intl/tests/calendar_getXMaximum_basic.phpt @@ -17,7 +17,7 @@ var_dump( $intlcal->getLeastMaximum(IntlCalendar::FIELD_DAY_OF_MONTH), intlcal_get_least_maximum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH), $intlcal->getActualMaximum(IntlCalendar::FIELD_DAY_OF_MONTH), - intlcal_get_actual_maximum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH), + intlcal_get_actual_maximum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH), $intlcal->getMaximum(IntlCalendar::FIELD_DAY_OF_MONTH), intlcal_get_maximum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH) ); diff --git a/ext/intl/tests/calendar_getXMinimum_basic.phpt b/ext/intl/tests/calendar_getXMinimum_basic.phpt index 83fd163809..ff0518d882 100644 --- a/ext/intl/tests/calendar_getXMinimum_basic.phpt +++ b/ext/intl/tests/calendar_getXMinimum_basic.phpt @@ -17,7 +17,7 @@ var_dump( $intlcal->getGreatestMinimum(IntlCalendar::FIELD_DAY_OF_MONTH), intlcal_get_greatest_minimum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH), $intlcal->getActualMinimum(IntlCalendar::FIELD_DAY_OF_MONTH), - intlcal_get_actual_minimum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH), + intlcal_get_actual_minimum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH), $intlcal->getMinimum(IntlCalendar::FIELD_DAY_OF_MONTH), intlcal_get_minimum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH) ); diff --git a/ext/intl/tests/calendar_setTime_basic.phpt b/ext/intl/tests/calendar_setTime_basic.phpt index f7f213c0d8..c4d57be4b9 100644 --- a/ext/intl/tests/calendar_setTime_basic.phpt +++ b/ext/intl/tests/calendar_setTime_basic.phpt @@ -19,7 +19,7 @@ $intlcal->setTime($time * 1000); var_dump( (float)$time*1000, $intlcal->getTime()); - + $intlcal = IntlCalendar::createInstance('UTC'); intlcal_set_time($intlcal,$time * 1000); var_dump(intlcal_get_time($intlcal)); diff --git a/ext/intl/tests/calendar_set_variation1.phpt b/ext/intl/tests/calendar_set_variation1.phpt index 8ea016ed61..20dfa53eb6 100644 --- a/ext/intl/tests/calendar_set_variation1.phpt +++ b/ext/intl/tests/calendar_set_variation1.phpt @@ -16,7 +16,7 @@ $intlcal->clear(); var_dump($intlcal->set(2012, 1, 29)); var_dump($intlcal->getTime(), strtotime('2012-02-29 00:00:00 +0000') * 1000.); - + //two minutes to midnight! var_dump($intlcal->set(2012, 1, 29, 23, 58)); var_dump($intlcal->getTime(), diff --git a/ext/intl/tests/collator_asort.phpt b/ext/intl/tests/collator_asort.phpt index 94fb6ef7a4..0b3d0ee795 100644 --- a/ext/intl/tests/collator_asort.phpt +++ b/ext/intl/tests/collator_asort.phpt @@ -35,7 +35,7 @@ function sort_arrays( $locale, $test_arrays, $sort_flag = Collator::SORT_REGULAR $md5 = md5( $res_dump ); global $test_num; - + $res_str .= "\n\n". "Test $test_num.$md5:" . $res_dump; diff --git a/ext/intl/tests/collator_asort_variant2.phpt b/ext/intl/tests/collator_asort_variant2.phpt index 0a7c914d89..08725095b5 100644 --- a/ext/intl/tests/collator_asort_variant2.phpt +++ b/ext/intl/tests/collator_asort_variant2.phpt @@ -35,7 +35,7 @@ function sort_arrays( $locale, $test_arrays, $sort_flag = Collator::SORT_REGULAR $md5 = md5( $res_dump ); global $test_num; - + $res_str .= "\n\n". "Test $test_num.$md5:" . $res_dump; diff --git a/ext/intl/tests/collator_create4.phpt b/ext/intl/tests/collator_create4.phpt index 0e2126eca4..509a89913b 100644 --- a/ext/intl/tests/collator_create4.phpt +++ b/ext/intl/tests/collator_create4.phpt @@ -1,5 +1,5 @@ --TEST-- -create() icu >= 53.1 +create() icu >= 53.1 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> <?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?> diff --git a/ext/intl/tests/collator_get_error_code.phpt b/ext/intl/tests/collator_get_error_code.phpt index c886943d5d..17a17eeefc 100644 --- a/ext/intl/tests/collator_get_error_code.phpt +++ b/ext/intl/tests/collator_get_error_code.phpt @@ -16,7 +16,7 @@ get_error_code() function check_rc( $rc, $expected ) { return ( $rc === $expected ? "ok" : "failed" ) . "\n"; -} +} function ut_main() { diff --git a/ext/intl/tests/collator_get_sort_key.phpt b/ext/intl/tests/collator_get_sort_key.phpt index 58240d426c..ad0d13e502 100644 --- a/ext/intl/tests/collator_get_sort_key.phpt +++ b/ext/intl/tests/collator_get_sort_key.phpt @@ -3,7 +3,7 @@ collator_get_sort_key() --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> <?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip ICU >= 4.8 only'; ?> -<?php /* XXX Obviously it fails somewhere between >= 4.8 and < 51.2 */ +<?php /* XXX Obviously it fails somewhere between >= 4.8 and < 51.2 */ if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?> --FILE-- <?php diff --git a/ext/intl/tests/collator_sort.phpt b/ext/intl/tests/collator_sort.phpt index e16eeea1e8..4f7a12352a 100644 --- a/ext/intl/tests/collator_sort.phpt +++ b/ext/intl/tests/collator_sort.phpt @@ -36,7 +36,7 @@ function sort_arrays( $locale, $arrays, $sort_flag = Collator::SORT_REGULAR ) $md5 = md5( $res_dump ); global $test_num; - + $res_str .= "\n\n". "Test $test_num.$md5:" . $res_dump; diff --git a/ext/intl/tests/collator_sort_variant2.phpt b/ext/intl/tests/collator_sort_variant2.phpt index 29a5082fda..abb302eda6 100644 --- a/ext/intl/tests/collator_sort_variant2.phpt +++ b/ext/intl/tests/collator_sort_variant2.phpt @@ -36,7 +36,7 @@ function sort_arrays( $locale, $arrays, $sort_flag = Collator::SORT_REGULAR ) $md5 = md5( $res_dump ); global $test_num; - + $res_str .= "\n\n". "Test $test_num.$md5:" . $res_dump; diff --git a/ext/intl/tests/collator_sort_with_sort_keys.phpt b/ext/intl/tests/collator_sort_with_sort_keys.phpt index 8be9c97789..8f19f23881 100644 --- a/ext/intl/tests/collator_sort_with_sort_keys.phpt +++ b/ext/intl/tests/collator_sort_with_sort_keys.phpt @@ -31,8 +31,8 @@ function sort_arrays( $locale, $arrays ) // with output string. $res_dump = "\n" . dump( $array ) . "\n Result: " . dump( $res_val ); - - + + // Preppend test signature to output string $md5 = md5( $res_dump ); diff --git a/ext/intl/tests/collator_sort_with_sort_keys_variant2.phpt b/ext/intl/tests/collator_sort_with_sort_keys_variant2.phpt index 5257f8a6ff..7416e6f7ec 100644 --- a/ext/intl/tests/collator_sort_with_sort_keys_variant2.phpt +++ b/ext/intl/tests/collator_sort_with_sort_keys_variant2.phpt @@ -31,8 +31,8 @@ function sort_arrays( $locale, $arrays ) // with output string. $res_dump = "\n" . dump( $array ) . "\n Result: " . dump( $res_val ); - - + + // Preppend test signature to output string $md5 = md5( $res_dump ); diff --git a/ext/intl/tests/dateformat_bug68893.phpt b/ext/intl/tests/dateformat_bug68893.phpt index b3faf54342..5ada711c38 100644 --- a/ext/intl/tests/dateformat_bug68893.phpt +++ b/ext/intl/tests/dateformat_bug68893.phpt @@ -5,10 +5,10 @@ Bug #68893 Stackoverflow in datefmt_create --FILE-- <?php -$f = datefmt_create("en_us", -10000000, 1); +$f = datefmt_create("en_us", -10000000, 1); var_dump($f, intl_get_error_message()); -$f = datefmt_create("en_us", 1, -10000000); +$f = datefmt_create("en_us", 1, -10000000); var_dump($f, intl_get_error_message()); ?> diff --git a/ext/intl/tests/dateformat_format.phpt b/ext/intl/tests/dateformat_format.phpt index cc1682ddd2..5b121558a0 100644 --- a/ext/intl/tests/dateformat_format.phpt +++ b/ext/intl/tests/dateformat_format.phpt @@ -20,7 +20,7 @@ function ut_main() $locale_arr = array ( 'en_US' ); - + $datetype_arr = array ( IntlDateFormatter::FULL, IntlDateFormatter::LONG, @@ -73,12 +73,12 @@ function ut_main() $localtime_arr2, $localtime_arr3 ); - + $d1 = new DateTime("2010-01-01 01:02:03", new DateTimeZone("UTC")); $d2 = new DateTime("2000-12-31 03:04:05", new DateTimeZone("UTC")); $d2->setTimezone(new DateTimeZone("PDT")); $dates = array( - $d1, + $d1, $d2, new StdClass(), ); @@ -129,7 +129,7 @@ function ut_main() $res_str .= "\n------------"; $res_str .= "\nDate is: ".var_export($date_entry, true); $res_str .= "\n------------"; - + $fmt = ut_datefmt_create( $locale_entry , $datetype_entry ,$datetype_entry, $timezone, IntlDateFormatter::GREGORIAN ); $formatted1 = ut_datefmt_format( $fmt , $date_entry); if( intl_get_error_code() == U_ZERO_ERROR){ diff --git a/ext/intl/tests/dateformat_format_parse.phpt b/ext/intl/tests/dateformat_format_parse.phpt index 516951371a..68f54eb7e7 100644 --- a/ext/intl/tests/dateformat_format_parse.phpt +++ b/ext/intl/tests/dateformat_format_parse.phpt @@ -13,12 +13,12 @@ datefmt_format_code() and datefmt_parse_code() function ut_main() { - $timezone = 'GMT+05:00'; + $timezone = 'GMT+05:00'; $locale_arr = array ( 'en_US' ); - + $datetype_arr = array ( IntlDateFormatter::FULL, IntlDateFormatter::LONG, diff --git a/ext/intl/tests/dateformat_format_parse_version2.phpt b/ext/intl/tests/dateformat_format_parse_version2.phpt index 8c6f00ef54..f672cd6d22 100644 --- a/ext/intl/tests/dateformat_format_parse_version2.phpt +++ b/ext/intl/tests/dateformat_format_parse_version2.phpt @@ -13,12 +13,12 @@ datefmt_format_code() and datefmt_parse_code() function ut_main() { - $timezone = 'GMT+05:00'; + $timezone = 'GMT+05:00'; $locale_arr = array ( 'en_US' ); - + $datetype_arr = array ( IntlDateFormatter::FULL, IntlDateFormatter::LONG, diff --git a/ext/intl/tests/dateformat_format_variant2.phpt b/ext/intl/tests/dateformat_format_variant2.phpt index 4e4cf7c02d..d61b20b03a 100644 --- a/ext/intl/tests/dateformat_format_variant2.phpt +++ b/ext/intl/tests/dateformat_format_variant2.phpt @@ -20,7 +20,7 @@ function ut_main() $locale_arr = array ( 'en_US' ); - + $datetype_arr = array ( IntlDateFormatter::FULL, IntlDateFormatter::LONG, @@ -73,12 +73,12 @@ function ut_main() $localtime_arr2, $localtime_arr3 ); - + $d1 = new DateTime("2010-01-01 01:02:03", new DateTimeZone("UTC")); $d2 = new DateTime("2000-12-31 03:04:05", new DateTimeZone("UTC")); $d2->setTimezone(new DateTimeZone("PDT")); $dates = array( - $d1, + $d1, $d2, new StdClass(), ); @@ -129,7 +129,7 @@ function ut_main() $res_str .= "\n------------"; $res_str .= "\nDate is: ".var_export($date_entry, true); $res_str .= "\n------------"; - + $fmt = ut_datefmt_create( $locale_entry , $datetype_entry ,$datetype_entry, $timezone, IntlDateFormatter::GREGORIAN ); $formatted1 = ut_datefmt_format( $fmt , $date_entry); if( intl_get_error_code() == U_ZERO_ERROR){ diff --git a/ext/intl/tests/dateformat_format_variant3.phpt b/ext/intl/tests/dateformat_format_variant3.phpt index 6827e8132a..e2f9ec81b0 100644 --- a/ext/intl/tests/dateformat_format_variant3.phpt +++ b/ext/intl/tests/dateformat_format_variant3.phpt @@ -20,7 +20,7 @@ function ut_main() $locale_arr = array ( 'en_US' ); - + $datetype_arr = array ( IntlDateFormatter::FULL, IntlDateFormatter::LONG, @@ -73,12 +73,12 @@ function ut_main() $localtime_arr2, $localtime_arr3 ); - + $d1 = new DateTime("2010-01-01 01:02:03", new DateTimeZone("UTC")); $d2 = new DateTime("2000-12-31 03:04:05", new DateTimeZone("UTC")); $d2->setTimezone(new DateTimeZone("PDT")); $dates = array( - $d1, + $d1, $d2, new StdClass(), ); @@ -129,7 +129,7 @@ function ut_main() $res_str .= "\n------------"; $res_str .= "\nDate is: ".var_export($date_entry, true); $res_str .= "\n------------"; - + $fmt = ut_datefmt_create( $locale_entry , $datetype_entry ,$datetype_entry, $timezone, IntlDateFormatter::GREGORIAN ); $formatted1 = ut_datefmt_format( $fmt , $date_entry); if( intl_get_error_code() == U_ZERO_ERROR){ diff --git a/ext/intl/tests/dateformat_get_datetype.phpt b/ext/intl/tests/dateformat_get_datetype.phpt index 24d03898ea..ec03bb68f4 100644 --- a/ext/intl/tests/dateformat_get_datetype.phpt +++ b/ext/intl/tests/dateformat_get_datetype.phpt @@ -19,7 +19,7 @@ function ut_main() IntlDateFormatter::SHORT, IntlDateFormatter::NONE ); - + $res_str = ''; foreach( $datetype_arr as $datetype_entry ) diff --git a/ext/intl/tests/dateformat_get_locale.phpt b/ext/intl/tests/dateformat_get_locale.phpt index 48b7daa8d4..aa7a0a46c3 100644 --- a/ext/intl/tests/dateformat_get_locale.phpt +++ b/ext/intl/tests/dateformat_get_locale.phpt @@ -20,7 +20,7 @@ function ut_main() 'en_UK', 'hi' ); - + $res_str = ''; foreach( $locale_arr as $locale_entry ) diff --git a/ext/intl/tests/dateformat_get_timetype.phpt b/ext/intl/tests/dateformat_get_timetype.phpt index 2ddc1172b1..cca3c6f96a 100644 --- a/ext/intl/tests/dateformat_get_timetype.phpt +++ b/ext/intl/tests/dateformat_get_timetype.phpt @@ -19,7 +19,7 @@ function ut_main() IntlDateFormatter::SHORT, IntlDateFormatter::NONE ); - + $res_str = ''; foreach( $timetype_arr as $timetype_entry ) diff --git a/ext/intl/tests/dateformat_get_timezone_id.phpt b/ext/intl/tests/dateformat_get_timezone_id.phpt index a9701c3868..f529614f21 100644 --- a/ext/intl/tests/dateformat_get_timezone_id.phpt +++ b/ext/intl/tests/dateformat_get_timezone_id.phpt @@ -20,7 +20,7 @@ function ut_main() 'US/Pacific', 'US/Central' ); - + $res_str = ''; foreach( $timezone_id_arr as $timezone_id_entry ) diff --git a/ext/intl/tests/dateformat_localtime.phpt b/ext/intl/tests/dateformat_localtime.phpt index 4d185c232d..5db43fb611 100644 --- a/ext/intl/tests/dateformat_localtime.phpt +++ b/ext/intl/tests/dateformat_localtime.phpt @@ -18,7 +18,7 @@ function ut_main() $locale_arr = array ( 'en_US_CA' ); - + $datetype_arr = array ( IntlDateFormatter::FULL, IntlDateFormatter::LONG, @@ -67,7 +67,7 @@ function ut_main() $res_str .= "\n------------"; $res_str .= "\nIntlDateFormatter : ".$fmt_desc_array[$cnt]; $parse_pos = 0; - $cnt++; + $cnt++; $parsed_arr = ut_datefmt_localtime( $fmt_entry , $text_entry , $parse_pos ); if( $parsed_arr){ diff --git a/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt b/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt index 03f99f1d92..c491608ad3 100644 --- a/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt +++ b/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt @@ -16,7 +16,7 @@ function ut_main() $locale_arr = array ( 'en_US_CA' ); - + $datetype_arr = array ( IntlDateFormatter::FULL, IntlDateFormatter::LONG, @@ -37,7 +37,7 @@ function ut_main() $fmt2 = ut_datefmt_create( 'en_US_CA', IntlDateFormatter::MEDIUM, IntlDateFormatter::MEDIUM); $fmt3 = ut_datefmt_create( 'en_US_CA', IntlDateFormatter::FULL, IntlDateFormatter::FULL); $fmt_array = array( - $fmt1 , $fmt2 ,$fmt3 + $fmt1 , $fmt2 ,$fmt3 ); $fmt_desc_array = array( "DateType::LONG, TimeType::LONG", @@ -52,7 +52,7 @@ function ut_main() foreach( $fmt_array as $fmt_entry ){ $res_str .= "\n------------"; $res_str .= "\nIntlDateFormatter : ".$fmt_desc_array[$cnt]; - $cnt++; + $cnt++; $parsed_arr = ut_datefmt_localtime( $fmt_entry , $text_entry); if( $parsed_arr){ diff --git a/ext/intl/tests/formatter_fail.phpt b/ext/intl/tests/formatter_fail.phpt index dcc5cb24fa..9cfc6f5054 100644 --- a/ext/intl/tests/formatter_fail.phpt +++ b/ext/intl/tests/formatter_fail.phpt @@ -49,11 +49,11 @@ try { print_exception($e); $fmt = null; } -err($fmt); +err($fmt); $fmt = numfmt_create(); -err($fmt); +err($fmt); $fmt = NumberFormatter::create(); -err($fmt); +err($fmt); foreach($args as $arg) { $fmt = crt("O", $arg[0], $arg[1]); diff --git a/ext/intl/tests/formatter_get_set_pattern.phpt b/ext/intl/tests/formatter_get_set_pattern.phpt index 7f33254e2c..66d6837d75 100644 --- a/ext/intl/tests/formatter_get_set_pattern.phpt +++ b/ext/intl/tests/formatter_get_set_pattern.phpt @@ -33,7 +33,7 @@ function ut_main() $res_str .= "New pattern: '" . ut_nfmt_get_pattern( $fmt ) . "'\n"; $res_str .= "Formatted number: " . ut_nfmt_format( $fmt, $test_value ) . "\n"; - ut_nfmt_set_pattern($fmt, str_repeat('@', 200)); + ut_nfmt_set_pattern($fmt, str_repeat('@', 200)); $res_str .= "New pattern: '" . ut_nfmt_get_pattern( $fmt ) . "'\n"; $res_str .= "Formatted number: " . ut_nfmt_format( $fmt, $test_value ) . "\n"; diff --git a/ext/intl/tests/formatter_get_set_pattern2.phpt b/ext/intl/tests/formatter_get_set_pattern2.phpt index 7bf98ae79e..b1d1ad0c48 100644 --- a/ext/intl/tests/formatter_get_set_pattern2.phpt +++ b/ext/intl/tests/formatter_get_set_pattern2.phpt @@ -33,7 +33,7 @@ function ut_main() $res_str .= "New pattern: '" . ut_nfmt_get_pattern( $fmt ) . "'\n"; $res_str .= "Formatted number: " . ut_nfmt_format( $fmt, $test_value ) . "\n"; - ut_nfmt_set_pattern($fmt, str_repeat('@', 200)); + ut_nfmt_set_pattern($fmt, str_repeat('@', 200)); $res_str .= "New pattern: '" . ut_nfmt_get_pattern( $fmt ) . "'\n"; $res_str .= "Formatted number: " . ut_nfmt_format( $fmt, $test_value ) . "\n"; diff --git a/ext/intl/tests/grapheme.phpt b/ext/intl/tests/grapheme.phpt index 251b1d142f..6b476edaab 100644 --- a/ext/intl/tests/grapheme.phpt +++ b/ext/intl/tests/grapheme.phpt @@ -29,7 +29,7 @@ function ut_main() $char_fi_ligature = "\xEF\xAC\x81"; // 'LATIN SMALL LIGATURE FI' (U+FB01) $char_long_s_dot = "\xE1\xBA\x9B"; // 'LATIN SMALL LETTER LONG S WITH DOT ABOVE' (U+1E9B) - + // the word 'hindi' using Devanagari characters: $hindi = "\xe0\xa4\xb9\xe0\xa4\xbf\xe0\xa4\xa8\xe0\xa5\x8d\xe0\xa4\xa6\xe0\xa5\x80"; @@ -42,7 +42,7 @@ function ut_main() //===================================================================================== $res_str .= "\n" . 'function grapheme_strlen($string) {}' . "\n\n"; - + $res_str .= "\"hindi\" in devanagari strlen " . grapheme_strlen($hindi) . "\n"; $res_str .= "\"ab\" + \"hindi\" + \"cde\" strlen " . grapheme_strlen('ab' . $hindi . 'cde') . "\n"; $res_str .= "\"\" strlen " . grapheme_strlen("") . "\n"; @@ -50,7 +50,7 @@ function ut_main() $res_str .= "char_a_ring_nfd + \"bc\" strlen " . grapheme_strlen($char_a_ring_nfd . 'bc') . "\n"; $res_str .= "\"abc\" strlen " . grapheme_strlen('abc') . "\n"; - + //===================================================================================== $res_str .= "\n" . 'function grapheme_strpos($haystack, $needle, $offset = 0) {}' . "\n\n"; @@ -75,7 +75,7 @@ function ut_main() array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "o", "o", -5, 6 ), array( $char_o_diaeresis_nfd . $char_a_ring_nfd . "a" . $char_a_ring_nfd . "bc", $char_a_ring_nfd, 2, 3 ), array( $char_o_diaeresis_nfd . $char_a_ring_nfd . "a" . $char_a_ring_nfd . "bc", $char_a_ring_nfd, -4, 3 ), - + array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "opq", "op", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "opq", "opq", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd, "abc", "false" ), @@ -119,10 +119,10 @@ function ut_main() } $res_str .= " == " . $test[count($test)-1] . check_result($result, $test[count($test)-1]) . "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_stripos($haystack, $needle, $offset = 0) {}' . "\n\n"; - + $tests = array( array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "O", "o", 2, 6 ), array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Oo", "o", -6, 6 ), @@ -142,7 +142,7 @@ function ut_main() array( "abc", "A", 0, 0 ), array( "Abc", "a", 1, "false" ), array( "ababc", "A", 1, 2 ), - + array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", "oP", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", "opQ", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd, "abc", "false" ), @@ -187,7 +187,7 @@ function ut_main() $res_str .= " == " . $test[count($test)-1] . check_result($result, $test[count($test)-1]) . "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_strrpos($haystack, $needle, $offset = 0) {}' . "\n\n"; @@ -209,7 +209,7 @@ function ut_main() array( "ababc", "a", 1, 2 ), array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "o", "o", 2, 6 ), array( $char_o_diaeresis_nfd . $char_a_ring_nfd . "a" . $char_a_ring_nfd . "bc", $char_a_ring_nfd, 2, 3 ), - + array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "opq", "op", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "opq", "opq", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd, "abc", "false" ), @@ -252,11 +252,11 @@ function ut_main() } $res_str .= " == " . $test[count($test)-1] . check_result($result, $test[count($test)-1]) . "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_strripos($haystack, $needle, $offset = 0) {}' . "\n\n"; - + $tests = array( array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "O", "o", 2, 6 ), array( $char_o_diaeresis_nfd . $char_a_ring_nfd . "a" . $char_A_ring_nfd . "bc", $char_a_ring_nfd, 2, 3 ), @@ -274,7 +274,7 @@ function ut_main() array( "abc", "A", 0, 0 ), array( "Abc", "a", 1, "false" ), array( "ababc", "A", 1, 2 ), - + array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", "oP", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", "opQ", 5 ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd, "abc", "false" ), @@ -317,8 +317,8 @@ function ut_main() } $res_str .= " == " . $test[count($test)-1] . check_result($result, $test[count($test)-1]) . "\n"; } - - + + //===================================================================================== $res_str .= "\n" . 'function grapheme_substr($string, $start, $length = -1) {}' . "\n\n"; @@ -343,7 +343,7 @@ function ut_main() array( "Abc", -4, 1, "false" ), array( "ababc", 1, 2, "ba" ), array( "ababc", 0, 10, "ababc" ), - + array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", 0, 10 , "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq" ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", 5, "Opq" ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", 5, -1, "Op" ), @@ -392,7 +392,7 @@ function ut_main() array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", -8, -7, "a" ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", -8, -8, "" ), array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", -8, -9, "false" ), - + ); foreach( $tests as $test ) { @@ -414,7 +414,7 @@ function ut_main() } $res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_strstr($haystack, $needle, $before_needle = FALSE) {}' . "\n\n"; @@ -441,7 +441,7 @@ function ut_main() array( "ababc", "bab", TRUE, "a" ), array( "ababc", "abc", TRUE, "ab" ), array( "ababc", "abc", FALSE, "abc" ), - + array( "ab" . $char_a_ring_nfd . "c", "d", "false" ), array( "bc" . $char_a_ring_nfd . "a", "a", "a" ), array( "a" . $char_a_ring_nfd . "bc", "b", "bc" ), @@ -479,7 +479,7 @@ function ut_main() } $res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_stristr($haystack, $needle, $before_needle = FALSE) {}' . "\n\n"; @@ -506,7 +506,7 @@ function ut_main() array( "aBabc", "bab", TRUE, "a" ), array( "ababc", "aBc", TRUE, "ab" ), array( "ababc", "abC", FALSE, "abc" ), - + array( "ab" . $char_a_ring_nfd . "c", "d", "false" ), array( "bc" . $char_a_ring_nfd . "A", "a", "A" ), array( "a" . $char_a_ring_nfd . "bc", "B", "bc" ), @@ -544,7 +544,7 @@ function ut_main() } $res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_extract($haystack, $size, $extract_type = GRAPHEME_EXTR_COUNT, $start = 0[, $next])' . "\n\n"; @@ -635,7 +635,7 @@ function ut_main() } $res_str .= "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_extract($haystack, $size, $extract_type = GRAPHEME_EXTR_MAXBYTES, $start = 0)' . "\n\n"; @@ -693,7 +693,7 @@ function ut_main() } $res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n"; } - + //===================================================================================== $res_str .= "\n" . 'function grapheme_extract($haystack, $size, $extract_type = GRAPHEME_EXTR_MAXCHARS, $start = 0)' . "\n\n"; @@ -757,10 +757,10 @@ function ut_main() } $res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n"; } - - + + //===================================================================================== - + return $res_str; } diff --git a/ext/intl/tests/idn_uts46_basic.phpt b/ext/intl/tests/idn_uts46_basic.phpt index 2ca185092d..881e8311c9 100644 --- a/ext/intl/tests/idn_uts46_basic.phpt +++ b/ext/intl/tests/idn_uts46_basic.phpt @@ -12,9 +12,9 @@ $utf8dn = "www.fußball.com"; $asciiNonTrans = "www.xn--fuball-cta.com"; echo "all ok, no details:", "\n"; -var_dump(idn_to_ascii($utf8dn, +var_dump(idn_to_ascii($utf8dn, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46)); - + echo "all ok, no details, transitional:", "\n"; var_dump(idn_to_ascii($utf8dn, 0, INTL_IDNA_VARIANT_UTS46)); diff --git a/ext/intl/tests/locale_accept.phpt b/ext/intl/tests/locale_accept.phpt index cf1dc6e675..a2834d8ade 100644 --- a/ext/intl/tests/locale_accept.phpt +++ b/ext/intl/tests/locale_accept.phpt @@ -6,7 +6,7 @@ locale_accept_from_http <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ diff --git a/ext/intl/tests/locale_compose_locale.phpt b/ext/intl/tests/locale_compose_locale.phpt index 2d0ca54e74..5eef05b3e6 100644 --- a/ext/intl/tests/locale_compose_locale.phpt +++ b/ext/intl/tests/locale_compose_locale.phpt @@ -6,42 +6,42 @@ locale_compose_locale() <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ function ut_main() { - $loc_parts_arr1 = array( + $loc_parts_arr1 = array( Locale::LANG_TAG =>'sl' , Locale::SCRIPT_TAG =>'Latn' , - Locale::REGION_TAG =>'IT' + Locale::REGION_TAG =>'IT' ); - $loc_parts_arr2 = array( + $loc_parts_arr2 = array( Locale::LANG_TAG =>'de' , Locale::REGION_TAG =>'DE' ); - $loc_parts_arr3 = array( + $loc_parts_arr3 = array( Locale::LANG_TAG =>'hi' ); - $loc_parts_arr4 = array( + $loc_parts_arr4 = array( Locale::LANG_TAG =>'zh' , Locale::SCRIPT_TAG =>'Hans' , Locale::REGION_TAG =>'CN' ); - $loc_parts_arr5 = array( + $loc_parts_arr5 = array( Locale::LANG_TAG =>'es' , Locale::SCRIPT_TAG =>'Hans' , Locale::REGION_TAG =>'CN' ); - $loc_parts_arr6 = array( + $loc_parts_arr6 = array( Locale::LANG_TAG =>'en' , Locale::SCRIPT_TAG =>'Hans' , Locale::REGION_TAG =>'CN', Locale::VARIANT_TAG.'14' =>'rozaj' , - 'variant1'=>'nedis' + 'variant1'=>'nedis' ); - $loc_parts_arr7 = array( + $loc_parts_arr7 = array( Locale::LANG_TAG =>'en' , Locale::SCRIPT_TAG =>'Hans' , Locale::REGION_TAG =>'CN', @@ -50,7 +50,7 @@ function ut_main() 'extlang0'=>'lng' , 'extlang1'=>'ing' ); - $loc_parts_arr8 = array( + $loc_parts_arr8 = array( Locale::LANG_TAG =>'en' , Locale::SCRIPT_TAG =>'Hans' , Locale::REGION_TAG =>'CN', @@ -61,21 +61,21 @@ function ut_main() 'private7'=>'prv1' , 'private9'=>'prv2' ); - $loc_parts_arr9 = array( + $loc_parts_arr9 = array( Locale::REGION_TAG =>'DE' ); - $loc_parts_arr10 = array( + $loc_parts_arr10 = array( Locale::LANG_TAG => 45, Locale::REGION_TAG => false, Locale::SCRIPT_TAG => 15 ); $loc_parts_arr11 = array( - Locale::LANG_TAG =>'de' , - Locale::REGION_TAG =>'DE', + Locale::LANG_TAG =>'de' , + Locale::REGION_TAG =>'DE', 'private0' => 13, 'variant1' => array(), 'extlang2' => false - ); + ); $loc_parts_arr12 = array( Locale::LANG_TAG =>'en' , Locale::SCRIPT_TAG =>'Hans' , @@ -91,7 +91,7 @@ function ut_main() 'loc2' => $loc_parts_arr2 , 'loc3' => $loc_parts_arr3 , 'loc4' => $loc_parts_arr4 , - 'loc5' => $loc_parts_arr5 , + 'loc5' => $loc_parts_arr5 , 'loc6' => $loc_parts_arr6 , 'loc7' => $loc_parts_arr7 , 'loc8' => $loc_parts_arr8 , @@ -102,13 +102,13 @@ function ut_main() ); error_reporting( E_ERROR ); - + $cnt = 0; $res_str = ''; foreach($loc_parts_arr as $key => $value ){ $res_str .= "\n------------"; $res_str .= "\nInput Array name is : loc".(++$cnt) ; -/* +/* foreach($value as $valKey => $valValue ){ $res_str .= $valKey ."->".$valValue." " ; } diff --git a/ext/intl/tests/locale_filter_matches.phpt b/ext/intl/tests/locale_filter_matches.phpt index cada499b9a..5f4a9457c5 100644 --- a/ext/intl/tests/locale_filter_matches.phpt +++ b/ext/intl/tests/locale_filter_matches.phpt @@ -7,7 +7,7 @@ locale_filter_matches.phpt() icu <= 4.2 <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ @@ -21,7 +21,7 @@ function ut_main() 'art-lojban', 'sl_IT' ); - + $lang_tags = array( 'de-DEVA', 'de-DE-1996', @@ -48,7 +48,7 @@ function ut_main() $res_str .="--------------\n"; $result= ut_loc_locale_filter_matches( $lang_tag , $loc_range , $isCanonical); $res_str .= "loc_range:$loc_range matches lang_tag $lang_tag ? "; - if( $result){ + if( $result){ $res_str .= "YES\n"; }else{ $res_str .= "NO\n"; @@ -58,7 +58,7 @@ function ut_main() $can_loc_range = ut_loc_canonicalize($loc_range); $can_lang_tag = ut_loc_canonicalize($lang_tag); $res_str .= "loc_range:$can_loc_range canonically matches lang_tag $can_lang_tag ? "; - if( $result){ + if( $result){ $res_str .= "YES\n"; }else{ $res_str .= "NO\n"; diff --git a/ext/intl/tests/locale_filter_matches2.phpt b/ext/intl/tests/locale_filter_matches2.phpt index 46771b7c1a..3ce8603028 100644 --- a/ext/intl/tests/locale_filter_matches2.phpt +++ b/ext/intl/tests/locale_filter_matches2.phpt @@ -8,7 +8,7 @@ locale_filter_matches.phpt() icu >= 4.8 && icu < 50.1.2 <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ @@ -22,7 +22,7 @@ function ut_main() 'art-lojban', 'sl_IT' ); - + $lang_tags = array( 'de-DEVA', 'de-DE-1996', @@ -49,7 +49,7 @@ function ut_main() $res_str .="--------------\n"; $result= ut_loc_locale_filter_matches( $lang_tag , $loc_range , $isCanonical); $res_str .= "loc_range:$loc_range matches lang_tag $lang_tag ? "; - if( $result){ + if( $result){ $res_str .= "YES\n"; }else{ $res_str .= "NO\n"; @@ -59,7 +59,7 @@ function ut_main() $can_loc_range = ut_loc_canonicalize($loc_range); $can_lang_tag = ut_loc_canonicalize($lang_tag); $res_str .= "loc_range:$can_loc_range canonically matches lang_tag $can_lang_tag ? "; - if( $result){ + if( $result){ $res_str .= "YES\n"; }else{ $res_str .= "NO\n"; diff --git a/ext/intl/tests/locale_filter_matches3.phpt b/ext/intl/tests/locale_filter_matches3.phpt index 4c1d4d3898..2816ba5e12 100644 --- a/ext/intl/tests/locale_filter_matches3.phpt +++ b/ext/intl/tests/locale_filter_matches3.phpt @@ -1,5 +1,5 @@ --TEST-- -locale_filter_matches.phpt() ICU >= 51.2 +locale_filter_matches.phpt() ICU >= 51.2 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> <?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?> @@ -7,7 +7,7 @@ locale_filter_matches.phpt() ICU >= 51.2 <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ @@ -21,7 +21,7 @@ function ut_main() 'art-lojban', 'sl_IT' ); - + $lang_tags = array( 'de-DEVA', 'de-DE-1996', @@ -48,7 +48,7 @@ function ut_main() $res_str .="--------------\n"; $result= ut_loc_locale_filter_matches( $lang_tag , $loc_range , $isCanonical); $res_str .= "loc_range:$loc_range matches lang_tag $lang_tag ? "; - if( $result){ + if( $result){ $res_str .= "YES\n"; }else{ $res_str .= "NO\n"; @@ -58,7 +58,7 @@ function ut_main() $can_loc_range = ut_loc_canonicalize($loc_range); $can_lang_tag = ut_loc_canonicalize($lang_tag); $res_str .= "loc_range:$can_loc_range canonically matches lang_tag $can_lang_tag ? "; - if( $result){ + if( $result){ $res_str .= "YES\n"; }else{ $res_str .= "NO\n"; diff --git a/ext/intl/tests/locale_get_all_variants.phpt b/ext/intl/tests/locale_get_all_variants.phpt index 864b8a2e1a..8f2bcbfa39 100644 --- a/ext/intl/tests/locale_get_all_variants.phpt +++ b/ext/intl/tests/locale_get_all_variants.phpt @@ -6,7 +6,7 @@ locale_get_all_variants.phpt() <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ @@ -24,7 +24,7 @@ function ut_main() 'sgn-BE-nl', 'sgn-CH-de', 'sl_IT_rozaj@currency=EUR' - ); + ); $res_str = ''; foreach($locales as $locale){ $variants_arr = ut_loc_locale_get_all_variants( $locale); diff --git a/ext/intl/tests/locale_get_default.phpt b/ext/intl/tests/locale_get_default.phpt index 57c46ccd2b..6bb5a9a86b 100644 --- a/ext/intl/tests/locale_get_default.phpt +++ b/ext/intl/tests/locale_get_default.phpt @@ -15,7 +15,7 @@ intl.default_locale=en-US function ut_main() { $res_str = ''; - + $lang = ut_loc_get_default() ; $res_str .= "Default locale: $lang"; $res_str .= "\n"; diff --git a/ext/intl/tests/locale_get_display_language.phpt b/ext/intl/tests/locale_get_display_language.phpt index 2e00056284..35d7532d6b 100644 --- a/ext/intl/tests/locale_get_display_language.phpt +++ b/ext/intl/tests/locale_get_display_language.phpt @@ -80,7 +80,7 @@ function ut_main() $scr = ut_loc_get_display_language( $locale ,$disp_locale ); $res_str .= "disp_locale=$disp_locale : display_language=$scr"; $res_str .= "\n"; - } + } $res_str .= "-----------------\n"; } diff --git a/ext/intl/tests/locale_get_display_name.phpt b/ext/intl/tests/locale_get_display_name.phpt index b128734277..ee921020af 100644 --- a/ext/intl/tests/locale_get_display_name.phpt +++ b/ext/intl/tests/locale_get_display_name.phpt @@ -89,10 +89,10 @@ function ut_main() foreach( $disp_locales as $disp_locale ) { $scr = ut_loc_get_display_name( $locale ,$disp_locale ); - $scr = str_replace(array('(', ')'), '#', $scr); + $scr = str_replace(array('(', ')'), '#', $scr); $res_str .= "disp_locale=$disp_locale : display_name=$scr"; $res_str .= "\n"; - } + } $res_str .= "-----------------\n"; } diff --git a/ext/intl/tests/locale_get_display_name2.phpt b/ext/intl/tests/locale_get_display_name2.phpt index dcc996eca9..0b0bc6c321 100644 --- a/ext/intl/tests/locale_get_display_name2.phpt +++ b/ext/intl/tests/locale_get_display_name2.phpt @@ -90,10 +90,10 @@ function ut_main() foreach( $disp_locales as $disp_locale ) { $scr = ut_loc_get_display_name( $locale ,$disp_locale ); - $scr = str_replace(array('(', ')'), '#', $scr); + $scr = str_replace(array('(', ')'), '#', $scr); $res_str .= "disp_locale=$disp_locale : display_name=$scr"; $res_str .= "\n"; - } + } $res_str .= "-----------------\n"; } diff --git a/ext/intl/tests/locale_get_display_name3.phpt b/ext/intl/tests/locale_get_display_name3.phpt index 0340f14b2c..2052a6d456 100644 --- a/ext/intl/tests/locale_get_display_name3.phpt +++ b/ext/intl/tests/locale_get_display_name3.phpt @@ -89,10 +89,10 @@ function ut_main() foreach( $disp_locales as $disp_locale ) { $scr = ut_loc_get_display_name( $locale ,$disp_locale ); - $scr = str_replace(array('(', ')'), '#', $scr); + $scr = str_replace(array('(', ')'), '#', $scr); $res_str .= "disp_locale=$disp_locale : display_name=$scr"; $res_str .= "\n"; - } + } $res_str .= "-----------------\n"; } diff --git a/ext/intl/tests/locale_get_display_name4.phpt b/ext/intl/tests/locale_get_display_name4.phpt index 4b3255c0f6..a0b40a4114 100644 --- a/ext/intl/tests/locale_get_display_name4.phpt +++ b/ext/intl/tests/locale_get_display_name4.phpt @@ -90,10 +90,10 @@ function ut_main() foreach( $disp_locales as $disp_locale ) { $scr = ut_loc_get_display_name( $locale ,$disp_locale ); - $scr = str_replace(array('(', ')'), '#', $scr); + $scr = str_replace(array('(', ')'), '#', $scr); $res_str .= "disp_locale=$disp_locale : display_name=$scr"; $res_str .= "\n"; - } + } $res_str .= "-----------------\n"; } diff --git a/ext/intl/tests/locale_get_display_name5.phpt b/ext/intl/tests/locale_get_display_name5.phpt index b633b1f62c..99263190ac 100644 --- a/ext/intl/tests/locale_get_display_name5.phpt +++ b/ext/intl/tests/locale_get_display_name5.phpt @@ -89,10 +89,10 @@ function ut_main() foreach( $disp_locales as $disp_locale ) { $scr = ut_loc_get_display_name( $locale ,$disp_locale ); - $scr = str_replace(array('(', ')'), '#', $scr); + $scr = str_replace(array('(', ')'), '#', $scr); $res_str .= "disp_locale=$disp_locale : display_name=$scr"; $res_str .= "\n"; - } + } $res_str .= "-----------------\n"; } diff --git a/ext/intl/tests/locale_get_keywords.phpt b/ext/intl/tests/locale_get_keywords.phpt index 4a09f54d36..622dd79dc8 100644 --- a/ext/intl/tests/locale_get_keywords.phpt +++ b/ext/intl/tests/locale_get_keywords.phpt @@ -30,7 +30,7 @@ function ut_main() 'fr', 'ja', 'i-enochian', //(example of a grandfathered tag) -//Language subtag plus Script subtag: +//Language subtag plus Script subtag: 'zh-Hant', 'zh-Hans', 'sr-Cyrl', @@ -53,7 +53,7 @@ function ut_main() //Private use subtags: 'de-CH-x-phonebk', 'az-Arab-x-AZE-derbend', -//Extended language subtags +//Extended language subtags 'zh-min', 'zh-min-nan-Hant-CN', //Private use registry values diff --git a/ext/intl/tests/locale_get_keywords2.phpt b/ext/intl/tests/locale_get_keywords2.phpt index 7bcaca1897..c36655f7b2 100644 --- a/ext/intl/tests/locale_get_keywords2.phpt +++ b/ext/intl/tests/locale_get_keywords2.phpt @@ -30,7 +30,7 @@ function ut_main() 'fr', 'ja', 'i-enochian', //(example of a grandfathered tag) -//Language subtag plus Script subtag: +//Language subtag plus Script subtag: 'zh-Hant', 'zh-Hans', 'sr-Cyrl', @@ -53,7 +53,7 @@ function ut_main() //Private use subtags: 'de-CH-x-phonebk', 'az-Arab-x-AZE-derbend', -//Extended language subtags +//Extended language subtags 'zh-min', 'zh-min-nan-Hant-CN', //Private use registry values diff --git a/ext/intl/tests/locale_lookup.phpt b/ext/intl/tests/locale_lookup.phpt index ff8aab049d..9d4843038d 100644 --- a/ext/intl/tests/locale_lookup.phpt +++ b/ext/intl/tests/locale_lookup.phpt @@ -7,7 +7,7 @@ locale_lookup.phpt() icu >= 4.8 && icu < 50.1.2 <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ @@ -20,7 +20,7 @@ function ut_main() 'jbo', 'art-lojban' ); - + $lang_tags = array( 'de-DEVA', 'de-DE-1996', diff --git a/ext/intl/tests/locale_lookup_variant2.phpt b/ext/intl/tests/locale_lookup_variant2.phpt index 4715951e9a..75a5350abf 100644 --- a/ext/intl/tests/locale_lookup_variant2.phpt +++ b/ext/intl/tests/locale_lookup_variant2.phpt @@ -7,7 +7,7 @@ locale_lookup.phpt() <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ @@ -20,7 +20,7 @@ function ut_main() 'jbo', 'art-lojban' ); - + $lang_tags = array( 'de-DEVA', 'de-DE-1996', diff --git a/ext/intl/tests/locale_set_default.phpt b/ext/intl/tests/locale_set_default.phpt index 7debf4d3de..d56c9177cd 100644 --- a/ext/intl/tests/locale_set_default.phpt +++ b/ext/intl/tests/locale_set_default.phpt @@ -56,7 +56,7 @@ function ut_main() 'sr-Latn-QM', 'sr-Qaaa-CS', //Tags that use extensions (examples ONLY: extensions MUST be defined -// by revision or update to this document or by RFC): +// by revision or update to this document or by RFC): 'en-US-u-islamCal', 'zh-CN-a-myExt-x-private', 'en-a-myExt-b-another', @@ -67,7 +67,7 @@ function ut_main() ); /* - $locales = array( + $locales = array( 'es' ); */ diff --git a/ext/intl/tests/msgfmt_fail.phpt b/ext/intl/tests/msgfmt_fail.phpt index daeaa8f677..afb415d1c8 100644 --- a/ext/intl/tests/msgfmt_fail.phpt +++ b/ext/intl/tests/msgfmt_fail.phpt @@ -51,9 +51,9 @@ try { print_exception($e); $fmt = null; } -err($fmt); +err($fmt); $fmt = msgfmt_create(); -err($fmt); +err($fmt); $fmt = MessageFormatter::create(); err($fmt); try { @@ -62,11 +62,11 @@ try { print_exception($e); $fmt = null; } -err($fmt); +err($fmt); $fmt = msgfmt_create('en'); -err($fmt); +err($fmt); $fmt = MessageFormatter::create('en'); -err($fmt); +err($fmt); foreach($args as $arg) { $fmt = crt("O", $arg[0], $arg[1]); diff --git a/ext/intl/tests/msgfmt_fail2.phpt b/ext/intl/tests/msgfmt_fail2.phpt index 698d19afce..d574531b3a 100644 --- a/ext/intl/tests/msgfmt_fail2.phpt +++ b/ext/intl/tests/msgfmt_fail2.phpt @@ -51,9 +51,9 @@ try { print_exception($e); $fmt = null; } -err($fmt); +err($fmt); $fmt = msgfmt_create(); -err($fmt); +err($fmt); $fmt = MessageFormatter::create(); err($fmt); try { @@ -62,11 +62,11 @@ try { print_exception($e); $fmt = null; } -err($fmt); +err($fmt); $fmt = msgfmt_create('en'); -err($fmt); +err($fmt); $fmt = MessageFormatter::create('en'); -err($fmt); +err($fmt); foreach($args as $arg) { $fmt = crt("O", $arg[0], $arg[1]); diff --git a/ext/intl/tests/msgfmt_format.phpt b/ext/intl/tests/msgfmt_format.phpt index c1bf5e9db6..19581e9698 100644 --- a/ext/intl/tests/msgfmt_format.phpt +++ b/ext/intl/tests/msgfmt_format.phpt @@ -15,16 +15,16 @@ function ut_main() $locales = array( 'en_US' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree", 'ru_UA' => "{0,number,integer} мавп на {1,number,integer} деревах це {2,number} мавпи на кожному деревi", - 'de' => "{0,number,integer} Affen über {1,number,integer} Bäume um {2,number} Affen pro Baum", - 'en_UK' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree", + 'de' => "{0,number,integer} Affen über {1,number,integer} Bäume um {2,number} Affen pro Baum", + 'en_UK' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree", 'root' => '{0,whatever} would not work!', 'fr' => "C'est la vie!", - ); + ); $str_res = ''; $m = 4560; $t = 123; - + foreach( $locales as $locale => $pattern ) { $str_res .= "\nLocale is: $locale\n"; diff --git a/ext/intl/tests/msgfmt_format_mixed_params.phpt b/ext/intl/tests/msgfmt_format_mixed_params.phpt index 93412f49e2..9a3691db51 100644 --- a/ext/intl/tests/msgfmt_format_mixed_params.phpt +++ b/ext/intl/tests/msgfmt_format_mixed_params.phpt @@ -13,7 +13,7 @@ ini_set("intl.error_level", E_WARNING); $mf = new MessageFormatter('en_US', "{0,number} -- {foo,ordinal}"); - + var_dump($mf->format(array(2.3, "foo" => 1.3))); var_dump($mf->format(array("foo" => 1.3, 0 => 2.3))); diff --git a/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt index 299ae483a4..a300d13b77 100644 --- a/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt +++ b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt @@ -25,7 +25,7 @@ $mf = new MessageFormatter('en_US'," ordinal {i,ordinal} duration {j,duration} "); - + $ex = "1336317965.5 str"; var_dump($mf->format(array( 'a' => $ex, diff --git a/ext/intl/tests/msgfmt_get_set_pattern.phpt b/ext/intl/tests/msgfmt_get_set_pattern.phpt index 67b1aca459..7d7ab83e09 100644 --- a/ext/intl/tests/msgfmt_get_set_pattern.phpt +++ b/ext/intl/tests/msgfmt_get_set_pattern.phpt @@ -35,7 +35,7 @@ function ut_main() ut_msgfmt_set_pattern($fmt, str_repeat($pattern, 10)); $res_str .= "New pattern: '" . ut_msgfmt_get_pattern( $fmt ) . "'\n"; $res_str .= "Formatted message: " . ut_msgfmt_format( $fmt, array(123, 456) ) . "\n"; - + return $res_str; } diff --git a/ext/intl/tests/msgfmt_parse.phpt b/ext/intl/tests/msgfmt_parse.phpt index b9ec36374b..95645a63a0 100644 --- a/ext/intl/tests/msgfmt_parse.phpt +++ b/ext/intl/tests/msgfmt_parse.phpt @@ -15,12 +15,12 @@ function ut_main() $locales = array( 'en_US' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree", 'ru_UA' => "{0,number,integer} мавп на {1,number,integer} деревах це {2,number} мавпи на кожному деревi", - 'de' => "{0,number,integer} Affen über {1,number,integer} Bäume um {2,number} Affen pro Baum", - 'en_UK' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree", + 'de' => "{0,number,integer} Affen über {1,number,integer} Bäume um {2,number} Affen pro Baum", + 'en_UK' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree", 'root' => '{0,whatever} would not work!', 'fr' => 'C\'est {0,number,integer}', ); - + $results = array( 'en_US' => "4,560 monkeys on 123 trees make 37.073 monkeys per tree", 'ru_UA' => "4 560 мавп на 123 деревах це 37,073 мавпи на кожному деревi", @@ -28,11 +28,11 @@ function ut_main() 'en_UK' => "4,560 monkeys on 123 trees make 37.073 monkeys per tree", 'root' => "4,560 monkeys on 123 trees make 37.073 monkeys per tree", 'fr' => "C'est 42", - + ); $str_res = ''; - + foreach( $locales as $locale => $pattern ) { $str_res .= "\nLocale is: $locale\n"; diff --git a/ext/intl/tests/msgfmt_setPattern_cache.phpt b/ext/intl/tests/msgfmt_setPattern_cache.phpt index 35ec463c2a..995eee6f2e 100644 --- a/ext/intl/tests/msgfmt_setPattern_cache.phpt +++ b/ext/intl/tests/msgfmt_setPattern_cache.phpt @@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING); $mf = new MessageFormatter('en_US', "{0,number} -- {1,ordinal}"); - + var_dump($mf->format(array(1.3, 1.3))); var_dump($mf->format(array(1.3, 1.3))); $mf->setPattern("{0,ordinal} -- {1,number}"); diff --git a/ext/intl/tests/normalizer_get_raw_decomposition.phpt b/ext/intl/tests/normalizer_get_raw_decomposition.phpt index 8f13612bd8..3f71fc6f57 100644 --- a/ext/intl/tests/normalizer_get_raw_decomposition.phpt +++ b/ext/intl/tests/normalizer_get_raw_decomposition.phpt @@ -22,15 +22,15 @@ function ut_main() "aa", "\xF5", ]; - + foreach ($strings as $string) { $decomposition = ut_norm_get_raw_decomposition($string, Normalizer::FORM_KC); $error_code = intl_get_error_code(); $error_message = intl_get_error_message(); - + $string_hex = bin2hex($string); $result .= "---------------------\n"; - + if ($decomposition === null) { $result .= "'$string_hex' has no decomposition mapping\n" ; } else { diff --git a/ext/intl/tests/normalizer_normalize.phpt b/ext/intl/tests/normalizer_normalize.phpt index 5baa390767..70a2bce912 100644 --- a/ext/intl/tests/normalizer_normalize.phpt +++ b/ext/intl/tests/normalizer_normalize.phpt @@ -39,7 +39,7 @@ function ut_main() $res_str .= "Invalid normalization form declarations!\n"; } - + $char_a_diaeresis = "\xC3\xA4"; // 'LATIN SMALL LETTER A WITH DIAERESIS' (U+00E4) $char_a_ring = "\xC3\xA5"; // 'LATIN SMALL LETTER A WITH RING ABOVE' (U+00E5) $char_o_diaeresis = "\xC3\xB6"; // 'LATIN SMALL LETTER O WITH DIAERESIS' (U+00F6) @@ -55,7 +55,7 @@ function ut_main() $char_fi_ligature = "\xEF\xAC\x81"; // 'LATIN SMALL LIGATURE FI' (U+FB01) $char_long_s_dot = "\xE1\xBA\x9B"; // 'LATIN SMALL LETTER LONG S WITH DOT ABOVE' (U+1E9B) - + $strs = array( 'ABC', $char_a_diaeresis . '||' . $char_a_ring . '||' . $char_o_diaeresis, @@ -64,7 +64,7 @@ function ut_main() $char_fi_ligature, $char_long_s_dot, ); - + foreach( $forms as $form ) { foreach( $strs as $str ) @@ -80,15 +80,15 @@ function ut_main() $str_hex = urlencode($str); $str_norm_hex = urlencode($str_norm); - $res_str .= "'$str_hex' normalized to form '{$forms_str[$form]}' is '$str_norm_hex'" - . "\terror info: '$error_message' ($error_code)\n" + $res_str .= "'$str_hex' normalized to form '{$forms_str[$form]}' is '$str_norm_hex'" + . "\terror info: '$error_message' ($error_code)\n" . ""; - + $is_norm = ut_norm_is_normalized( $str, $form ); $error_code = intl_get_error_code(); $error_message = intl_get_error_message(); - $res_str .= " is in form '{$forms_str[$form]}'? = " . ($is_norm ? "yes" : "no") + $res_str .= " is in form '{$forms_str[$form]}'? = " . ($is_norm ? "yes" : "no") . "\terror info: '$error_message' ($error_code)\n" . ""; } diff --git a/ext/intl/tests/normalizer_normalize_kc_cf.phpt b/ext/intl/tests/normalizer_normalize_kc_cf.phpt index 040cd29e0b..6ce0658772 100644 --- a/ext/intl/tests/normalizer_normalize_kc_cf.phpt +++ b/ext/intl/tests/normalizer_normalize_kc_cf.phpt @@ -27,7 +27,7 @@ function ut_main() if (Normalizer::FORM_C != Normalizer::NFC) { $res_str .= "Invalid normalization form declarations!\n"; } - + $char_a_diaeresis = "\xC3\xA4"; // 'LATIN SMALL LETTER A WITH DIAERESIS' (U+00E4) $char_a_ring = "\xC3\xA5"; // 'LATIN SMALL LETTER A WITH RING ABOVE' (U+00E5) $char_o_diaeresis = "\xC3\xB6"; // 'LATIN SMALL LETTER O WITH DIAERESIS' (U+00F6) @@ -43,7 +43,7 @@ function ut_main() $char_fi_ligature = "\xEF\xAC\x81"; // 'LATIN SMALL LIGATURE FI' (U+FB01) $char_long_s_dot = "\xE1\xBA\x9B"; // 'LATIN SMALL LETTER LONG S WITH DOT ABOVE' (U+1E9B) - + $strs = array( 'ABC', 'abc', @@ -53,7 +53,7 @@ function ut_main() $char_fi_ligature, $char_long_s_dot, ); - + foreach( $forms as $form ) { foreach( $strs as $str ) @@ -69,15 +69,15 @@ function ut_main() $str_hex = urlencode($str); $str_norm_hex = urlencode($str_norm); - $res_str .= "'$str_hex' normalized to form '{$forms_str[$form]}' is '$str_norm_hex'" - . "\terror info: '$error_message' ($error_code)\n" + $res_str .= "'$str_hex' normalized to form '{$forms_str[$form]}' is '$str_norm_hex'" + . "\terror info: '$error_message' ($error_code)\n" . ""; - + $is_norm = ut_norm_is_normalized( $str, $form ); $error_code = intl_get_error_code(); $error_message = intl_get_error_message(); - $res_str .= " is in form '{$forms_str[$form]}'? = " . ($is_norm ? "yes" : "no") + $res_str .= " is in form '{$forms_str[$form]}'? = " . ($is_norm ? "yes" : "no") . "\terror info: '$error_message' ($error_code)\n" . ""; } diff --git a/ext/intl/tests/resourcebundle_create.phpt b/ext/intl/tests/resourcebundle_create.phpt index 9d551219ec..09bad4fddf 100644 --- a/ext/intl/tests/resourcebundle_create.phpt +++ b/ext/intl/tests/resourcebundle_create.phpt @@ -4,7 +4,7 @@ Test ResourceBundle::__construct() - existing/missing bundles/locales <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> --FILE-- <?php - + include "resourcebundle.inc"; function ut_main() { @@ -31,7 +31,7 @@ function ut_main() { // missing $r3 = ut_resourcebundle_create( 'en_US', 'nonexisting' ); $str_res .= debug( $r3 ); - + return $str_res; } diff --git a/ext/intl/tests/resourcebundle_individual.phpt b/ext/intl/tests/resourcebundle_individual.phpt index dcbf1f5831..0fb512f8e5 100644 --- a/ext/intl/tests/resourcebundle_individual.phpt +++ b/ext/intl/tests/resourcebundle_individual.phpt @@ -27,7 +27,7 @@ function ut_main() { $t = ut_resourcebundle_get( $r, 'nonexisting' ); $str_res .= debug( $t ); - + return $str_res; } include_once( 'ut_common.inc' ); diff --git a/ext/intl/tests/resourcebundle_locales.phpt b/ext/intl/tests/resourcebundle_locales.phpt index e14a7e5aa1..c744e63193 100644 --- a/ext/intl/tests/resourcebundle_locales.phpt +++ b/ext/intl/tests/resourcebundle_locales.phpt @@ -4,14 +4,14 @@ Test ResourceBundle::getLocales <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> --FILE-- <?php - + include "resourcebundle.inc"; function ut_main() { $str_res = ''; $str_res .= join("\n", ut_resourcebundle_locales(BUNDLE)); - + return $str_res; } diff --git a/ext/intl/tests/symfony_format_type_int32_intl1.phpt b/ext/intl/tests/symfony_format_type_int32_intl1.phpt index 2867b35690..7d892cf5b6 100644 --- a/ext/intl/tests/symfony_format_type_int32_intl1.phpt +++ b/ext/intl/tests/symfony_format_type_int32_intl1.phpt @@ -10,13 +10,13 @@ Symfony StubNumberFormatterTest#testFormatTypeInt32Intl #1 // Crashes on Windows // Windows note: the popup '...program has stopped working'(AEDebug Popup) -// doesn't always show if you're rapidly running this test repeatedly. +// doesn't always show if you're rapidly running this test repeatedly. // regardless of that, the test always crashes every time. // (it will show up the first time, or if you wait a while before running it again.) // (the popup may also be disabled, which can be done with a registry setting.) // you can confirm it crashed by checking the exit code OR // the message this test prints at the very end (expected output for pass). -// +// // Get Exit Code // Linux: echo $? // Windows: echo %ErrorLevel% diff --git a/ext/intl/tests/timezone_getOffset_basic.phpt b/ext/intl/tests/timezone_getOffset_basic.phpt index 582d45cad9..403bf8fc35 100644 --- a/ext/intl/tests/timezone_getOffset_basic.phpt +++ b/ext/intl/tests/timezone_getOffset_basic.phpt @@ -17,7 +17,7 @@ var_dump($ams->getOffset($date *1000., true, $rawOffset, $dstOffset), $rawOffset, $dstOffset); $lsb = IntlTimeZone::createTimeZone('Europe/Lisbon'); - + var_dump(intltz_get_offset($lsb, $date *1000., true, $rawOffset, $dstOffset), $rawOffset, $dstOffset); |