diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:32:30 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:32:30 +0200 |
| commit | b746e6988743b46ccb0542d5d568eef0608ee296 (patch) | |
| tree | 2f5248149fec900b613e165f7dd050da0011743e /ext/intl | |
| parent | 3599a2d82beff1ff3387a04c73fcdac9dd5336d4 (diff) | |
| download | php-git-b746e6988743b46ccb0542d5d568eef0608ee296.tar.gz | |
Sync leading and final newlines in *.phpt sections
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.
According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.
C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."
Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.
[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
Diffstat (limited to 'ext/intl')
163 files changed, 15 insertions, 253 deletions
diff --git a/ext/intl/tests/breakiter___construct.phpt b/ext/intl/tests/breakiter___construct.phpt index 10089e28a6..d957b1182d 100644 --- a/ext/intl/tests/breakiter___construct.phpt +++ b/ext/intl/tests/breakiter___construct.phpt @@ -10,7 +10,6 @@ ini_set("intl.error_level", E_WARNING); new IntlBreakIterator(); --EXPECTF-- - Fatal error: Uncaught Error: Call to private IntlBreakIterator::__construct() from invalid context in %s:%d Stack trace: #0 {main} diff --git a/ext/intl/tests/breakiter___construct_error.phpt b/ext/intl/tests/breakiter___construct_error.phpt index 164c757ce6..e05aa6196b 100644 --- a/ext/intl/tests/breakiter___construct_error.phpt +++ b/ext/intl/tests/breakiter___construct_error.phpt @@ -38,7 +38,6 @@ try { print_exception($e); } --EXPECTF-- - Exception: IntlRuleBasedBreakIterator::__construct(): rbbi_create_instance: unable to create RuleBasedBreakIterator from rules (parse error on line 1, offset 31) in %s on line %d Exception: IntlRuleBasedBreakIterator::__construct() expects at least 1 parameter, 0 given in %s on line %d diff --git a/ext/intl/tests/breakiter_clone_basic.phpt b/ext/intl/tests/breakiter_clone_basic.phpt index d838f81217..e8b7d34127 100644 --- a/ext/intl/tests/breakiter_clone_basic.phpt +++ b/ext/intl/tests/breakiter_clone_basic.phpt @@ -17,7 +17,6 @@ $bi->setText('foobar'); $bi_clone = clone $bi; var_dump(get_class($bi), get_class($bi_clone)); var_dump($bi == $bi_clone); - --EXPECT-- string(26) "IntlRuleBasedBreakIterator" string(26) "IntlRuleBasedBreakIterator" diff --git a/ext/intl/tests/breakiter_createCodePointInstance_error.phpt b/ext/intl/tests/breakiter_createCodePointInstance_error.phpt index 90228e128f..13adc53b03 100644 --- a/ext/intl/tests/breakiter_createCodePointInstance_error.phpt +++ b/ext/intl/tests/breakiter_createCodePointInstance_error.phpt @@ -10,9 +10,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(IntlBreakIterator::createCodePointInstance(array())); --EXPECTF-- - Warning: IntlBreakIterator::createCodePointInstance() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlBreakIterator::createCodePointInstance(): breakiter_create_code_point_instance: bad arguments in %s on line %d NULL - diff --git a/ext/intl/tests/breakiter_current_basic.phpt b/ext/intl/tests/breakiter_current_basic.phpt index 2ce6da7697..1f3e679f47 100644 --- a/ext/intl/tests/breakiter_current_basic.phpt +++ b/ext/intl/tests/breakiter_current_basic.phpt @@ -25,4 +25,4 @@ int(0) int(0) int(3) int(3) -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/intl/tests/breakiter_factories_basic.phpt b/ext/intl/tests/breakiter_factories_basic.phpt index 5c902638a3..4d05792c0e 100644 --- a/ext/intl/tests/breakiter_factories_basic.phpt +++ b/ext/intl/tests/breakiter_factories_basic.phpt @@ -37,4 +37,3 @@ bool(true) ===== createTitleInstance ===== bool(true) - diff --git a/ext/intl/tests/breakiter_factories_error.phpt b/ext/intl/tests/breakiter_factories_error.phpt index 2fd48f6650..4f3a912a15 100644 --- a/ext/intl/tests/breakiter_factories_error.phpt +++ b/ext/intl/tests/breakiter_factories_error.phpt @@ -13,10 +13,7 @@ var_dump(IntlBreakIterator::createSentenceInstance(NULL, 2)); var_dump(IntlBreakIterator::createCharacterInstance(NULL, 2)); var_dump(IntlBreakIterator::createTitleInstance(NULL, 2)); var_dump(IntlBreakIterator::createLineInstance(NULL, 2)); - - --EXPECTF-- - Warning: IntlBreakIterator::createWordInstance() expects parameter 1 to be string, array given in %s on line %d Warning: IntlBreakIterator::createWordInstance(): breakiter_create_word_instance: bad arguments in %s on line %d diff --git a/ext/intl/tests/breakiter_first_last_previous_current_error.phpt b/ext/intl/tests/breakiter_first_last_previous_current_error.phpt index 2ab681228e..da37ffea78 100644 --- a/ext/intl/tests/breakiter_first_last_previous_current_error.phpt +++ b/ext/intl/tests/breakiter_first_last_previous_current_error.phpt @@ -15,9 +15,7 @@ var_dump($bi->first(1)); var_dump($bi->last(1)); var_dump($bi->previous(1)); var_dump($bi->current(1)); - --EXPECTF-- - Warning: IntlBreakIterator::first() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlBreakIterator::first(): breakiter_first: bad arguments in %s on line %d diff --git a/ext/intl/tests/breakiter_following_basic.phpt b/ext/intl/tests/breakiter_following_basic.phpt index 30798d99a3..c139a2c3b4 100644 --- a/ext/intl/tests/breakiter_following_basic.phpt +++ b/ext/intl/tests/breakiter_following_basic.phpt @@ -21,4 +21,4 @@ var_dump($bi->following(-1)); int(7) int(-1) int(0) -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt b/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt index ee53c068e9..56ed60ffcf 100644 --- a/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt +++ b/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt @@ -17,9 +17,7 @@ var_dump($bi->preceding(1, 2)); var_dump($bi->preceding(array())); var_dump($bi->isBoundary(1, 2)); var_dump($bi->isBoundary(array())); - --EXPECTF-- - Warning: IntlBreakIterator::following() expects exactly 1 parameter, 2 given in %s on line %d Warning: IntlBreakIterator::following(): breakiter_following: bad arguments in %s on line %d diff --git a/ext/intl/tests/breakiter_getLocale_error.phpt b/ext/intl/tests/breakiter_getLocale_error.phpt index 9e37a31e61..f318743948 100644 --- a/ext/intl/tests/breakiter_getLocale_error.phpt +++ b/ext/intl/tests/breakiter_getLocale_error.phpt @@ -14,9 +14,7 @@ $bi->setText("\x80sdfΓ©\x90d888 dfsa9"); var_dump($bi->getLocale(1, 2)); var_dump($bi->getLocale(array())); var_dump($bi->getLocale()); - --EXPECTF-- - Warning: IntlBreakIterator::getLocale() expects exactly 1 parameter, 2 given in %s on line %d Warning: IntlBreakIterator::getLocale(): breakiter_get_locale: bad arguments in %s on line %d diff --git a/ext/intl/tests/breakiter_getPartsIterator_error.phpt b/ext/intl/tests/breakiter_getPartsIterator_error.phpt index 12a55e7e0f..b756540578 100644 --- a/ext/intl/tests/breakiter_getPartsIterator_error.phpt +++ b/ext/intl/tests/breakiter_getPartsIterator_error.phpt @@ -17,7 +17,6 @@ var_dump($it->getPartsIterator(-1)); ?> ==DONE== --EXPECTF-- - Warning: IntlBreakIterator::getPartsIterator() expects parameter 1 to be int, array given in %s on line %d Warning: IntlBreakIterator::getPartsIterator(): breakiter_get_parts_iterator: bad arguments in %s on line %d diff --git a/ext/intl/tests/breakiter_getText_error.phpt b/ext/intl/tests/breakiter_getText_error.phpt index 91e9919c15..d66b4bb69f 100644 --- a/ext/intl/tests/breakiter_getText_error.phpt +++ b/ext/intl/tests/breakiter_getText_error.phpt @@ -10,9 +10,7 @@ ini_set("intl.error_level", E_WARNING); $bi = new IntlRuleBasedBreakIterator('[\p{Letter}]+;'); var_dump($bi->getText(array())); - --EXPECTF-- - Warning: IntlBreakIterator::getText() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlBreakIterator::getText(): breakiter_get_text: bad arguments in %s on line %d diff --git a/ext/intl/tests/breakiter_isBoundary_basic.phpt b/ext/intl/tests/breakiter_isBoundary_basic.phpt index 1f416630a0..f0920dca8c 100644 --- a/ext/intl/tests/breakiter_isBoundary_basic.phpt +++ b/ext/intl/tests/breakiter_isBoundary_basic.phpt @@ -25,4 +25,4 @@ bool(true) bool(false) bool(false) bool(false) -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/intl/tests/breakiter_next_error.phpt b/ext/intl/tests/breakiter_next_error.phpt index 0472ed4a44..eb4664308c 100644 --- a/ext/intl/tests/breakiter_next_error.phpt +++ b/ext/intl/tests/breakiter_next_error.phpt @@ -13,9 +13,7 @@ $bi->setText("\x80sdfΓ©\x90d888 dfsa9"); var_dump($bi->next(1, 2)); var_dump($bi->next(array())); - --EXPECTF-- - Warning: IntlBreakIterator::next() expects exactly 1 parameter, 2 given in %s on line %d Warning: IntlBreakIterator::next(): breakiter_next: bad arguments in %s on line %d diff --git a/ext/intl/tests/breakiter_previous_basic.phpt b/ext/intl/tests/breakiter_previous_basic.phpt index c3343af57c..c844ffcb6c 100644 --- a/ext/intl/tests/breakiter_previous_basic.phpt +++ b/ext/intl/tests/breakiter_previous_basic.phpt @@ -19,4 +19,4 @@ var_dump($bi->previous()); --EXPECT-- int(13) int(8) -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/intl/tests/breakiter_setText_error.phpt b/ext/intl/tests/breakiter_setText_error.phpt index a7a73a08d8..c94a8433f1 100644 --- a/ext/intl/tests/breakiter_setText_error.phpt +++ b/ext/intl/tests/breakiter_setText_error.phpt @@ -23,9 +23,7 @@ var_dump($bi->setText(new A)); } catch (Exception $e) { var_dump($e->getMessage()); } - --EXPECTF-- - Warning: IntlBreakIterator::setText() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlBreakIterator::setText(): breakiter_set_text: bad arguments in %s on line %d diff --git a/ext/intl/tests/bug59597_32.phpt b/ext/intl/tests/bug59597_32.phpt index 928a235a83..cd8b679171 100644 --- a/ext/intl/tests/bug59597_32.phpt +++ b/ext/intl/tests/bug59597_32.phpt @@ -18,4 +18,3 @@ var_dump($value); --EXPECT-- int(2147483647) float(2147483650) - diff --git a/ext/intl/tests/bug60192-compare.phpt b/ext/intl/tests/bug60192-compare.phpt index ce9728023a..096b57558f 100644 --- a/ext/intl/tests/bug60192-compare.phpt +++ b/ext/intl/tests/bug60192-compare.phpt @@ -15,7 +15,6 @@ class Collator2 extends Collator{ $c = new Collator2(); $a = $c->compare('h', 'H'); --EXPECTF-- - Fatal error: Uncaught Error: Object not initialized in %s:%d Stack trace: #0 %s(%d): Collator->compare('h', 'H') diff --git a/ext/intl/tests/bug60192-getlocale.phpt b/ext/intl/tests/bug60192-getlocale.phpt index c4155e9ab5..ef5ce3fc04 100644 --- a/ext/intl/tests/bug60192-getlocale.phpt +++ b/ext/intl/tests/bug60192-getlocale.phpt @@ -16,7 +16,6 @@ class Collator2 extends Collator{ $c = new Collator2(); $c->getLocale(Locale::ACTUAL_LOCALE); --EXPECTF-- - Fatal error: Uncaught Error: Object not initialized in %s:%d Stack trace: #0 %s(%d): Collator->getLocale(0) diff --git a/ext/intl/tests/bug60192-getsortkey.phpt b/ext/intl/tests/bug60192-getsortkey.phpt index 0d0f07e768..21cc279eee 100644 --- a/ext/intl/tests/bug60192-getsortkey.phpt +++ b/ext/intl/tests/bug60192-getsortkey.phpt @@ -16,7 +16,6 @@ class Collator2 extends Collator{ $c = new Collator2(); $c->getSortKey('h'); --EXPECTF-- - Fatal error: Uncaught Error: Object not initialized in %s:%d Stack trace: #0 %s(%d): Collator->getSortKey('h') diff --git a/ext/intl/tests/bug60192-sort.phpt b/ext/intl/tests/bug60192-sort.phpt index c452d0de6d..530d5eecba 100644 --- a/ext/intl/tests/bug60192-sort.phpt +++ b/ext/intl/tests/bug60192-sort.phpt @@ -17,10 +17,8 @@ $c = new Collator2(); $a = array('a', 'b'); $c->sort($a); --EXPECTF-- - Fatal error: Uncaught Error: Object not initialized in %s:%d Stack trace: #0 %s(%d): Collator->sort(Array) #1 {main} thrown in %s on line %d - diff --git a/ext/intl/tests/bug60192-sortwithsortkeys.phpt b/ext/intl/tests/bug60192-sortwithsortkeys.phpt index e7d7c1dc1d..9ee58123c8 100644 --- a/ext/intl/tests/bug60192-sortwithsortkeys.phpt +++ b/ext/intl/tests/bug60192-sortwithsortkeys.phpt @@ -17,10 +17,8 @@ $c = new Collator2(); $a = array('a', 'b'); $c->sortWithSortKeys($a); --EXPECTF-- - Fatal error: Uncaught Error: Object not initialized in %s:%d Stack trace: #0 %s(%d): Collator->sortWithSortKeys(Array) #1 {main} thrown in %s on line %d - diff --git a/ext/intl/tests/bug62082.phpt b/ext/intl/tests/bug62082.phpt index dab1252afd..279462e789 100644 --- a/ext/intl/tests/bug62082.phpt +++ b/ext/intl/tests/bug62082.phpt @@ -13,4 +13,3 @@ var_dump(locale_get_display_name(str_repeat("a", 600), null)); bool(false) bool(false) bool(false) - diff --git a/ext/intl/tests/bug67052-win32.phpt b/ext/intl/tests/bug67052-win32.phpt index 5bc6497bea..2c27624562 100644 --- a/ext/intl/tests/bug67052-win32.phpt +++ b/ext/intl/tests/bug67052-win32.phpt @@ -27,4 +27,3 @@ ut_run(); --EXPECT-- 1234567,891 de-de - diff --git a/ext/intl/tests/bug67052.phpt b/ext/intl/tests/bug67052.phpt index 7f0c4cba51..6cdfd9f5a9 100644 --- a/ext/intl/tests/bug67052.phpt +++ b/ext/intl/tests/bug67052.phpt @@ -32,4 +32,3 @@ ut_run(); --EXPECT-- 1234567,891 de_DE.UTF-8 - diff --git a/ext/intl/tests/bug69374.phpt b/ext/intl/tests/bug69374.phpt index 6788255289..ee7c49547e 100644 --- a/ext/intl/tests/bug69374.phpt +++ b/ext/intl/tests/bug69374.phpt @@ -15,10 +15,7 @@ echo IntlDateFormatter::formatObject($date, $pattern1, 'vi_VN'), "\n"; echo IntlDateFormatter::formatObject ($date, $pattern2, 'ko_KR'), "\n"; ?> ==DONE== - --EXPECT-- thΓ΅ng 04, 2015 2015λ…„ 4μ›” ==DONE== - - diff --git a/ext/intl/tests/bug69398.phpt b/ext/intl/tests/bug69398.phpt index 152feedc39..3c95eeeaac 100644 --- a/ext/intl/tests/bug69398.phpt +++ b/ext/intl/tests/bug69398.phpt @@ -13,10 +13,7 @@ echo IntlDateFormatter::formatObject($date, array(IntlDateFormatter::SHORT, Intl echo IntlDateFormatter::formatObject ($date, array(IntlDateFormatter::SHORT, IntlDateFormatter::NONE), 'ko_KR'), "\n"; ?> ==DONE== - --EXPECT-- 04/04/2015 15. 4. 4. ==DONE== - - diff --git a/ext/intl/tests/bug72061.phpt b/ext/intl/tests/bug72061.phpt index 782c32c11c..6c3d6d5b90 100644 --- a/ext/intl/tests/bug72061.phpt +++ b/ext/intl/tests/bug72061.phpt @@ -12,4 +12,4 @@ DONE --EXPECT-- int(65336) int(65336) -DONE
\ No newline at end of file +DONE diff --git a/ext/intl/tests/bug72533.phpt b/ext/intl/tests/bug72533.phpt index 1a182afdd9..1faf08c287 100644 --- a/ext/intl/tests/bug72533.phpt +++ b/ext/intl/tests/bug72533.phpt @@ -27,4 +27,4 @@ ut_run(); --EXPECT-- false 'locale_accept_from_http: locale string too long: U_ILLEGAL_ARGUMENT_ERROR' -'en'
\ No newline at end of file +'en' diff --git a/ext/intl/tests/bug74230.phpt b/ext/intl/tests/bug74230.phpt index 70ef6ae39a..685b0582bc 100644 --- a/ext/intl/tests/bug74230.phpt +++ b/ext/intl/tests/bug74230.phpt @@ -19,4 +19,3 @@ var_dump( bool(true) bool(true) bool(true) - diff --git a/ext/intl/tests/bug75317.phpt b/ext/intl/tests/bug75317.phpt index cbd9605264..62a7c02f0b 100644 --- a/ext/intl/tests/bug75317.phpt +++ b/ext/intl/tests/bug75317.phpt @@ -50,4 +50,4 @@ bool(true) bool(true) bool(true) bool(true) -bool(true)
\ No newline at end of file +bool(true) diff --git a/ext/intl/tests/calendar_add_error.phpt b/ext/intl/tests/calendar_add_error.phpt index ad2cbc356e..017551821d 100644 --- a/ext/intl/tests/calendar_add_error.phpt +++ b/ext/intl/tests/calendar_add_error.phpt @@ -19,7 +19,6 @@ var_dump($c->add(1)); var_dump(intlcal_add($c, 1, 2, 3)); var_dump(intlcal_add(1, 2, 3)); --EXPECTF-- - Warning: IntlCalendar::add() expects exactly 2 parameters, 3 given in %s on line %d Warning: IntlCalendar::add(): intlcal_add: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_createInstance_basic.phpt b/ext/intl/tests/calendar_createInstance_basic.phpt index 426cc8b60f..a94a9ff261 100644 --- a/ext/intl/tests/calendar_createInstance_basic.phpt +++ b/ext/intl/tests/calendar_createInstance_basic.phpt @@ -27,7 +27,6 @@ var_dump(abs($timeMillis - $time * 1000) < 2000); ?> ==DONE== - --EXPECTF-- IntlTimeZone Object ( diff --git a/ext/intl/tests/calendar_createInstance_error.phpt b/ext/intl/tests/calendar_createInstance_error.phpt index bf655bee79..5cb9fa1c63 100644 --- a/ext/intl/tests/calendar_createInstance_error.phpt +++ b/ext/intl/tests/calendar_createInstance_error.phpt @@ -16,9 +16,7 @@ var_dump(IntlCalendar::createInstance(1, 2, 3)); var_dump(intlcal_create_instance(1, 2, 3)); var_dump(intlcal_create_instance(new X, NULL)); var_dump(intlcal_create_instance(NULL, array())); - --EXPECTF-- - Warning: IntlCalendar::createInstance() expects at most 2 parameters, 3 given in %s on line %d Warning: IntlCalendar::createInstance(): intlcal_create_calendar: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_equals_error.phpt b/ext/intl/tests/calendar_equals_error.phpt index bdfe8c27cb..4c585a6018 100644 --- a/ext/intl/tests/calendar_equals_error.phpt +++ b/ext/intl/tests/calendar_equals_error.phpt @@ -44,7 +44,6 @@ try { } catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } - --EXPECT-- error: 2, IntlCalendar::equals() expects exactly 1 parameter, 0 given error: 2, IntlCalendar::equals(): intlcal_equals: bad arguments diff --git a/ext/intl/tests/calendar_fieldDifference_error.phpt b/ext/intl/tests/calendar_fieldDifference_error.phpt index d09df44452..4f3fc351cb 100644 --- a/ext/intl/tests/calendar_fieldDifference_error.phpt +++ b/ext/intl/tests/calendar_fieldDifference_error.phpt @@ -18,9 +18,7 @@ var_dump($c->fieldDifference(1)); var_dump(intlcal_field_difference($c, 0, 1, 2)); var_dump(intlcal_field_difference(1, 0, 1)); - --EXPECTF-- - Warning: IntlCalendar::fieldDifference() expects exactly 2 parameters, 3 given in %s on line %d Warning: IntlCalendar::fieldDifference(): intlcal_field_difference: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_fromDateTime_basic.phpt b/ext/intl/tests/calendar_fromDateTime_basic.phpt index 1863b7815c..0c7e471454 100644 --- a/ext/intl/tests/calendar_fromDateTime_basic.phpt +++ b/ext/intl/tests/calendar_fromDateTime_basic.phpt @@ -35,7 +35,6 @@ var_dump( strtotime('2012-01-01 00:00:00 +03:40') * 1000., $cal->getTimeZone()->getID() ); - --EXPECTF-- float(1325372400000) float(1325372400000) diff --git a/ext/intl/tests/calendar_fromDateTime_error.phpt b/ext/intl/tests/calendar_fromDateTime_error.phpt index 2fbf7196f9..1074159687 100644 --- a/ext/intl/tests/calendar_fromDateTime_error.phpt +++ b/ext/intl/tests/calendar_fromDateTime_error.phpt @@ -31,9 +31,7 @@ $date = new DateTime('2012-01-01 00:00:00 WEST'); var_dump(IntlCalendar::fromDateTime($date)); var_dump(intlcal_from_date_time()); - --EXPECTF-- - Warning: IntlCalendar::fromDateTime() expects at least 1 parameter, 0 given in %s on line %d Warning: IntlCalendar::fromDateTime(): intlcal_from_date_time: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_getAvailableLocales_error.phpt b/ext/intl/tests/calendar_getAvailableLocales_error.phpt index e9edc468e5..3aee500fea 100644 --- a/ext/intl/tests/calendar_getAvailableLocales_error.phpt +++ b/ext/intl/tests/calendar_getAvailableLocales_error.phpt @@ -10,9 +10,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_get_available_locales(1)); var_dump(IntlCalendar::getAvailableLocales(2)); - --EXPECTF-- - Warning: intlcal_get_available_locales() expects exactly 0 parameters, 1 given in %s on line %d Warning: intlcal_get_available_locales(): intlcal_get_available_locales: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt index bb10a2642d..c86f54f246 100644 --- a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt +++ b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt @@ -20,9 +20,7 @@ var_dump($c->getDayOfWeekType()); var_dump(intlcal_get_day_of_week_type($c, "foo")); var_dump(intlcal_get_day_of_week_type(1, 1)); - --EXPECTF-- - Warning: IntlCalendar::getDayOfWeekType() expects exactly 1 parameter, 2 given in %s on line %d Warning: IntlCalendar::getDayOfWeekType(): intlcal_get_day_of_week_type: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_getErrorCode_error.phpt b/ext/intl/tests/calendar_getErrorCode_error.phpt index 97b7d9c0c1..fd999fbbbf 100644 --- a/ext/intl/tests/calendar_getErrorCode_error.phpt +++ b/ext/intl/tests/calendar_getErrorCode_error.phpt @@ -15,9 +15,7 @@ $c = new IntlGregorianCalendar(NULL, 'pt_PT'); var_dump($c->getErrorCode(array())); var_dump(intlcal_get_error_code(null)); - --EXPECTF-- - Warning: IntlCalendar::getErrorCode() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlCalendar::getErrorCode(): intlcal_get_error_code: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_getErrorMessage_error.phpt b/ext/intl/tests/calendar_getErrorMessage_error.phpt index 5250bc064e..cc52449d94 100644 --- a/ext/intl/tests/calendar_getErrorMessage_error.phpt +++ b/ext/intl/tests/calendar_getErrorMessage_error.phpt @@ -15,9 +15,7 @@ $c = new IntlGregorianCalendar(NULL, 'pt_PT'); var_dump($c->getErrorMessage(array())); var_dump(intlcal_get_error_message(null)); - --EXPECTF-- - Warning: IntlCalendar::getErrorMessage() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlCalendar::getErrorMessage(): intlcal_get_error_message: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt index 4d623f711f..ca2dc4a9f2 100644 --- a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt +++ b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt @@ -16,9 +16,7 @@ var_dump($c->getFirstDayOfWeek(1)); var_dump(intlcal_get_first_day_of_week($c, 1)); var_dump(intlcal_get_first_day_of_week(1)); - --EXPECTF-- - Warning: IntlCalendar::getFirstDayOfWeek() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlCalendar::getFirstDayOfWeek(): intlcal_get_first_day_of_week: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_getKeywordValuesForLocale_error.phpt b/ext/intl/tests/calendar_getKeywordValuesForLocale_error.phpt index 7cc5cbd2e7..39a4265006 100644 --- a/ext/intl/tests/calendar_getKeywordValuesForLocale_error.phpt +++ b/ext/intl/tests/calendar_getKeywordValuesForLocale_error.phpt @@ -12,9 +12,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_get_keyword_values_for_locale(1, 2)); var_dump(IntlCalendar::getKeywordValuesForLocale(1, 2, array())); - --EXPECTF-- - Warning: intlcal_get_keyword_values_for_locale() expects exactly 3 parameters, 2 given in %s on line %d Warning: intlcal_get_keyword_values_for_locale(): intlcal_get_keyword_values_for_locale: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_getLocale_error.phpt b/ext/intl/tests/calendar_getLocale_error.phpt index 01ba795bdc..008e1b756e 100644 --- a/ext/intl/tests/calendar_getLocale_error.phpt +++ b/ext/intl/tests/calendar_getLocale_error.phpt @@ -18,9 +18,7 @@ var_dump($c->getLocale(2, 3)); var_dump(intlcal_get_locale($c)); var_dump(intlcal_get_locale(1)); - --EXPECTF-- - Warning: IntlCalendar::getLocale() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlCalendar::getLocale(): intlcal_get_locale: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt index b2c7e5b46c..a1190e5ce0 100644 --- a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt +++ b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt @@ -16,9 +16,7 @@ var_dump($c->getMinimalDaysInFirstWeek(1)); var_dump(intlcal_get_minimal_days_in_first_week($c, 1)); var_dump(intlcal_get_minimal_days_in_first_week(1)); - --EXPECTF-- - Warning: IntlCalendar::getMinimalDaysInFirstWeek() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlCalendar::getMinimalDaysInFirstWeek(): intlcal_get_minimal_days_in_first_week: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_getNow_error.phpt b/ext/intl/tests/calendar_getNow_error.phpt index 31991bb591..712e210851 100644 --- a/ext/intl/tests/calendar_getNow_error.phpt +++ b/ext/intl/tests/calendar_getNow_error.phpt @@ -10,9 +10,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(intlcal_get_now(1)); var_dump(IntlCalendar::getNow(2)); - --EXPECTF-- - Warning: intlcal_get_now() expects exactly 0 parameters, 1 given in %s on line %d Warning: intlcal_get_now(): intlcal_get_now: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt index 270f484a36..baaa27668f 100644 --- a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt +++ b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt @@ -21,9 +21,7 @@ var_dump(intlcal_get_skipped_wall_time_option($c, 1)); var_dump(intlcal_get_repeated_wall_time_option($c, 1)); var_dump(intlcal_get_skipped_wall_time_option(1)); - --EXPECTF-- - Warning: IntlCalendar::getSkippedWallTimeOption() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlCalendar::getSkippedWallTimeOption(): intlcal_get_skipped_wall_time_option: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_getTimeZone_error.phpt b/ext/intl/tests/calendar_getTimeZone_error.phpt index 5941b9ada0..ea7e85db4c 100644 --- a/ext/intl/tests/calendar_getTimeZone_error.phpt +++ b/ext/intl/tests/calendar_getTimeZone_error.phpt @@ -16,9 +16,7 @@ var_dump($c->getTimeZone(1)); var_dump(intlcal_get_time_zone($c, 1)); var_dump(intlcal_get_time_zone(1)); - --EXPECTF-- - Warning: IntlCalendar::getTimeZone() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlCalendar::getTimeZone(): intlcal_get_time_zone: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_getTime_error.phpt b/ext/intl/tests/calendar_getTime_error.phpt index 359b816997..61eaea97dc 100644 --- a/ext/intl/tests/calendar_getTime_error.phpt +++ b/ext/intl/tests/calendar_getTime_error.phpt @@ -17,7 +17,6 @@ var_dump($c->getTime(1)); var_dump(intlcal_get_time($c, 1)); var_dump(intlcal_get_time(1)); --EXPECTF-- - Warning: IntlCalendar::getTime() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlCalendar::getTime(): intlcal_get_time: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_getType_error.phpt b/ext/intl/tests/calendar_getType_error.phpt index b5f32d5768..c124151893 100644 --- a/ext/intl/tests/calendar_getType_error.phpt +++ b/ext/intl/tests/calendar_getType_error.phpt @@ -16,9 +16,7 @@ var_dump($c->getType(1)); var_dump(intlcal_get_type($c, 1)); var_dump(intlcal_get_type(1)); - --EXPECTF-- - Warning: IntlCalendar::getType() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlCalendar::getType(): intlcal_get_type: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_getWeekendTransition_error.phpt b/ext/intl/tests/calendar_getWeekendTransition_error.phpt index 10a31a339a..4d0518d733 100644 --- a/ext/intl/tests/calendar_getWeekendTransition_error.phpt +++ b/ext/intl/tests/calendar_getWeekendTransition_error.phpt @@ -20,9 +20,7 @@ var_dump($c->getWeekendTransition(0)); var_dump(intlcal_get_weekend_transition($c)); var_dump(intlcal_get_weekend_transition(1, 1)); - --EXPECTF-- - Warning: IntlCalendar::getWeekendTransition() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlCalendar::getWeekendTransition(): intlcal_get_weekend_transition: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt index 999c050b9f..6c6f67f953 100644 --- a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt +++ b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt @@ -52,9 +52,7 @@ try { } catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } - --EXPECTF-- - Warning: IntlCalendar::getLeastMaximum() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlCalendar::getLeastMaximum(): intlcal_get_least_maximum: bad arguments in %s on line %d @@ -105,4 +103,3 @@ error: 0, Argument 1 passed to intlcal_get_maximum() must be an instance of Intl error: 0, Argument 1 passed to intlcal_get_greatest_minimum() must be an instance of IntlCalendar, int given error: 0, Argument 1 passed to intlcal_get_minimum() must be an instance of IntlCalendar, int given - diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt index 989fb8b7cd..d7d20ed6cd 100644 --- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt +++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt @@ -28,7 +28,6 @@ var_dump($c->get(1, 2)); var_dump($c->getActualMaximum(1, 2)); var_dump($c->getActualMinimum(1, 2)); --EXPECTF-- - Warning: IntlCalendar::get() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlCalendar::get(): intlcal_get: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt index f7026e0719..37e3816fef 100644 --- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt +++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt @@ -110,4 +110,3 @@ error: 0, Argument 1 passed to intlcal_get() must be an instance of IntlCalendar error: 0, Argument 1 passed to intlcal_get_actual_maximum() must be an instance of IntlCalendar, int given error: 0, Argument 1 passed to intlcal_get_actual_minimum() must be an instance of IntlCalendar, int given - diff --git a/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt b/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt index 52765433fe..af172ce092 100644 --- a/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt +++ b/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt @@ -7,7 +7,6 @@ if (!extension_loaded('intl')) if (version_compare(INTL_ICU_VERSION, '49') < 0) die('skip for ICU 49+'); --FILE-- - <?php ini_set("intl.error_level", E_WARNING); ini_set("intl.default_locale", "nl"); @@ -37,7 +36,6 @@ var_dump( ?> ==DONE== --EXPECT-- - bool(true) int(0) int(1351387800) @@ -46,4 +44,4 @@ bool(true) int(1) int(1351384200) int(1351384200) -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt b/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt index bbbf031c88..f421005c34 100644 --- a/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt +++ b/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt @@ -7,7 +7,6 @@ if (!extension_loaded('intl')) if (version_compare(INTL_ICU_VERSION, '49') < 0) die('skip for ICU 49+'); --FILE-- - <?php ini_set("intl.error_level", E_WARNING); ini_set("intl.default_locale", "nl"); @@ -49,7 +48,6 @@ var_dump( ?> ==DONE== --EXPECT-- - int(0) Should be 3h30 int(3) @@ -64,4 +62,4 @@ int(2) Should be 3h00 int(3) int(0) -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/intl/tests/calendar_inDaylightTime_error.phpt b/ext/intl/tests/calendar_inDaylightTime_error.phpt index 6ed1f48c3c..6644f477ea 100644 --- a/ext/intl/tests/calendar_inDaylightTime_error.phpt +++ b/ext/intl/tests/calendar_inDaylightTime_error.phpt @@ -16,9 +16,7 @@ var_dump($c->inDaylightTime(1)); var_dump(intlcal_in_daylight_time($c, 1)); var_dump(intlcal_in_daylight_time(1)); - --EXPECTF-- - Warning: IntlCalendar::inDaylightTime() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlCalendar::inDaylightTime(): intlcal_in_daylight_time: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_isEquivalentTo_error.phpt b/ext/intl/tests/calendar_isEquivalentTo_error.phpt index e7f8765fef..c7e30fd645 100644 --- a/ext/intl/tests/calendar_isEquivalentTo_error.phpt +++ b/ext/intl/tests/calendar_isEquivalentTo_error.phpt @@ -48,7 +48,6 @@ try { } catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } - --EXPECT-- error: 0, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, int given diff --git a/ext/intl/tests/calendar_isLenient_error.phpt b/ext/intl/tests/calendar_isLenient_error.phpt index 26fb95c173..263d82bb37 100644 --- a/ext/intl/tests/calendar_isLenient_error.phpt +++ b/ext/intl/tests/calendar_isLenient_error.phpt @@ -16,9 +16,7 @@ var_dump($c->isLenient(1)); var_dump(intlcal_is_lenient($c, 1)); var_dump(intlcal_is_lenient(1)); - --EXPECTF-- - Warning: IntlCalendar::isLenient() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlCalendar::isLenient(): intlcal_is_lenient: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_isSet_error.phpt b/ext/intl/tests/calendar_isSet_error.phpt index 53b244879f..7e5b2beaa6 100644 --- a/ext/intl/tests/calendar_isSet_error.phpt +++ b/ext/intl/tests/calendar_isSet_error.phpt @@ -18,9 +18,7 @@ var_dump($c->isSet(-1)); var_dump(intlcal_is_set($c)); var_dump(intlcal_is_set(1, 2)); - --EXPECTF-- - Warning: IntlCalendar::isSet() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlCalendar::isSet(): intlcal_is_set: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_isWeekend_error.phpt b/ext/intl/tests/calendar_isWeekend_error.phpt index a4a7ff2060..104fba4447 100644 --- a/ext/intl/tests/calendar_isWeekend_error.phpt +++ b/ext/intl/tests/calendar_isWeekend_error.phpt @@ -19,7 +19,6 @@ var_dump($c->isWeekend("jhhk")); var_dump(intlcal_is_weekend($c, "jj")); var_dump(intlcal_is_weekend(1)); - --EXPECTF-- Warning: IntlCalendar::isWeekend() expects at most 1 parameter, 2 given in %s on line %d diff --git a/ext/intl/tests/calendar_roll_error.phpt b/ext/intl/tests/calendar_roll_error.phpt index c476bfb62a..27160ee8ca 100644 --- a/ext/intl/tests/calendar_roll_error.phpt +++ b/ext/intl/tests/calendar_roll_error.phpt @@ -19,7 +19,6 @@ var_dump($c->roll(1)); var_dump(intlcal_roll($c, 1, 2, 3)); var_dump(intlcal_roll(1, 2, 3)); --EXPECTF-- - Warning: IntlCalendar::roll(): intlcal_set: too many arguments in %s on line %d bool(false) diff --git a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt index 82cc3f245d..a22c3b2842 100644 --- a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt +++ b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt @@ -18,9 +18,7 @@ var_dump($c->setFirstDayOfWeek(0)); var_dump(intlcal_set_first_day_of_week($c, 0)); var_dump(intlcal_set_first_day_of_week(1, 2)); - --EXPECTF-- - Warning: IntlCalendar::setFirstDayOfWeek() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlCalendar::setFirstDayOfWeek(): intlcal_set_first_day_of_week: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_setLenient_error.phpt b/ext/intl/tests/calendar_setLenient_error.phpt index 3091d9a330..b2a6f25d5d 100644 --- a/ext/intl/tests/calendar_setLenient_error.phpt +++ b/ext/intl/tests/calendar_setLenient_error.phpt @@ -18,9 +18,7 @@ var_dump($c->setLenient(1, 2)); var_dump(intlcal_set_lenient($c, array())); var_dump(intlcal_set_lenient(1, false)); - --EXPECTF-- - Warning: IntlCalendar::setLenient() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlCalendar::setLenient(): intlcal_set_lenient: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt index bf7584ade1..48d18bf28d 100644 --- a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt +++ b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt @@ -18,7 +18,6 @@ var_dump($c->setMinimalDaysInFirstWeek(0)); var_dump(intlcal_set_minimal_days_in_first_week($c, 0)); var_dump(intlcal_set_minimal_days_in_first_week(1, 2)); - --EXPECTF-- Warning: IntlCalendar::setMinimalDaysInFirstWeek() expects exactly 1 parameter, 0 given in %s on line %d @@ -41,4 +40,3 @@ Stack trace: #0 %s(%d): intlcal_set_minimal_days_in_first_week(1, 2) #1 {main} thrown in %s on line %d - diff --git a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt index 24362174f2..69651da4e0 100644 --- a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt +++ b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt @@ -30,9 +30,7 @@ var_dump(intlcal_set_skipped_wall_time_option($c)); var_dump(intlcal_set_repeated_wall_time_option($c)); var_dump(intlcal_set_repeated_wall_time_option(1, 1)); - --EXPECTF-- - Warning: IntlCalendar::setSkippedWallTimeOption() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlCalendar::setSkippedWallTimeOption(): intlcal_set_skipped_wall_time_option: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_setTimeZone_error.phpt b/ext/intl/tests/calendar_setTimeZone_error.phpt index 9ed6238d34..dee773d377 100644 --- a/ext/intl/tests/calendar_setTimeZone_error.phpt +++ b/ext/intl/tests/calendar_setTimeZone_error.phpt @@ -40,7 +40,6 @@ try{ } catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } - --EXPECT-- error: 2, IntlCalendar::setTimeZone() expects exactly 1 parameter, 2 given error: 2, IntlCalendar::setTimeZone(): intlcal_set_time_zone: bad arguments diff --git a/ext/intl/tests/calendar_setTimeZone_error2.phpt b/ext/intl/tests/calendar_setTimeZone_error2.phpt index aa1eaba209..767aafa95a 100644 --- a/ext/intl/tests/calendar_setTimeZone_error2.phpt +++ b/ext/intl/tests/calendar_setTimeZone_error2.phpt @@ -19,9 +19,7 @@ var_dump($intlcal->getTimeZone()->getID()); $pstdate = new DateTime('2012-01-01 00:00:00 +24:00'); $intlcal->setTimeZone($pstdate->getTimeZone()); var_dump($intlcal->getTimeZone()->getID()); - --EXPECTF-- - Warning: IntlCalendar::setTimeZone(): intlcal_set_time_zone: time zone id 'WEST' extracted from ext/date DateTimeZone not recognized in %s on line %d string(16) "Europe/Amsterdam" diff --git a/ext/intl/tests/calendar_setTime_error.phpt b/ext/intl/tests/calendar_setTime_error.phpt index 3d45933ee7..d3fa46c591 100644 --- a/ext/intl/tests/calendar_setTime_error.phpt +++ b/ext/intl/tests/calendar_setTime_error.phpt @@ -18,7 +18,6 @@ var_dump($c->setTime("jjj")); var_dump(intlcal_set_time($c, 1, 2)); var_dump(intlcal_set_time(1)); --EXPECTF-- - Warning: IntlCalendar::setTime() expects exactly 1 parameter, 2 given in %s on line %d Warning: IntlCalendar::setTime(): intlcal_set_time: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_set_error.phpt b/ext/intl/tests/calendar_set_error.phpt index 929f7427aa..5827ad41ec 100644 --- a/ext/intl/tests/calendar_set_error.phpt +++ b/ext/intl/tests/calendar_set_error.phpt @@ -20,7 +20,6 @@ var_dump($c->set(-1, 2)); var_dump(intlcal_set($c, -1, 2)); var_dump(intlcal_set(1, 2, 3)); --EXPECTF-- - Warning: IntlCalendar::set() expects at least 2 parameters, 1 given in %s on line %d Warning: IntlCalendar::set(): intlcal_set: bad arguments in %s on line %d diff --git a/ext/intl/tests/calendar_toDateTime_basic.phpt b/ext/intl/tests/calendar_toDateTime_basic.phpt index d38487dabf..b7ffd31321 100644 --- a/ext/intl/tests/calendar_toDateTime_basic.phpt +++ b/ext/intl/tests/calendar_toDateTime_basic.phpt @@ -20,4 +20,4 @@ var_dump($dt->format("c"), $dt->getTimeZone()->getName()); --EXPECT-- string(25) "2012-05-17T17:35:36+01:00" string(13) "Europe/Lisbon" -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/intl/tests/calendar_toDateTime_error.phpt b/ext/intl/tests/calendar_toDateTime_error.phpt index 27a74674bd..584bd28f65 100644 --- a/ext/intl/tests/calendar_toDateTime_error.phpt +++ b/ext/intl/tests/calendar_toDateTime_error.phpt @@ -22,9 +22,7 @@ var_dump("exception: {$e->getMessage()}"); } var_dump(intlcal_to_date_time(3)); - --EXPECTF-- - Warning: IntlCalendar::toDateTime() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlCalendar::toDateTime(): intlcal_to_date_time: bad arguments in %s on line %d diff --git a/ext/intl/tests/cpbi_getLastCodePoint_error.phpt b/ext/intl/tests/cpbi_getLastCodePoint_error.phpt index 78bd216629..505a076ca3 100644 --- a/ext/intl/tests/cpbi_getLastCodePoint_error.phpt +++ b/ext/intl/tests/cpbi_getLastCodePoint_error.phpt @@ -11,9 +11,7 @@ ini_set("intl.error_level", E_WARNING); $it = IntlBreakIterator::createCodePointInstance(); var_dump($it->getLastCodePoint(array())); --EXPECTF-- - Warning: IntlCodePointBreakIterator::getLastCodePoint() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlCodePointBreakIterator::getLastCodePoint(): cpbi_get_last_code_point: bad arguments in %s on line %d bool(false) - diff --git a/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt b/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt index d10ad42623..255a1f484d 100644 --- a/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt +++ b/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt @@ -32,7 +32,6 @@ try { ?> ==DONE== --EXPECTF-- - Exception: IntlDateFormatter::__construct(): datefmt_create: no such time zone: 'bad timezone' in %s on line %d Exception: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %s on line %d diff --git a/ext/intl/tests/dateformat_clone_bad_obj.phpt b/ext/intl/tests/dateformat_clone_bad_obj.phpt index 5e12b96ae8..f9791004f3 100644 --- a/ext/intl/tests/dateformat_clone_bad_obj.phpt +++ b/ext/intl/tests/dateformat_clone_bad_obj.phpt @@ -15,6 +15,5 @@ try { } catch (Exception $e) { var_dump($e->getMessage()); } - --EXPECTF-- string(%s) "Cannot clone unconstructed IntlDateFormatter" diff --git a/ext/intl/tests/dateformat_formatObject_calendar.phpt b/ext/intl/tests/dateformat_formatObject_calendar.phpt index b2b08f362d..11f0fe0137 100644 --- a/ext/intl/tests/dateformat_formatObject_calendar.phpt +++ b/ext/intl/tests/dateformat_formatObject_calendar.phpt @@ -27,7 +27,6 @@ echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\ ?> ==DONE== - --EXPECTF-- 01/01/2012 00:00:00 Domingo, 1 de Janeiro de 2012 0:00:00 Hora %Sda Europa Ocidental @@ -38,4 +37,3 @@ Domingo, 1 de Janeiro de 2012 5:00:00 GMT+03:00 06/02/1433 00:00:00 Sunday, Safar 6, 1433 12:00:00 AM Western European %STime ==DONE== - diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant2.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant2.phpt index 688ccc31bf..7d308df6b0 100644 --- a/ext/intl/tests/dateformat_formatObject_calendar_variant2.phpt +++ b/ext/intl/tests/dateformat_formatObject_calendar_variant2.phpt @@ -27,7 +27,6 @@ echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\ ?> ==DONE== - --EXPECTF-- 01/01/2012, 00:00:00 Domingo, 1 de Janeiro de 2012 Γ s 00:00:00 Hora %Sda Europa Ocidental diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt index 0312524148..33d2c8bfbf 100644 --- a/ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt +++ b/ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt @@ -28,7 +28,6 @@ echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\ ?> ==DONE== - --EXPECTF-- 01/01/2012, 00:00:00 domingo, 1 de Janeiro de 2012 Γ s 00:00:00 Hora PadrΓ£o %Sda Europa Ocidental diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt index 70a8adc913..141ea9c806 100644 --- a/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt +++ b/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt @@ -28,7 +28,6 @@ echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\ ?> ==DONE== - --EXPECTF-- 01/01/2012, 00:00:00 domingo, 1 de janeiro de 2012 Γ s 00:00:00 Hora PadrΓ£o %Sda Europa Ocidental diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt index d68b1f5fcb..c8fd0535d8 100644 --- a/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt +++ b/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt @@ -27,7 +27,6 @@ echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\ ?> ==DONE== - --EXPECTF-- 01/01/2012, 00:00:00 domingo, 1 de janeiro de 2012 Γ s 00:00:00 Hora padrΓ£o %Sda Europa Ocidental diff --git a/ext/intl/tests/dateformat_formatObject_datetime.phpt b/ext/intl/tests/dateformat_formatObject_datetime.phpt index a2cba4c76b..279a132478 100644 --- a/ext/intl/tests/dateformat_formatObject_datetime.phpt +++ b/ext/intl/tests/dateformat_formatObject_datetime.phpt @@ -22,7 +22,6 @@ echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n"; ?> ==DONE== - --EXPECTF-- 01/01/2012 00:00:00 Domingo, 1 de Janeiro de 2012 0:00:00 Hora %Sda Europa Ocidental @@ -31,4 +30,3 @@ Jan 1, 2012 12:00:00 AM Sun 2012-01-1 00,00,00.000 Portugal Time (Lisbon) Domingo, 1 de Janeiro de 2012 5:00:00 GMT+03:00 ==DONE== - diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant2.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant2.phpt index 567a7eb849..67aee94947 100644 --- a/ext/intl/tests/dateformat_formatObject_datetime_variant2.phpt +++ b/ext/intl/tests/dateformat_formatObject_datetime_variant2.phpt @@ -22,7 +22,6 @@ echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n"; ?> ==DONE== - --EXPECTF-- 01/01/2012, 00:00:00 Domingo, 1 de Janeiro de 2012 Γ s 00:00:00 Hora %Sda Europa Ocidental diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt index 5ee72446f1..7ddacfa25a 100644 --- a/ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt +++ b/ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt @@ -23,7 +23,6 @@ echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n"; ?> ==DONE== - --EXPECTF-- 01/01/2012, 00:00:00 domingo, 1 de Janeiro de 2012 Γ s 00:00:00 Hora PadrΓ£o %Sda Europa Ocidental diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt index 6ae6dfedd3..3c233eeb95 100644 --- a/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt +++ b/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt @@ -23,7 +23,6 @@ echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n"; ?> ==DONE== - --EXPECTF-- 01/01/2012, 00:00:00 domingo, 1 de janeiro de 2012 Γ s 00:00:00 Hora PadrΓ£o %Sda Europa Ocidental diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt index 22b0f6adbe..d3b671f324 100644 --- a/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt +++ b/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt @@ -22,7 +22,6 @@ echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n"; ?> ==DONE== - --EXPECTF-- 01/01/2012, 00:00:00 domingo, 1 de janeiro de 2012 Γ s 00:00:00 Hora padrΓ£o %Sda Europa Ocidental diff --git a/ext/intl/tests/dateformat_formatObject_error.phpt b/ext/intl/tests/dateformat_formatObject_error.phpt index 24e21b50d8..bfcc951b73 100644 --- a/ext/intl/tests/dateformat_formatObject_error.phpt +++ b/ext/intl/tests/dateformat_formatObject_error.phpt @@ -30,9 +30,7 @@ var_dump(IntlDateFormatter::formatObject($cal, "YYYY", array())); ?> ==DONE== - --EXPECTF-- - Warning: IntlDateFormatter::formatObject() expects at least 1 parameter, 0 given in %s on line %d bool(false) @@ -71,4 +69,3 @@ bool(false) Warning: IntlDateFormatter::formatObject() expects parameter 3 to be string, array given in %s on line %d bool(false) ==DONE== - diff --git a/ext/intl/tests/dateformat_getCalendarObject_error.phpt b/ext/intl/tests/dateformat_getCalendarObject_error.phpt index d2ad66c829..d5a7833ded 100644 --- a/ext/intl/tests/dateformat_getCalendarObject_error.phpt +++ b/ext/intl/tests/dateformat_getCalendarObject_error.phpt @@ -20,7 +20,6 @@ var_dump(datefmt_get_calendar_object(new stdclass)); ?> ==DONE== --EXPECTF-- - Warning: IntlDateFormatter::getCalendarObject() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlDateFormatter::getCalendarObject(): datefmt_get_calendar_object: unable to parse input params in %s on line %d diff --git a/ext/intl/tests/dateformat_getTimeZone_error.phpt b/ext/intl/tests/dateformat_getTimeZone_error.phpt index 4ac5555d88..d2ab92d86a 100644 --- a/ext/intl/tests/dateformat_getTimeZone_error.phpt +++ b/ext/intl/tests/dateformat_getTimeZone_error.phpt @@ -20,7 +20,6 @@ var_dump(datefmt_get_timezone(new stdclass)); ?> ==DONE== --EXPECTF-- - Warning: IntlDateFormatter::getTimeZone() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlDateFormatter::getTimeZone(): datefmt_get_timezone: unable to parse input params in %s on line %d diff --git a/ext/intl/tests/dateformat_get_set_pattern.phpt b/ext/intl/tests/dateformat_get_set_pattern.phpt index bd541c1c93..f8e7291a9c 100644 --- a/ext/intl/tests/dateformat_get_set_pattern.phpt +++ b/ext/intl/tests/dateformat_get_set_pattern.phpt @@ -4,7 +4,6 @@ datefmt_get_pattern_code and datefmt_set_pattern_code() icu <= 4.2 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> <?php if(version_compare(INTL_ICU_VERSION, '4.3', '<') != 1) print 'skip'; ?> --FILE-- - <?php /* diff --git a/ext/intl/tests/dateformat_get_set_pattern2.phpt b/ext/intl/tests/dateformat_get_set_pattern2.phpt index b64ec179ad..6de5346143 100644 --- a/ext/intl/tests/dateformat_get_set_pattern2.phpt +++ b/ext/intl/tests/dateformat_get_set_pattern2.phpt @@ -4,7 +4,6 @@ datefmt_get_pattern_code and datefmt_set_pattern_code() icu >= 4.8 <?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?> <?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip ICU 4.8+ only'; ?> --FILE-- - <?php /* diff --git a/ext/intl/tests/dateformat_is_set_lenient.phpt b/ext/intl/tests/dateformat_is_set_lenient.phpt index 8492a2e2a8..b78396b77f 100644 --- a/ext/intl/tests/dateformat_is_set_lenient.phpt +++ b/ext/intl/tests/dateformat_is_set_lenient.phpt @@ -3,7 +3,6 @@ datefmt_set_lenient and datefmt_set_lenient() --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> --FILE-- - <?php /* diff --git a/ext/intl/tests/dateformat_parse.phpt b/ext/intl/tests/dateformat_parse.phpt index ff59773488..6552c15aa9 100644 --- a/ext/intl/tests/dateformat_parse.phpt +++ b/ext/intl/tests/dateformat_parse.phpt @@ -70,7 +70,6 @@ include_once( 'ut_common.inc' ); ut_run(); ?> --EXPECT-- - Input text : Sunday, September 18, 2039 4:06:40 PM PT ; DF = 0; TF = 0 Parsed: 2200000000; parse_pos : 40 diff --git a/ext/intl/tests/dateformat_setTimeZone_error.phpt b/ext/intl/tests/dateformat_setTimeZone_error.phpt index bd37031325..b58d159088 100644 --- a/ext/intl/tests/dateformat_setTimeZone_error.phpt +++ b/ext/intl/tests/dateformat_setTimeZone_error.phpt @@ -22,7 +22,6 @@ var_dump(datefmt_set_timezone(new stdclass, 'UTC')); ?> ==DONE== --EXPECTF-- - Warning: IntlDateFormatter::setTimeZone() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: unable to parse input params in %s on line %d diff --git a/ext/intl/tests/dateformat_set_timezone_id2.phpt b/ext/intl/tests/dateformat_set_timezone_id2.phpt index a706ee763b..9e8c9760a6 100644 --- a/ext/intl/tests/dateformat_set_timezone_id2.phpt +++ b/ext/intl/tests/dateformat_set_timezone_id2.phpt @@ -59,7 +59,6 @@ include_once( 'ut_common.inc' ); ut_run(); ?> --EXPECTF-- - Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: no such time zone: 'CN' in %s on line %d Warning: datefmt_set_timezone(): datefmt_set_timezone: no such time zone: 'CN' in %s on line %d diff --git a/ext/intl/tests/dateformat_timezone_arg_variations.phpt b/ext/intl/tests/dateformat_timezone_arg_variations.phpt index 77d7caae3a..5379ab2d5b 100644 --- a/ext/intl/tests/dateformat_timezone_arg_variations.phpt +++ b/ext/intl/tests/dateformat_timezone_arg_variations.phpt @@ -34,7 +34,6 @@ echo $df->format($ts), "\n"; $df = new IntlDateFormatter('es_ES', 0, 0, 'Europe/Amsterdam', 0); echo $df->format($ts), "\n"; - --EXPECTF-- sΓ΅bado%S 31 de diciembre de 2011 23:00:00 Hora%S de las Azores domingo%S 1 de enero de 2012 01:00:00 Hora estΓ΅ndar de Europa Central diff --git a/ext/intl/tests/dateformat_timezone_arg_variations2.phpt b/ext/intl/tests/dateformat_timezone_arg_variations2.phpt index 53ee820540..c50a6a8108 100644 --- a/ext/intl/tests/dateformat_timezone_arg_variations2.phpt +++ b/ext/intl/tests/dateformat_timezone_arg_variations2.phpt @@ -34,7 +34,6 @@ echo $df->format($ts), "\n"; $df = new IntlDateFormatter('es_ES', 0, 0, 'Europe/Amsterdam', 0); echo $df->format($ts), "\n"; - --EXPECTF-- sΓ΅bado%S, 31 de diciembre de 2011 23:00:00 Hora estΓ΅ndar de las Azores domingo%S, 1 de enero de 2012 01:00:00 Hora estΓ΅ndar de Europa central diff --git a/ext/intl/tests/dateformat_timezone_arg_variations3.phpt b/ext/intl/tests/dateformat_timezone_arg_variations3.phpt index f8aaf2bd4a..fe8841200a 100644 --- a/ext/intl/tests/dateformat_timezone_arg_variations3.phpt +++ b/ext/intl/tests/dateformat_timezone_arg_variations3.phpt @@ -35,7 +35,6 @@ echo $df->format($ts), "\n"; $df = new IntlDateFormatter('es_ES', 0, 0, 'Europe/Amsterdam', 0); echo $df->format($ts), "\n"; - --EXPECTF-- sΓ΅bado%S 31 de diciembre de 2011, 23:00:00 (Hora estΓ΅ndar de las Azores) domingo%S 1 de enero de 2012, 1:00:00 (Hora estΓ΅ndar de Europa central) diff --git a/ext/intl/tests/dateformat_timezone_arg_variations4.phpt b/ext/intl/tests/dateformat_timezone_arg_variations4.phpt index be6b1221ce..967c33e232 100644 --- a/ext/intl/tests/dateformat_timezone_arg_variations4.phpt +++ b/ext/intl/tests/dateformat_timezone_arg_variations4.phpt @@ -34,7 +34,6 @@ echo $df->format($ts), "\n"; $df = new IntlDateFormatter('es_ES', 0, 0, 'Europe/Amsterdam', 0); echo $df->format($ts), "\n"; - --EXPECT-- sΓ΅bado, 31 de diciembre de 2011, 23:00:00 (hora estΓ΅ndar de las Azores) domingo, 1 de enero de 2012, 1:00:00 (hora estΓ΅ndar de Europa central) @@ -43,4 +42,3 @@ sΓ΅bado, 31 de diciembre de 2011, 19:00:00 (hora estΓ΅ndar oriental) domingo, 1 de enero de 2012, 1:00:00 (hora estΓ΅ndar de Europa central) domingo, 1 de enero de 2012, 0:00:00 (hora estΓ΅ndar de Europa occidental) domingo, 1 de enero de 2012, 1:00:00 (hora estΓ΅ndar de Europa central) - diff --git a/ext/intl/tests/formatter_clone_bad_obj.phpt b/ext/intl/tests/formatter_clone_bad_obj.phpt index f90aae011f..53a715e6a7 100644 --- a/ext/intl/tests/formatter_clone_bad_obj.phpt +++ b/ext/intl/tests/formatter_clone_bad_obj.phpt @@ -15,6 +15,5 @@ try { } catch (Exception $e) { var_dump($e->getMessage()); } - --EXPECT-- string(42) "Cannot clone unconstructed NumberFormatter" diff --git a/ext/intl/tests/formatter_get_set_symbol.phpt b/ext/intl/tests/formatter_get_set_symbol.phpt index 050e8cf9e1..52639d568a 100644 --- a/ext/intl/tests/formatter_get_set_symbol.phpt +++ b/ext/intl/tests/formatter_get_set_symbol.phpt @@ -187,4 +187,3 @@ Symbol 'MONETARY_GROUPING_SEPARATOR_SYMBOL-3' Default symbol: [,] New symbol: [blahblahblahblahblahblahblahblahblahblah] A number formatted with the new symbol: $12blahblahblahblahblahblahblahblahblahblah345.12 - diff --git a/ext/intl/tests/formatter_get_set_symbol2.phpt b/ext/intl/tests/formatter_get_set_symbol2.phpt index 8e762f350f..559fb2dcbb 100644 --- a/ext/intl/tests/formatter_get_set_symbol2.phpt +++ b/ext/intl/tests/formatter_get_set_symbol2.phpt @@ -188,4 +188,3 @@ Symbol 'MONETARY_GROUPING_SEPARATOR_SYMBOL-3' Default symbol: [,] New symbol: [blahblahblahblahblahblahblahblahblahblah] A number formatted with the new symbol: $12blahblahblahblahblahblahblahblahblahblah345.12 - diff --git a/ext/intl/tests/formatter_get_set_text_attribute.phpt b/ext/intl/tests/formatter_get_set_text_attribute.phpt index 0535da477b..dea3c2d36f 100644 --- a/ext/intl/tests/formatter_get_set_text_attribute.phpt +++ b/ext/intl/tests/formatter_get_set_text_attribute.phpt @@ -118,5 +118,3 @@ New value: [blahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblah Formatting number with new value: blahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblah12,345.123 Currency ISO-code for locale 'uk_UA' is: UAH - - diff --git a/ext/intl/tests/formatter_get_set_text_attribute_var2.phpt b/ext/intl/tests/formatter_get_set_text_attribute_var2.phpt index f1306094c4..260e33a350 100644 --- a/ext/intl/tests/formatter_get_set_text_attribute_var2.phpt +++ b/ext/intl/tests/formatter_get_set_text_attribute_var2.phpt @@ -118,5 +118,3 @@ New value: [blahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblah Formatting number with new value: blahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblah12,345.123 Currency ISO-code for locale 'uk_UA' is: UAH - - diff --git a/ext/intl/tests/grapheme.phpt b/ext/intl/tests/grapheme.phpt index 6b476edaab..6c5896daa4 100644 --- a/ext/intl/tests/grapheme.phpt +++ b/ext/intl/tests/grapheme.phpt @@ -781,7 +781,6 @@ function check_result($result, $expected) { ?> --EXPECT-- - function grapheme_strlen($string) {} "hindi" in devanagari strlen 3 @@ -1213,4 +1212,3 @@ extract from "o%CC%88abca%CC%8Axyz" "8" graphemes - grapheme_extract GRAPHEME_EX extract from "o%CC%88abca%CC%8Axyz" "8" graphemes - grapheme_extract GRAPHEME_EXTR_MAXCHARS starting at byte position 4 = bca%CC%8Axyz == bca%CC%8Axyz extract from "o%CC%88abca%CC%8Axyz" "8" graphemes - grapheme_extract GRAPHEME_EXTR_MAXCHARS starting at byte position 5 = ca%CC%8Axyz == ca%CC%8Axyz extract from "o%CC%88abca%CC%8Axyz" "8" graphemes - grapheme_extract GRAPHEME_EXTR_MAXCHARS starting at byte position 6 = a%CC%8Axyz == a%CC%8Axyz - diff --git a/ext/intl/tests/gregoriancalendar___construct_error.phpt b/ext/intl/tests/gregoriancalendar___construct_error.phpt index 30dedbb345..bef69db877 100644 --- a/ext/intl/tests/gregoriancalendar___construct_error.phpt +++ b/ext/intl/tests/gregoriancalendar___construct_error.phpt @@ -26,7 +26,6 @@ try { print_exception($e); } --EXPECTF-- - Warning: intlgregcal_create_instance(): intlgregcal_create_instance: too many arguments in %s on line %d NULL diff --git a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt index 76c5cbc652..a1cfb593d7 100644 --- a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt +++ b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt @@ -16,7 +16,6 @@ var_dump($c->getGregorianChange(1)); var_dump(intlgregcal_get_gregorian_change($c, 1)); var_dump(intlgregcal_get_gregorian_change(1)); --EXPECTF-- - Warning: IntlGregorianCalendar::getGregorianChange() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlGregorianCalendar::getGregorianChange(): intlgregcal_get_gregorian_change: bad arguments in %s on line %d diff --git a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt index 125dc15cc1..9da5aaf418 100644 --- a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt +++ b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt @@ -19,7 +19,6 @@ var_dump(intlgregcal_is_leap_year($c, 1, 2)); var_dump(intlgregcal_is_leap_year($c)); var_dump(intlgregcal_is_leap_year(1, 2)); --EXPECTF-- - Warning: IntlGregorianCalendar::isLeapYear() expects exactly 1 parameter, 2 given in %s on line %d Warning: IntlGregorianCalendar::isLeapYear(): intlgregcal_is_leap_year: bad arguments in %s on line %d diff --git a/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt index 74833eb14a..0dd27802b5 100644 --- a/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt +++ b/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt @@ -18,7 +18,6 @@ var_dump($c->setGregorianChange("sdfds")); var_dump(intlgregcal_set_gregorian_change($c)); var_dump(intlgregcal_set_gregorian_change(1, 4.)); --EXPECTF-- - Warning: IntlGregorianCalendar::setGregorianChange() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlGregorianCalendar::setGregorianChange(): intlgregcal_set_gregorian_change: bad arguments in %s on line %d diff --git a/ext/intl/tests/idn.phpt b/ext/intl/tests/idn.phpt index 6c00c95493..5400cd487a 100644 --- a/ext/intl/tests/idn.phpt +++ b/ext/intl/tests/idn.phpt @@ -18,4 +18,4 @@ Deprecated: idn_to_ascii(): INTL_IDNA_VARIANT_2003 is deprecated in %s on line % xn--tst-qla.de Deprecated: idn_to_utf8(): INTL_IDNA_VARIANT_2003 is deprecated in %s on line %d -t%C3%A4st.de
\ No newline at end of file +t%C3%A4st.de diff --git a/ext/intl/tests/locale_get_script.phpt b/ext/intl/tests/locale_get_script.phpt index 6a794fdb12..1ddbade97b 100644 --- a/ext/intl/tests/locale_get_script.phpt +++ b/ext/intl/tests/locale_get_script.phpt @@ -119,4 +119,3 @@ en-a-myExt-b-another: script='' de-419-DE: script='' a-DE: script='' ar-a-aaa-b-bbb-a-ccc: script='' - diff --git a/ext/intl/tests/msgfmt_clone_bad_obj.phpt b/ext/intl/tests/msgfmt_clone_bad_obj.phpt index 48321094d1..69105a6b04 100644 --- a/ext/intl/tests/msgfmt_clone_bad_obj.phpt +++ b/ext/intl/tests/msgfmt_clone_bad_obj.phpt @@ -15,6 +15,5 @@ try { } catch (Exception $e) { var_dump($e->getMessage()); } - --EXPECTF-- string(%d) "Cannot clone unconstructed MessageFormatter" diff --git a/ext/intl/tests/msgfmt_format_error1.phpt b/ext/intl/tests/msgfmt_format_error1.phpt index da4880a97b..1b460b65e1 100644 --- a/ext/intl/tests/msgfmt_format_error1.phpt +++ b/ext/intl/tests/msgfmt_format_error1.phpt @@ -14,6 +14,5 @@ EOD; $mf = new MessageFormatter('en_US', $fmt); var_dump($mf->format(array(7))); - --EXPECT-- string(5) "7 {1}" diff --git a/ext/intl/tests/msgfmt_format_error2.phpt b/ext/intl/tests/msgfmt_format_error2.phpt index 85d1b1c83d..4c6ef44838 100644 --- a/ext/intl/tests/msgfmt_format_error2.phpt +++ b/ext/intl/tests/msgfmt_format_error2.phpt @@ -16,8 +16,6 @@ EOD; $mf = new MessageFormatter('en_US', $fmt); var_dump($mf->format(array(7))); - --EXPECTF-- - Warning: MessageFormatter::format(): Inconsistent types declared for an argument in %s on line %d bool(false) diff --git a/ext/intl/tests/msgfmt_format_error3.phpt b/ext/intl/tests/msgfmt_format_error3.phpt index 6dfbee3c90..b55feabc13 100644 --- a/ext/intl/tests/msgfmt_format_error3.phpt +++ b/ext/intl/tests/msgfmt_format_error3.phpt @@ -16,8 +16,6 @@ EOD; $mf = new MessageFormatter('en_US', $fmt); var_dump($mf->format(array("foo" => 7, -1 => "bar"))); - --EXPECTF-- - Warning: MessageFormatter::format(): Found negative or too large array key in %s on line %d bool(false) diff --git a/ext/intl/tests/msgfmt_format_error4.phpt b/ext/intl/tests/msgfmt_format_error4.phpt index 3b92b48b8b..78252d2d21 100644 --- a/ext/intl/tests/msgfmt_format_error4.phpt +++ b/ext/intl/tests/msgfmt_format_error4.phpt @@ -18,9 +18,7 @@ $mf = new MessageFormatter('en_US', $fmt); var_dump($mf->format(array("foo" => 7, "\x80" => "bar"))); var_dump($mf->format(array("foo" => "\x80"))); - --EXPECTF-- - Warning: MessageFormatter::format(): Invalid UTF-8 data in argument key: '€' in %s on line %d bool(false) diff --git a/ext/intl/tests/msgfmt_format_error5.phpt b/ext/intl/tests/msgfmt_format_error5.phpt index d5f62f9baf..5c0f3351c2 100644 --- a/ext/intl/tests/msgfmt_format_error5.phpt +++ b/ext/intl/tests/msgfmt_format_error5.phpt @@ -18,7 +18,6 @@ EOD; $mf = new MessageFormatter('en_US', $fmt); var_dump($mf->format(array("foo" => new stdclass()))); - --EXPECTF-- Warning: MessageFormatter::format(): msgfmt_format: invalid object type for date/time (only IntlCalendar and DateTimeInterface permitted) in %s on line %d diff --git a/ext/intl/tests/msgfmt_format_error6.phpt b/ext/intl/tests/msgfmt_format_error6.phpt index b07d2ab774..94f0b3a939 100644 --- a/ext/intl/tests/msgfmt_format_error6.phpt +++ b/ext/intl/tests/msgfmt_format_error6.phpt @@ -16,8 +16,6 @@ EOD; $mf = new MessageFormatter('en_US', $fmt); var_dump($mf->format(array("foo" => 'bar', 7 => fopen('php://memory', 'r+')))); - --EXPECTF-- - Warning: MessageFormatter::format(): No strategy to convert the value given for the argument with key '7' is available in %s on line %d bool(false) diff --git a/ext/intl/tests/msgfmt_format_mixed_params.phpt b/ext/intl/tests/msgfmt_format_mixed_params.phpt index 9a3691db51..2382d0b407 100644 --- a/ext/intl/tests/msgfmt_format_mixed_params.phpt +++ b/ext/intl/tests/msgfmt_format_mixed_params.phpt @@ -22,4 +22,4 @@ var_dump($mf->format(array("foo" => 1.3, 0 => 2.3))); --EXPECT-- string(10) "2.3 -- 1st" string(10) "2.3 -- 1st" -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/intl/tests/msgfmt_setPattern_cache.phpt b/ext/intl/tests/msgfmt_setPattern_cache.phpt index 995eee6f2e..90d057c50d 100644 --- a/ext/intl/tests/msgfmt_setPattern_cache.phpt +++ b/ext/intl/tests/msgfmt_setPattern_cache.phpt @@ -23,4 +23,4 @@ var_dump($mf->format(array(1.3, 1.3))); string(10) "1.3 -- 1st" string(10) "1.3 -- 1st" string(10) "1st -- 1.3" -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/intl/tests/normalizer_get_raw_decomposition.phpt b/ext/intl/tests/normalizer_get_raw_decomposition.phpt index 3f71fc6f57..bffc8fedeb 100644 --- a/ext/intl/tests/normalizer_get_raw_decomposition.phpt +++ b/ext/intl/tests/normalizer_get_raw_decomposition.phpt @@ -65,4 +65,3 @@ error info: 'Input string must be exactly one UTF-8 encoded code point long.: U_ --------------------- 'f5' has no decomposition mapping error info: 'Code point out of range: U_ILLEGAL_ARGUMENT_ERROR' (1) - diff --git a/ext/intl/tests/normalizer_normalize.phpt b/ext/intl/tests/normalizer_normalize.phpt index 70a2bce912..5f8c25ec2f 100644 --- a/ext/intl/tests/normalizer_normalize.phpt +++ b/ext/intl/tests/normalizer_normalize.phpt @@ -162,4 +162,3 @@ ut_run(); is in form 'UNORM_NONE'? = no error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1) '%E1%BA%9B' normalized to form 'UNORM_NONE' is '%E1%BA%9B' error info: 'U_ZERO_ERROR' (0) is in form 'UNORM_NONE'? = no error info: 'normalizer_normalize: illegal normalization form: U_ILLEGAL_ARGUMENT_ERROR' (1) - diff --git a/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt b/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt index 80eedbfba5..a9c4d32ee4 100644 --- a/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt +++ b/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt @@ -43,4 +43,4 @@ pos : 17 rule status: 0 pos : 19 rule status: 42 -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/intl/tests/timezone_IDforWindowsID_basic.phpt b/ext/intl/tests/timezone_IDforWindowsID_basic.phpt index f8e3d33325..e2cb329196 100644 --- a/ext/intl/tests/timezone_IDforWindowsID_basic.phpt +++ b/ext/intl/tests/timezone_IDforWindowsID_basic.phpt @@ -25,7 +25,6 @@ foreach ($tzs as $tz => $regions) { } } } - --EXPECT-- ** Gnomeregan bool(false) diff --git a/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt b/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt index d7d865c7a7..800fc9a021 100644 --- a/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt +++ b/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt @@ -24,7 +24,6 @@ foreach ($tzs as $tz => $regions) { } } } - --EXPECT-- ** Gnomeregan bool(false) diff --git a/ext/intl/tests/timezone_countEquivalentIDs_error.phpt b/ext/intl/tests/timezone_countEquivalentIDs_error.phpt index 4d8f4bc3e3..3087f49cbe 100644 --- a/ext/intl/tests/timezone_countEquivalentIDs_error.phpt +++ b/ext/intl/tests/timezone_countEquivalentIDs_error.phpt @@ -12,10 +12,7 @@ var_dump(IntlTimeZone::countEquivalentIDs()); var_dump(IntlTimeZone::countEquivalentIDs(array())); var_dump(IntlTimeZone::countEquivalentIDs("foo\x80")); var_dump(IntlTimeZone::countEquivalentIDs("foo bar", 7)); - - --EXPECTF-- - Warning: IntlTimeZone::countEquivalentIDs() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlTimeZone::countEquivalentIDs(): intltz_count_equivalent_ids: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_createDefault_error.phpt b/ext/intl/tests/timezone_createDefault_error.phpt index 0724898219..f2f2e021b9 100644 --- a/ext/intl/tests/timezone_createDefault_error.phpt +++ b/ext/intl/tests/timezone_createDefault_error.phpt @@ -9,10 +9,7 @@ if (!extension_loaded('intl')) ini_set("intl.error_level", E_WARNING); var_dump(IntlTimeZone::createDefault(4)); - - --EXPECTF-- - Warning: IntlTimeZone::createDefault() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlTimeZone::createDefault(): intltz_create_default: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_createEnumeration_error.phpt b/ext/intl/tests/timezone_createEnumeration_error.phpt index e1e7cb9333..ea92e28d95 100644 --- a/ext/intl/tests/timezone_createEnumeration_error.phpt +++ b/ext/intl/tests/timezone_createEnumeration_error.phpt @@ -10,10 +10,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(IntlTimeZone::createEnumeration(array())); var_dump(IntlTimeZone::createEnumeration(1, 2)); - - --EXPECTF-- - Warning: IntlTimeZone::createEnumeration(): intltz_create_enumeration: invalid argument type in %s on line %d bool(false) diff --git a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt index febca6f91b..601760a3a3 100644 --- a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt +++ b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt @@ -15,9 +15,7 @@ var_dump(IntlTimeZone::createTimeZoneIDEnumeration(array())); var_dump(IntlTimeZone::createTimeZoneIDEnumeration(-1)); var_dump(IntlTimeZone::createTimeZoneIDEnumeration(IntlTimeZone::TYPE_ANY, array())); var_dump(IntlTimeZone::createTimeZoneIDEnumeration(IntlTimeZone::TYPE_ANY, "PT", "a80")); - --EXPECTF-- - Warning: IntlTimeZone::createTimeZoneIDEnumeration() expects at least 1 parameter, 0 given in %s on line %d Warning: IntlTimeZone::createTimeZoneIDEnumeration(): intltz_create_time_zone_id_enumeration: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_createTimeZone_error.phpt b/ext/intl/tests/timezone_createTimeZone_error.phpt index 2be821a67e..553223ee4c 100644 --- a/ext/intl/tests/timezone_createTimeZone_error.phpt +++ b/ext/intl/tests/timezone_createTimeZone_error.phpt @@ -12,9 +12,7 @@ var_dump(IntlTimeZone::createTimeZone()); var_dump(IntlTimeZone::createTimeZone(new stdClass)); var_dump(IntlTimeZone::createTimeZone("foo bar", 4)); var_dump(IntlTimeZone::createTimeZone("foo\x80")); - --EXPECTF-- - Warning: IntlTimeZone::createTimeZone() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlTimeZone::createTimeZone(): intltz_create_time_zone: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_fromDateTimeZone_basic.phpt b/ext/intl/tests/timezone_fromDateTimeZone_basic.phpt index 10e2621ae4..c846b0b20e 100644 --- a/ext/intl/tests/timezone_fromDateTimeZone_basic.phpt +++ b/ext/intl/tests/timezone_fromDateTimeZone_basic.phpt @@ -29,7 +29,6 @@ $dtz = $dt->getTimeZone(); var_dump($dtz->getName()); $tz = IntlTimeZone::fromDateTimeZone($dtz); var_dump($tz->getID(), $tz->getRawOffset() /* (3*60+40)*60000 */); - --EXPECTF-- string(16) "Europe/Amsterdam" int(3600000) diff --git a/ext/intl/tests/timezone_fromDateTimeZone_error.phpt b/ext/intl/tests/timezone_fromDateTimeZone_error.phpt index 031882277e..f50e59f97c 100644 --- a/ext/intl/tests/timezone_fromDateTimeZone_error.phpt +++ b/ext/intl/tests/timezone_fromDateTimeZone_error.phpt @@ -18,9 +18,7 @@ $dt = new DateTime('2012-08-01 00:00:00 WEST'); var_dump(IntlTimeZone::fromDateTimeZone($dt->getTimeZone())); var_dump(intltz_from_date_time_zone()); - --EXPECTF-- - Warning: IntlTimeZone::fromDateTimeZone() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlTimeZone::fromDateTimeZone(): intltz_from_date_time_zone: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_getCanonicalID_error.phpt b/ext/intl/tests/timezone_getCanonicalID_error.phpt index b29ca67701..684d946b1e 100644 --- a/ext/intl/tests/timezone_getCanonicalID_error.phpt +++ b/ext/intl/tests/timezone_getCanonicalID_error.phpt @@ -11,10 +11,7 @@ ini_set("intl.error_level", E_WARNING); var_dump(IntlTimeZone::getCanonicalID()); var_dump(IntlTimeZone::getCanonicalID(array())); var_dump(IntlTimeZone::getCanonicalID("foo\x81")); - - --EXPECTF-- - Warning: IntlTimeZone::getCanonicalID() expects at least 1 parameter, 0 given in %s on line %d Warning: IntlTimeZone::getCanonicalID(): intltz_get_canonical_id: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_getDSTSavings_error.phpt b/ext/intl/tests/timezone_getDSTSavings_error.phpt index 26526dc72e..9df04f08c1 100644 --- a/ext/intl/tests/timezone_getDSTSavings_error.phpt +++ b/ext/intl/tests/timezone_getDSTSavings_error.phpt @@ -12,9 +12,7 @@ $tz = IntlTimeZone::createTimeZone('Europe/Lisbon'); var_dump($tz->getDSTSavings(array())); var_dump(intltz_get_dst_savings(null)); - --EXPECTF-- - Warning: IntlTimeZone::getDSTSavings() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlTimeZone::getDSTSavings(): intltz_get_dst_savings: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_getDisplayName_error.phpt b/ext/intl/tests/timezone_getDisplayName_error.phpt index 61143ca490..8d30f8840f 100644 --- a/ext/intl/tests/timezone_getDisplayName_error.phpt +++ b/ext/intl/tests/timezone_getDisplayName_error.phpt @@ -16,9 +16,7 @@ var_dump($tz->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT, array())); var_dump($tz->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT, NULL, NULL)); var_dump(intltz_get_display_name(null, IntlTimeZone::DISPLAY_SHORT, false, 'pt_PT')); - --EXPECTF-- - Warning: IntlTimeZone::getDisplayName() expects parameter 1 to be bool, array given in %s on line %d Warning: IntlTimeZone::getDisplayName(): intltz_get_display_name: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_getEquivalentID_error.phpt b/ext/intl/tests/timezone_getEquivalentID_error.phpt index f22ca4eefd..facb8fe8cf 100644 --- a/ext/intl/tests/timezone_getEquivalentID_error.phpt +++ b/ext/intl/tests/timezone_getEquivalentID_error.phpt @@ -12,9 +12,7 @@ var_dump(IntlTimeZone::getEquivalentID('foo')); var_dump(IntlTimeZone::getEquivalentID('foo', 'bar')); var_dump(IntlTimeZone::getEquivalentID('Europe/Lisbon', 0, 1)); var_dump(IntlTimeZone::getEquivalentID("foo\x80", 0)); - --EXPECTF-- - Warning: IntlTimeZone::getEquivalentID() expects exactly 2 parameters, 1 given in %s on line %d Warning: IntlTimeZone::getEquivalentID(): intltz_get_equivalent_id: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_getErrorCode_error.phpt b/ext/intl/tests/timezone_getErrorCode_error.phpt index a6d704c035..f5b06b0757 100644 --- a/ext/intl/tests/timezone_getErrorCode_error.phpt +++ b/ext/intl/tests/timezone_getErrorCode_error.phpt @@ -12,9 +12,7 @@ $tz = IntlTimeZone::createTimeZone('Europe/Lisbon'); var_dump($tz->getErrorCode(array())); var_dump(intltz_get_error_code(null)); - --EXPECTF-- - Warning: IntlTimeZone::getErrorCode() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlTimeZone::getErrorCode(): intltz_get_error_code: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_getErrorMessage_error.phpt b/ext/intl/tests/timezone_getErrorMessage_error.phpt index 2f7cfcfe2a..6b8ce7d5c8 100644 --- a/ext/intl/tests/timezone_getErrorMessage_error.phpt +++ b/ext/intl/tests/timezone_getErrorMessage_error.phpt @@ -12,9 +12,7 @@ $tz = IntlTimeZone::createTimeZone('Europe/Lisbon'); var_dump($tz->getErrorMessage(array())); var_dump(intltz_get_error_message(null)); - --EXPECTF-- - Warning: IntlTimeZone::getErrorMessage() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlTimeZone::getErrorMessage(): intltz_get_error_message: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_getGMT_error.phpt b/ext/intl/tests/timezone_getGMT_error.phpt index 15afb765e4..ca478a10d1 100644 --- a/ext/intl/tests/timezone_getGMT_error.phpt +++ b/ext/intl/tests/timezone_getGMT_error.phpt @@ -9,10 +9,7 @@ if (!extension_loaded('intl')) ini_set("intl.error_level", E_WARNING); var_dump(IntlTimeZone::getGMT(4)); - - --EXPECTF-- - Warning: IntlTimeZone::getGMT() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlTimeZone::getGMT(): intltz_get_gmt: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_getID_error.phpt b/ext/intl/tests/timezone_getID_error.phpt index a08c506cee..4d0ffeb96f 100644 --- a/ext/intl/tests/timezone_getID_error.phpt +++ b/ext/intl/tests/timezone_getID_error.phpt @@ -11,10 +11,7 @@ ini_set("intl.error_level", E_WARNING); $tz = IntlTimeZone::createTimeZone('Europe/Lisbon'); var_dump($tz->getID('foo')); intltz_get_id(null); - - --EXPECTF-- - Warning: IntlTimeZone::getID() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlTimeZone::getID(): intltz_get_id: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_getOffset_error.phpt b/ext/intl/tests/timezone_getOffset_error.phpt index 632fa5e85a..d66716e552 100644 --- a/ext/intl/tests/timezone_getOffset_error.phpt +++ b/ext/intl/tests/timezone_getOffset_error.phpt @@ -14,9 +14,7 @@ var_dump($tz->getOffset(time()*1000, true, $a)); var_dump($tz->getOffset(time()*1000, true, $a, $a, $a)); intltz_get_offset(null, time()*1000, false, $a, $a); - --EXPECTF-- - Warning: IntlTimeZone::getOffset(): intltz_get_offset: error obtaining offset in %s on line %d bool(false) diff --git a/ext/intl/tests/timezone_getRawOffset_error.phpt b/ext/intl/tests/timezone_getRawOffset_error.phpt index 1015ef4ddc..dc7df51cca 100644 --- a/ext/intl/tests/timezone_getRawOffset_error.phpt +++ b/ext/intl/tests/timezone_getRawOffset_error.phpt @@ -12,9 +12,7 @@ $tz = IntlTimeZone::createTimeZone('Europe/Lisbon'); var_dump($tz->getRawOffset('foo')); intltz_get_raw_offset(null); - --EXPECTF-- - Warning: IntlTimeZone::getRawOffset() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlTimeZone::getRawOffset(): intltz_get_raw_offset: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_getRegion_error.phpt b/ext/intl/tests/timezone_getRegion_error.phpt index 34911d9abc..4661c4cbc4 100644 --- a/ext/intl/tests/timezone_getRegion_error.phpt +++ b/ext/intl/tests/timezone_getRegion_error.phpt @@ -15,11 +15,7 @@ var_dump(IntlTimeZone::getRegion(array())); var_dump(IntlTimeZone::getRegion('Europe/Lisbon', 4)); var_dump(IntlTimeZone::getRegion("foo\x81")); var_dump(IntlTimeZone::getRegion("foo")); - - - --EXPECTF-- - Warning: IntlTimeZone::getRegion() expects exactly 1 parameter, 0 given in %s on line %d Warning: IntlTimeZone::getRegion(): intltz_get_region: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_getTZDataVersion_error.phpt b/ext/intl/tests/timezone_getTZDataVersion_error.phpt index 258b8807b7..eab4573a36 100644 --- a/ext/intl/tests/timezone_getTZDataVersion_error.phpt +++ b/ext/intl/tests/timezone_getTZDataVersion_error.phpt @@ -9,9 +9,7 @@ if (!extension_loaded('intl')) ini_set("intl.error_level", E_WARNING); var_dump(IntlTimeZone::getTZDataVersion('foo')); - --EXPECTF-- - Warning: IntlTimeZone::getTZDataVersion() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlTimeZone::getTZDataVersion(): intltz_get_tz_data_version: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_getUnknown_basic.phpt b/ext/intl/tests/timezone_getUnknown_basic.phpt index aef1a54561..2451ce40f3 100644 --- a/ext/intl/tests/timezone_getUnknown_basic.phpt +++ b/ext/intl/tests/timezone_getUnknown_basic.phpt @@ -32,4 +32,4 @@ IntlTimeZone Object [rawOffset] => 0 [currentOffset] => 0 ) -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/intl/tests/timezone_getUnknown_error.phpt b/ext/intl/tests/timezone_getUnknown_error.phpt index 704b1b096f..5df5c69b1f 100644 --- a/ext/intl/tests/timezone_getUnknown_error.phpt +++ b/ext/intl/tests/timezone_getUnknown_error.phpt @@ -17,9 +17,7 @@ $c = new IntlGregorianCalendar(NULL, 'pt_PT'); IntlTimeZone::getUnknown(1); intltz_get_unknown(1); - --EXPECTF-- - Warning: IntlTimeZone::getUnknown() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlTimeZone::getUnknown(): intltz_get_unknown: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_hasSameRules_error.phpt b/ext/intl/tests/timezone_hasSameRules_error.phpt index 0e9b4a8bd6..4ec73a96a6 100644 --- a/ext/intl/tests/timezone_hasSameRules_error.phpt +++ b/ext/intl/tests/timezone_hasSameRules_error.phpt @@ -29,11 +29,9 @@ try { var_dump($ex->getCode(), $ex->getMessage()); echo "\n"; } - --EXPECT-- int(0) string(99) "Argument 1 passed to IntlTimeZone::hasSameRules() must be an instance of IntlTimeZone, string given" int(0) string(92) "Argument 1 passed to intltz_has_same_rules() must be an instance of IntlTimeZone, null given" - diff --git a/ext/intl/tests/timezone_toDateTimeZone_basic.phpt b/ext/intl/tests/timezone_toDateTimeZone_basic.phpt index 76981a4a91..831bc3df1a 100644 --- a/ext/intl/tests/timezone_toDateTimeZone_basic.phpt +++ b/ext/intl/tests/timezone_toDateTimeZone_basic.phpt @@ -22,7 +22,6 @@ function do_test(IntlTimeZone $tz, $proc = false) { do_test(IntlTimeZone::createTimeZone('CET')); do_test(IntlTimeZone::createTimeZone('Europe/Amsterdam')); do_test(IntlTimeZone::createTimeZone('GMT+0405'), true); - --EXPECTF-- string(3) "CET" int(3600000) diff --git a/ext/intl/tests/timezone_toDateTimeZone_error.phpt b/ext/intl/tests/timezone_toDateTimeZone_error.phpt index f36e28494a..d00e78fd3a 100644 --- a/ext/intl/tests/timezone_toDateTimeZone_error.phpt +++ b/ext/intl/tests/timezone_toDateTimeZone_error.phpt @@ -19,9 +19,7 @@ try { var_dump(intltz_to_date_time_zone()); var_dump(intltz_to_date_time_zone(1)); - --EXPECTF-- - Warning: IntlTimeZone::toDateTimeZone() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlTimeZone::toDateTimeZone(): intltz_to_date_time_zone: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_useDaylightTime_error.phpt b/ext/intl/tests/timezone_useDaylightTime_error.phpt index d3f9471671..c6ab2eefe5 100644 --- a/ext/intl/tests/timezone_useDaylightTime_error.phpt +++ b/ext/intl/tests/timezone_useDaylightTime_error.phpt @@ -11,9 +11,7 @@ ini_set("intl.error_level", E_WARNING); $tz = IntlTimeZone::createTimeZone('Europe/Lisbon'); var_dump($tz->useDaylightTime('foo')); intltz_use_daylight_time(null); - --EXPECTF-- - Warning: IntlTimeZone::useDaylightTime() expects exactly 0 parameters, 1 given in %s on line %d Warning: IntlTimeZone::useDaylightTime(): intltz_use_daylight_time: bad arguments in %s on line %d diff --git a/ext/intl/tests/timezone_windowsID_basic.phpt b/ext/intl/tests/timezone_windowsID_basic.phpt index 370dc45b6c..e91d5f5ba9 100644 --- a/ext/intl/tests/timezone_windowsID_basic.phpt +++ b/ext/intl/tests/timezone_windowsID_basic.phpt @@ -28,7 +28,6 @@ foreach ($tzs as $tz) { echo "Error: ", intl_get_error_message(), "\n"; } } - --EXPECT-- string(24) "SA Pacific Standard Time" string(21) "Eastern Standard Time" diff --git a/ext/intl/tests/timezone_windowsID_basic2.phpt b/ext/intl/tests/timezone_windowsID_basic2.phpt index 528eaad7db..94a1ac198c 100644 --- a/ext/intl/tests/timezone_windowsID_basic2.phpt +++ b/ext/intl/tests/timezone_windowsID_basic2.phpt @@ -27,7 +27,6 @@ foreach ($tzs as $tz) { echo "Error: ", intl_get_error_message(), "\n"; } } - --EXPECT-- string(24) "SA Pacific Standard Time" string(18) "Cuba Standard Time" diff --git a/ext/intl/tests/transliterator_clone.phpt b/ext/intl/tests/transliterator_clone.phpt index 23d569b898..3253b0f793 100644 --- a/ext/intl/tests/transliterator_clone.phpt +++ b/ext/intl/tests/transliterator_clone.phpt @@ -14,7 +14,6 @@ $u = clone $t; echo $u->id, ": ", $u->transliterate($str), "\n"; echo "Done.\n"; - --EXPECT-- hex-any: a δΈ‡ hex-any: a δΈ‡ diff --git a/ext/intl/tests/transliterator_create_basic.phpt b/ext/intl/tests/transliterator_create_basic.phpt index 4de032dbd6..171687aae8 100644 --- a/ext/intl/tests/transliterator_create_basic.phpt +++ b/ext/intl/tests/transliterator_create_basic.phpt @@ -12,9 +12,7 @@ $t = transliterator_create("any-latin"); echo $t->id,"\n"; echo "Done.\n"; - --EXPECT-- any-latin any-latin Done. - diff --git a/ext/intl/tests/transliterator_create_from_rule_error.phpt b/ext/intl/tests/transliterator_create_from_rule_error.phpt index 7ec6cd0a5a..d1549ec1b6 100644 --- a/ext/intl/tests/transliterator_create_from_rule_error.phpt +++ b/ext/intl/tests/transliterator_create_from_rule_error.phpt @@ -30,7 +30,6 @@ RULES; $t = Transliterator::createFromRules($rules); echo intl_get_error_message(),"\n"; echo "Done.\n"; - --EXPECTF-- Warning: Transliterator::createFromRules() expects at least 1 parameter, 0 given in %s on line %d diff --git a/ext/intl/tests/transliterator_create_inverse_error.phpt b/ext/intl/tests/transliterator_create_inverse_error.phpt index ca3de096da..1a1e80ba68 100644 --- a/ext/intl/tests/transliterator_create_inverse_error.phpt +++ b/ext/intl/tests/transliterator_create_inverse_error.phpt @@ -12,7 +12,6 @@ $tr->createInverse(array()); $tr = Transliterator::create("Katakana-Latin"); transliterator_create_inverse("jj"); - --EXPECTF-- Warning: Transliterator::createInverse() expects exactly 0 parameters, 1 given in %s on line %d diff --git a/ext/intl/tests/transliterator_get_error_code_error.phpt b/ext/intl/tests/transliterator_get_error_code_error.phpt index d65fea9904..e700d2b172 100644 --- a/ext/intl/tests/transliterator_get_error_code_error.phpt +++ b/ext/intl/tests/transliterator_get_error_code_error.phpt @@ -9,7 +9,6 @@ $t = Transliterator::create("[\p{Bidi_Mirrored}] Hex"); echo transliterator_get_error_code(), "\n"; echo $t->getErrorCode(null), "\n"; echo transliterator_get_error_code(array()), "\n"; - --EXPECTF-- Warning: transliterator_get_error_code() expects exactly 1 parameter, 0 given in %s on line %d diff --git a/ext/intl/tests/transliterator_get_error_message_error.phpt b/ext/intl/tests/transliterator_get_error_message_error.phpt index a6129ea271..ec8282447a 100644 --- a/ext/intl/tests/transliterator_get_error_message_error.phpt +++ b/ext/intl/tests/transliterator_get_error_message_error.phpt @@ -9,7 +9,6 @@ $t = Transliterator::create("[\p{Bidi_Mirrored}] Hex"); echo transliterator_get_error_message(), "\n"; echo $t->getErrorMessage(null), "\n"; echo transliterator_get_error_message(array()), "\n"; - --EXPECTF-- Warning: transliterator_get_error_message() expects exactly 1 parameter, 0 given in %s on line %d diff --git a/ext/intl/tests/transliterator_list_ids_error.phpt b/ext/intl/tests/transliterator_list_ids_error.phpt index d1066a8920..fa651387f1 100644 --- a/ext/intl/tests/transliterator_list_ids_error.phpt +++ b/ext/intl/tests/transliterator_list_ids_error.phpt @@ -9,7 +9,6 @@ ini_set("intl.error_level", E_WARNING); var_dump(transliterator_list_ids(array())); echo "Done.\n"; - --EXPECTF-- Warning: transliterator_list_ids() expects exactly 0 parameters, 1 given in %s on line %d diff --git a/ext/intl/tests/uconverter_enum.phpt b/ext/intl/tests/uconverter_enum.phpt index 67e02c9d75..09b6c23194 100644 --- a/ext/intl/tests/uconverter_enum.phpt +++ b/ext/intl/tests/uconverter_enum.phpt @@ -12,7 +12,6 @@ var_dump(in_array('ISO-8859-1', $avail)); $latin1 = UConverter::getAliases('latin1'); var_dump(in_array('ISO-8859-1', $latin1)); - --EXPECT-- bool(true) bool(true) diff --git a/ext/intl/tests/uconverter_func_subst.phpt b/ext/intl/tests/uconverter_func_subst.phpt index 12168f3cca..09121ff49b 100644 --- a/ext/intl/tests/uconverter_func_subst.phpt +++ b/ext/intl/tests/uconverter_func_subst.phpt @@ -21,7 +21,6 @@ foreach(array('?','','??') as $subst) { var_dump($ret); } } - --EXPECT-- string(23) "This is an ascii string" string(12) "Snowman: (?)" diff --git a/ext/intl/tests/uconverter_oop_subst.phpt b/ext/intl/tests/uconverter_oop_subst.phpt index d21d95f8d0..3cfc0078df 100644 --- a/ext/intl/tests/uconverter_oop_subst.phpt +++ b/ext/intl/tests/uconverter_oop_subst.phpt @@ -16,7 +16,6 @@ foreach(array('?','','<unknown>') as $subst) { var_dump($c->convert("This is an ascii string")); var_dump($c->convert("Snowman: (\xE2\x98\x83)")); } - --EXPECT-- string(23) "This is an ascii string" string(12) "Snowman: (?)" |