diff options
Diffstat (limited to 'ext/date')
80 files changed, 80 insertions, 80 deletions
diff --git a/ext/date/tests/003.phpt b/ext/date/tests/003.phpt index 2be6cf773d..8b1750ee22 100644 --- a/ext/date/tests/003.phpt +++ b/ext/date/tests/003.phpt @@ -10,7 +10,7 @@ for ($i = 0; $i < 32; $i++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(4) "31st" string(3) "1st" string(3) "2nd" diff --git a/ext/date/tests/004.phpt b/ext/date/tests/004.phpt index 33e1fc7910..fb64575cc9 100644 --- a/ext/date/tests/004.phpt +++ b/ext/date/tests/004.phpt @@ -25,7 +25,7 @@ foreach ($tz as $zone) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(1) "2" string(3) "177" string(1) "6" diff --git a/ext/date/tests/010.phpt b/ext/date/tests/010.phpt index ff42de5dea..2172a20068 100644 --- a/ext/date/tests/010.phpt +++ b/ext/date/tests/010.phpt @@ -7,7 +7,7 @@ date_default_timezone_set('UTC'); var_dump($timezone_abbreviations["utc"]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(5) { [0]=> array(3) { diff --git a/ext/date/tests/015.phpt b/ext/date/tests/015.phpt index 46001ad8f0..f870cef7bc 100644 --- a/ext/date/tests/015.phpt +++ b/ext/date/tests/015.phpt @@ -13,7 +13,7 @@ unset($dto); var_dump($tzold->getName()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(3) "UTC" string(3) "UTC" string(10) "US/Eastern" diff --git a/ext/date/tests/DatePeriod_getter.phpt b/ext/date/tests/DatePeriod_getter.phpt index 22006d1ae8..cd02bafd55 100644 --- a/ext/date/tests/DatePeriod_getter.phpt +++ b/ext/date/tests/DatePeriod_getter.phpt @@ -17,7 +17,7 @@ var_dump($period->getEndDate()->getTimeZone()->getName()); var_dump($period->getDateInterval()->format('%R%y-%m-%d-%h-%i-%s')); ?> ---EXPECTF-- +--EXPECT-- string(19) "2000-01-01 00:00:00" string(13) "Europe/Berlin" string(19) "2000-01-31 00:00:00" diff --git a/ext/date/tests/DateTimeZone_clone_basic4.phpt b/ext/date/tests/DateTimeZone_clone_basic4.phpt index a295b915ce..5d1219a87a 100644 --- a/ext/date/tests/DateTimeZone_clone_basic4.phpt +++ b/ext/date/tests/DateTimeZone_clone_basic4.phpt @@ -21,7 +21,7 @@ var_dump( $d1_clone->getName() ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing clone of objects derived from DateTimeZone class with __clone magic method*** -- DateTimeExt1 __clone magic method called -- string(16) "America/New_York" diff --git a/ext/date/tests/DateTimeZone_construct_error.phpt b/ext/date/tests/DateTimeZone_construct_error.phpt index 8c8b14f12c..fb8db122dc 100644 --- a/ext/date/tests/DateTimeZone_construct_error.phpt +++ b/ext/date/tests/DateTimeZone_construct_error.phpt @@ -23,7 +23,7 @@ try { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTimeZone() : error conditions *** -- Testing new DateTimeZone() with more than expected no. of arguments -- diff --git a/ext/date/tests/DateTimeZone_construct_variation1.phpt b/ext/date/tests/DateTimeZone_construct_variation1.phpt index d9625eedc0..c2b208f0df 100644 --- a/ext/date/tests/DateTimeZone_construct_variation1.phpt +++ b/ext/date/tests/DateTimeZone_construct_variation1.phpt @@ -109,7 +109,7 @@ fclose( $file_handle ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::__construct() : usage variation - unexpected values to first argument $timezone*** -- int 0 -- diff --git a/ext/date/tests/DateTimeZone_extends_basic1.phpt b/ext/date/tests/DateTimeZone_extends_basic1.phpt index afc2ed64b2..7857e166bc 100644 --- a/ext/date/tests/DateTimeZone_extends_basic1.phpt +++ b/ext/date/tests/DateTimeZone_extends_basic1.phpt @@ -24,7 +24,7 @@ echo $d . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing basic DateTimeZone inheritance() *** -- Create an instance of DateTimeZoneExt -- diff --git a/ext/date/tests/DateTimeZone_serialize_type_3.phpt b/ext/date/tests/DateTimeZone_serialize_type_3.phpt index 396bff9196..885a17debd 100644 --- a/ext/date/tests/DateTimeZone_serialize_type_3.phpt +++ b/ext/date/tests/DateTimeZone_serialize_type_3.phpt @@ -17,7 +17,7 @@ var_dump( $tz2->getName() ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- object(DateTimeZone)#1 (2) { ["timezone_type"]=> int(3) diff --git a/ext/date/tests/DateTime_clone_basic1.phpt b/ext/date/tests/DateTime_clone_basic1.phpt index cef6621a75..0ddd74b14e 100644 --- a/ext/date/tests/DateTime_clone_basic1.phpt +++ b/ext/date/tests/DateTime_clone_basic1.phpt @@ -22,7 +22,7 @@ echo "Clone: " . $clone->format("H:i:s") . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing clone on DateTime objects *** Original: 22:41:50 Clone: 14:25:41 diff --git a/ext/date/tests/DateTime_clone_basic4.phpt b/ext/date/tests/DateTime_clone_basic4.phpt index f19f23d97b..ecb0890bb1 100644 --- a/ext/date/tests/DateTime_clone_basic4.phpt +++ b/ext/date/tests/DateTime_clone_basic4.phpt @@ -24,7 +24,7 @@ var_dump( $d1_clone->format( "m.d.y") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing clone of objects derived from DateTime class with __clone magic method*** -- DateTimeExt1 __clone magic method called -- string(8) "02.03.09" diff --git a/ext/date/tests/DateTime_construct_error.phpt b/ext/date/tests/DateTime_construct_error.phpt index d0a453fd9d..71ce3d3018 100644 --- a/ext/date/tests/DateTime_construct_error.phpt +++ b/ext/date/tests/DateTime_construct_error.phpt @@ -24,7 +24,7 @@ try { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_create() : error conditions *** -- Testing new DateTime() with more than expected no. of arguments -- diff --git a/ext/date/tests/DateTime_extends_basic1.phpt b/ext/date/tests/DateTime_extends_basic1.phpt index 8fe53d69f8..c5f1b90ef2 100644 --- a/ext/date/tests/DateTime_extends_basic1.phpt +++ b/ext/date/tests/DateTime_extends_basic1.phpt @@ -34,7 +34,7 @@ echo $d . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing basic DateTime inheritance() *** -- Create an instance of DateTimeExt -- diff --git a/ext/date/tests/DateTime_extends_basic2.phpt b/ext/date/tests/DateTime_extends_basic2.phpt index a4bf4aa27f..72d27fbd2c 100644 --- a/ext/date/tests/DateTime_extends_basic2.phpt +++ b/ext/date/tests/DateTime_extends_basic2.phpt @@ -25,7 +25,7 @@ echo $d->format("F j, Y, g:i:s a") . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing new DateTime() : with user space __construct magic method *** May 1, 1967, 10:30:41 pm ===DONE===
\ No newline at end of file diff --git a/ext/date/tests/DateTime_extends_basic3.phpt b/ext/date/tests/DateTime_extends_basic3.phpt index bee395aa96..7a8c0bb63d 100644 --- a/ext/date/tests/DateTime_extends_basic3.phpt +++ b/ext/date/tests/DateTime_extends_basic3.phpt @@ -20,7 +20,7 @@ echo $d->format() . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing new DateTime() : with user format() method *** May 1, 1967, 10:30:41 pm ===DONE=== diff --git a/ext/date/tests/DateTime_fix_createFromFormat.phpt b/ext/date/tests/DateTime_fix_createFromFormat.phpt index abde292775..f018eb4297 100644 --- a/ext/date/tests/DateTime_fix_createFromFormat.phpt +++ b/ext/date/tests/DateTime_fix_createFromFormat.phpt @@ -22,7 +22,7 @@ echo "createFromFormat method: " . $fromFormat->format("D., M. j, Y g:iA") . "\n ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing clone on DateTime objects *** Format method: Thu., Nov. 29, 2012 5:00PM createFromFormat method: Thu., Nov. 29, 2012 5:00PM diff --git a/ext/date/tests/DateTime_getOffset_basic1.phpt b/ext/date/tests/DateTime_getOffset_basic1.phpt index 41b1a78d75..30ff125955 100644 --- a/ext/date/tests/DateTime_getOffset_basic1.phpt +++ b/ext/date/tests/DateTime_getOffset_basic1.phpt @@ -21,7 +21,7 @@ echo "Summer offset: " . $summer->getOffset() / 3600 . " hours\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::getOffset() : basic functionality *** Winter offset: 0 hours Summer offset: 1 hours diff --git a/ext/date/tests/DateTime_getTimeZone_basic1.phpt b/ext/date/tests/DateTime_getTimeZone_basic1.phpt index ee8a0db9a3..0f3edb33e2 100644 --- a/ext/date/tests/DateTime_getTimeZone_basic1.phpt +++ b/ext/date/tests/DateTime_getTimeZone_basic1.phpt @@ -25,7 +25,7 @@ var_dump( $object->getTimeZone()->getName() ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::getTimezone() : basic functionality *** string(13) "Europe/London" string(16) "America/New_York" diff --git a/ext/date/tests/DateTime_modify_basic1.phpt b/ext/date/tests/DateTime_modify_basic1.phpt index 052524d5a4..277a6b2965 100644 --- a/ext/date/tests/DateTime_modify_basic1.phpt +++ b/ext/date/tests/DateTime_modify_basic1.phpt @@ -30,7 +30,7 @@ echo "After modification 4: " . $datetime->format("D, d M Y") . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::modify() : basic functionality *** After modification 1: Sun, 01 Feb 2009 After modification 2: Tue, 10 Feb 2009 18:28:43 diff --git a/ext/date/tests/DateTime_setDate_basic1.phpt b/ext/date/tests/DateTime_setDate_basic1.phpt index 7989470cda..8ead020c01 100644 --- a/ext/date/tests/DateTime_setDate_basic1.phpt +++ b/ext/date/tests/DateTime_setDate_basic1.phpt @@ -23,7 +23,7 @@ echo $datetime->format(DATE_RFC2822) . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::setDate() : basic functionality *** Fri, 30 Jan 2009 19:34:10 +0000 Fri, 01 Feb 2008 19:34:10 +0000 diff --git a/ext/date/tests/DateTime_setISODate_basic1.phpt b/ext/date/tests/DateTime_setISODate_basic1.phpt index cdedb44e7a..ef6caf0f23 100644 --- a/ext/date/tests/DateTime_setISODate_basic1.phpt +++ b/ext/date/tests/DateTime_setISODate_basic1.phpt @@ -30,7 +30,7 @@ echo "..same day last year was \"" . $datetime->format("D M j") . "\"\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::setISODate() : basic functionality *** Week 40 of 2009 is in "September" Week 30 day 3 of 2009 is "Wed Jul 22" diff --git a/ext/date/tests/DateTime_setTime_basic1.phpt b/ext/date/tests/DateTime_setTime_basic1.phpt index bd95fecd08..0dde746c27 100644 --- a/ext/date/tests/DateTime_setTime_basic1.phpt +++ b/ext/date/tests/DateTime_setTime_basic1.phpt @@ -35,7 +35,7 @@ echo "After modification5 " . $datetime ->format(DATE_RFC2822) . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::setTime() : basic functionality *** Initial date: Sat, 31 Jan 2009 15:14:10 +0000 After modification1 Sat, 31 Jan 2009 17:20:00 +0000 diff --git a/ext/date/tests/DateTime_setTimezone_basic1.phpt b/ext/date/tests/DateTime_setTimezone_basic1.phpt index f4f479fe04..4f3825ac88 100644 --- a/ext/date/tests/DateTime_setTimezone_basic1.phpt +++ b/ext/date/tests/DateTime_setTimezone_basic1.phpt @@ -22,7 +22,7 @@ echo "New timezone: " . date_timezone_get($datetime)->getName() . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::setTimezone() : basic functionality *** Default timezone: Europe/London New timezone: America/Los_Angeles diff --git a/ext/date/tests/bug33415-2.phpt b/ext/date/tests/bug33415-2.phpt index a78557df55..aa15ef93df 100644 --- a/ext/date/tests/bug33415-2.phpt +++ b/ext/date/tests/bug33415-2.phpt @@ -208,7 +208,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; print "wanted=Monday 00:30:00\n\n"; ?> ---EXPECTF-- +--EXPECT-- TZ=Africa/Bujumbura - *Note*: Unexpected, as does not appear to have a DST or timezone transition. tStamp=Thursday 1970-01-01 17:17:17 CAT 0 diff --git a/ext/date/tests/bug45081.phpt b/ext/date/tests/bug45081.phpt index a312b52260..f82303f31e 100644 --- a/ext/date/tests/bug45081.phpt +++ b/ext/date/tests/bug45081.phpt @@ -10,6 +10,6 @@ print "\n"; print strtotime('2008-05-23 00:00:00'); ?> ---EXPECTF-- +--EXPECT-- 1211472000 1211472000 diff --git a/ext/date/tests/bug48187.phpt b/ext/date/tests/bug48187.phpt index 78c0fb2a60..e3af51d767 100644 --- a/ext/date/tests/bug48187.phpt +++ b/ext/date/tests/bug48187.phpt @@ -23,6 +23,6 @@ if (time() - $begin_t < 1) { var_dump('time() difference greater or equal 1 second'); } ?> ---EXPECTF-- +--EXPECT-- string(36) "microtime() difference less 1 second" string(31) "time() difference less 1 second"
\ No newline at end of file diff --git a/ext/date/tests/bug48678.phpt b/ext/date/tests/bug48678.phpt index 9565cb2dfb..4f3b51d5b1 100644 --- a/ext/date/tests/bug48678.phpt +++ b/ext/date/tests/bug48678.phpt @@ -6,7 +6,7 @@ $x = new DateInterval("P3Y6M4DT12H30M5S"); print_r($x); $y = unserialize(serialize($x)); print_r($y); ---EXPECTF-- +--EXPECT-- DateInterval Object ( [y] => 3 diff --git a/ext/date/tests/bug51819.phpt b/ext/date/tests/bug51819.phpt index 37cab2055e..a5f21abf85 100644 --- a/ext/date/tests/bug51819.phpt +++ b/ext/date/tests/bug51819.phpt @@ -30,5 +30,5 @@ foreach ($aTz as $sTz) { var_dump('this should be the only output'); ?> ---EXPECTF-- +--EXPECT-- string(30) "this should be the only output" diff --git a/ext/date/tests/bug51994.phpt b/ext/date/tests/bug51994.phpt index 2c456ba6e3..dd7f9032c5 100644 --- a/ext/date/tests/bug51994.phpt +++ b/ext/date/tests/bug51994.phpt @@ -6,7 +6,7 @@ $trans_date = '10153'; // 152nd day of year 2010 -> 03.06.2010 $a_date = date_parse_from_format('yz', $trans_date); var_dump($a_date); ?> ---EXPECTF-- +--EXPECT-- array(12) { ["year"]=> int(2010) diff --git a/ext/date/tests/bug52063.phpt b/ext/date/tests/bug52063.phpt index 7364a80612..9818c88ce7 100644 --- a/ext/date/tests/bug52063.phpt +++ b/ext/date/tests/bug52063.phpt @@ -10,6 +10,6 @@ $a = date_create("2009-01-01", null); echo $a->format(DateTime::COOKIE); echo "\n"; ?> ---EXPECTF-- +--EXPECT-- Thursday, 01-Jan-2009 00:00:00 WET Thursday, 01-Jan-2009 00:00:00 WET diff --git a/ext/date/tests/bug52290.phpt b/ext/date/tests/bug52290.phpt index 78ede1387c..735df6ad18 100644 --- a/ext/date/tests/bug52290.phpt +++ b/ext/date/tests/bug52290.phpt @@ -20,7 +20,7 @@ var_dump($dt->format('o-\WW-N | Y-m-d | H:i:s | U')); $dt->setTime(20, 30, 40); var_dump($dt->format('o-\WW-N | Y-m-d | H:i:s | U')); ?> ---EXPECTF-- +--EXPECT-- string(47) "2005-W52-7 | 2006-01-01 | 00:00:00 | 1136073600" string(47) "2005-W52-1 | 2005-12-26 | 00:00:00 | 1135555200" string(47) "2007-W41-3 | 2007-10-10 | 00:00:00 | 1191974400" diff --git a/ext/date/tests/bug53879.phpt b/ext/date/tests/bug53879.phpt index 3fd8250415..30dbb693e7 100644 --- a/ext/date/tests/bug53879.phpt +++ b/ext/date/tests/bug53879.phpt @@ -7,7 +7,7 @@ date.timezone=UTC $date = DateTime::createFromFormat(DateTime::COOKIE, "Mon, 21-Jan-2041 15:24:52 GMT"); print_r($date); ?> ---EXPECTF-- +--EXPECT-- DateTime Object ( [date] => 2041-01-21 15:24:52.000000 diff --git a/ext/date/tests/bug54283.phpt b/ext/date/tests/bug54283.phpt index 780d0fa762..9a8a07ce5a 100644 --- a/ext/date/tests/bug54283.phpt +++ b/ext/date/tests/bug54283.phpt @@ -10,5 +10,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- string(51) "DatePeriod::__construct(): Unknown or bad format ()" diff --git a/ext/date/tests/bug55407.phpt b/ext/date/tests/bug55407.phpt index 7180d2f37f..c4638c94b3 100644 --- a/ext/date/tests/bug55407.phpt +++ b/ext/date/tests/bug55407.phpt @@ -13,5 +13,5 @@ class DateTime extends \DateTime { echo "DONE\n"; ?> ---EXPECTF-- +--EXPECT-- DONE diff --git a/ext/date/tests/bug61642.phpt b/ext/date/tests/bug61642.phpt index d03a814d88..872ceb4f3e 100644 --- a/ext/date/tests/bug61642.phpt +++ b/ext/date/tests/bug61642.phpt @@ -34,7 +34,7 @@ foreach ($weekdays as $days) { echo implode(' ', $line), "\n"; } ?> ---EXPECTF-- +--EXPECT-- ### 2012-03-29 Thu 2012-03-30 Fri 2012-03-31 Sat 2012-04-01 Sun 2012-04-02 Mon 2012-04-03 Tue 2012-04-04 Wed 2012-04-05 Thu -11 2012-03-14 Wed 2012-03-15 Thu 2012-03-16 Fri 2012-03-16 Fri 2012-03-16 Fri 2012-03-19 Mon 2012-03-20 Tue 2012-03-21 Wed diff --git a/ext/date/tests/bug67118_2.phpt b/ext/date/tests/bug67118_2.phpt index 9b6f545525..fcd7037868 100644 --- a/ext/date/tests/bug67118_2.phpt +++ b/ext/date/tests/bug67118_2.phpt @@ -21,7 +21,7 @@ $date = '12 Sep 2007 15:49:12 UT'; var_dump(new Foo($date)); ?> Done ---EXPECTF-- +--EXPECT-- First try Second try object(Foo)#1 (3) { diff --git a/ext/date/tests/bug74080.phpt b/ext/date/tests/bug74080.phpt index 3c881edeec..a86c78144e 100644 --- a/ext/date/tests/bug74080.phpt +++ b/ext/date/tests/bug74080.phpt @@ -7,5 +7,5 @@ $date = mktime(17, 52, 13, 4, 30, 2016); var_dump(date(\DateTime::RFC7231, $date)); ?> ---EXPECTF-- +--EXPECT-- string(29) "Sat, 30 Apr 2016 17:52:13 GMT" diff --git a/ext/date/tests/bug75222.phpt b/ext/date/tests/bug75222.phpt index 2a2ee5ff21..dc9ad22ea8 100644 --- a/ext/date/tests/bug75222.phpt +++ b/ext/date/tests/bug75222.phpt @@ -11,7 +11,7 @@ var_dump($diff->f); var_dump(get_object_vars($diff)['f']); var_dump($diff->f === get_object_vars($diff)['f']); ?> ---EXPECTF-- +--EXPECT-- float(0.123456) float(0.123456) bool(true) diff --git a/ext/date/tests/date_add_basic.phpt b/ext/date/tests/date_add_basic.phpt index 14a3d832bb..38d7ed76e2 100644 --- a/ext/date/tests/date_add_basic.phpt +++ b/ext/date/tests/date_add_basic.phpt @@ -35,7 +35,7 @@ foreach($intervals as $interval) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_add() : basic functionality *** string(19) "2008-01-01 12:25:00" string(19) "2011-07-06 00:55:05" diff --git a/ext/date/tests/date_date_set_basic1.phpt b/ext/date/tests/date_date_set_basic1.phpt index 64802125f6..831a862d0c 100644 --- a/ext/date/tests/date_date_set_basic1.phpt +++ b/ext/date/tests/date_date_set_basic1.phpt @@ -23,7 +23,7 @@ echo date_format($datetime, DATE_RFC2822) . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_date_set() : basic functionality *** Fri, 30 Jan 2009 19:34:10 +0000 Fri, 01 Feb 2008 19:34:10 +0000 diff --git a/ext/date/tests/date_default_timezone_get-1-win32.phpt b/ext/date/tests/date_default_timezone_get-1-win32.phpt index fbd5c6d856..73003fb689 100644 --- a/ext/date/tests/date_default_timezone_get-1-win32.phpt +++ b/ext/date/tests/date_default_timezone_get-1-win32.phpt @@ -16,6 +16,6 @@ date.timezone= from the multiple names like Europe/Berlin or Europe/Paris . For this reason the test is parametrized so there is no hardcoded timezone data.*/ ?> ---EXPECTF-- +--EXPECT-- UTC UTC diff --git a/ext/date/tests/date_default_timezone_get-2.phpt b/ext/date/tests/date_default_timezone_get-2.phpt index b2f4b8232f..5c835c35f3 100644 --- a/ext/date/tests/date_default_timezone_get-2.phpt +++ b/ext/date/tests/date_default_timezone_get-2.phpt @@ -11,5 +11,5 @@ date.timezone= putenv('TZ='); echo date_default_timezone_get(), "\n"; ?> ---EXPECTF-- +--EXPECT-- UTC diff --git a/ext/date/tests/date_format_basic1.phpt b/ext/date/tests/date_format_basic1.phpt index dc55efb0ae..dc2a84a9b1 100644 --- a/ext/date/tests/date_format_basic1.phpt +++ b/ext/date/tests/date_format_basic1.phpt @@ -26,7 +26,7 @@ var_dump( date_format($date, "H:i:s") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_format() : basic functionality *** string(23) "July 14, 2005, 10:30 pm" string(8) "07.14.05" diff --git a/ext/date/tests/date_interval_create_from_date_string.phpt b/ext/date/tests/date_interval_create_from_date_string.phpt index 9a1745c9ac..318bf3d629 100644 --- a/ext/date/tests/date_interval_create_from_date_string.phpt +++ b/ext/date/tests/date_interval_create_from_date_string.phpt @@ -25,7 +25,7 @@ $i = date_interval_create_from_date_string($string); var_dump($i->y); var_dump($i->d); ?> ---EXPECTF-- +--EXPECT-- int(1) int(14) int(3) diff --git a/ext/date/tests/date_interval_format.phpt b/ext/date/tests/date_interval_format.phpt index 768fe46b6a..801dd4e97d 100644 --- a/ext/date/tests/date_interval_format.phpt +++ b/ext/date/tests/date_interval_format.phpt @@ -16,6 +16,6 @@ $interval = new DateInterval('P32D'); echo date_interval_format($interval, '%d days'); ?> ---EXPECTF-- +--EXPECT-- 4 days 32 days diff --git a/ext/date/tests/date_isodate_set_basic1.phpt b/ext/date/tests/date_isodate_set_basic1.phpt index dc8daba533..2764ce8dba 100644 --- a/ext/date/tests/date_isodate_set_basic1.phpt +++ b/ext/date/tests/date_isodate_set_basic1.phpt @@ -30,7 +30,7 @@ echo "..same day last year was \"" . date_format($datetime, "D M j") . "\"\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_isodate_set() : basic functionality *** Week 40 of 2009 is in "September" Week 30 day 3 of 2009 is "Wed Jul 22" diff --git a/ext/date/tests/date_modify_basic1.phpt b/ext/date/tests/date_modify_basic1.phpt index 038b94ce08..42e0ebf60d 100644 --- a/ext/date/tests/date_modify_basic1.phpt +++ b/ext/date/tests/date_modify_basic1.phpt @@ -30,7 +30,7 @@ echo "After modification 4: " . date_format($datetime, "D, d M Y") . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_modify() : basic functionality *** After modification 1: Sun, 01 Feb 2009 After modification 2: Tue, 10 Feb 2009 18:28:43 diff --git a/ext/date/tests/date_offset_get_basic1.phpt b/ext/date/tests/date_offset_get_basic1.phpt index 42f38939e8..ec6fb16350 100644 --- a/ext/date/tests/date_offset_get_basic1.phpt +++ b/ext/date/tests/date_offset_get_basic1.phpt @@ -21,7 +21,7 @@ echo "Summer offset: " . date_offset_get($summer) / 3600 . " hours\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_offset_get() : basic functionality *** Winter offset: 0 hours Summer offset: 1 hours diff --git a/ext/date/tests/date_sub_basic.phpt b/ext/date/tests/date_sub_basic.phpt index 0e12704945..00e9626198 100644 --- a/ext/date/tests/date_sub_basic.phpt +++ b/ext/date/tests/date_sub_basic.phpt @@ -35,7 +35,7 @@ foreach($intervals as $interval) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_sub() : basic functionality *** string(19) "2008-01-01 12:25:00" string(19) "2004-06-26 23:54:55" diff --git a/ext/date/tests/date_sun_info_001.phpt b/ext/date/tests/date_sun_info_001.phpt index 44b6d112e4..35ca37ae98 100644 --- a/ext/date/tests/date_sun_info_001.phpt +++ b/ext/date/tests/date_sun_info_001.phpt @@ -7,7 +7,7 @@ $sun_info = date_sun_info(strtotime("2006-12-12"), 31.7667, 35.2333); var_dump($sun_info); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(9) { ["sunrise"]=> int(1165897761) diff --git a/ext/date/tests/date_sun_info_002.phpt b/ext/date/tests/date_sun_info_002.phpt index 4df725187d..73956cc46a 100644 --- a/ext/date/tests/date_sun_info_002.phpt +++ b/ext/date/tests/date_sun_info_002.phpt @@ -10,7 +10,7 @@ foreach ($sun_info as $key => $elem ) } echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 2007-04-13 06:13:31 CEST sunrise 2007-04-13 20:30:51 CEST sunset 2007-04-13 13:22:11 CEST transit diff --git a/ext/date/tests/date_sun_info_003.phpt b/ext/date/tests/date_sun_info_003.phpt index 7e18d2da41..7e74bab621 100644 --- a/ext/date/tests/date_sun_info_003.phpt +++ b/ext/date/tests/date_sun_info_003.phpt @@ -19,7 +19,7 @@ foreach ($sun_info as $key => $elem ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- sunrise: 21:00:00 sunset: 21:00:00 transit: 10:03:48 diff --git a/ext/date/tests/date_sunrise_variation7.phpt b/ext/date/tests/date_sunrise_variation7.phpt index 6e9c2ec83b..3993ca6a8b 100644 --- a/ext/date/tests/date_sunrise_variation7.phpt +++ b/ext/date/tests/date_sunrise_variation7.phpt @@ -34,7 +34,7 @@ foreach($inputs as $timezone => $value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_sunrise() : usage variation *** string(5) "06:42" string(5) "06:41" diff --git a/ext/date/tests/date_sunrise_variation8.phpt b/ext/date/tests/date_sunrise_variation8.phpt index 1d22be8c8c..fe8aefeb9f 100644 --- a/ext/date/tests/date_sunrise_variation8.phpt +++ b/ext/date/tests/date_sunrise_variation8.phpt @@ -36,7 +36,7 @@ foreach( $time_date as $date => $time ){ ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_sunrise() : usage variation *** --12 Aug 2008-- diff --git a/ext/date/tests/date_sunset_variation7.phpt b/ext/date/tests/date_sunset_variation7.phpt index 67bd2f4182..00d836dcbe 100644 --- a/ext/date/tests/date_sunset_variation7.phpt +++ b/ext/date/tests/date_sunset_variation7.phpt @@ -34,7 +34,7 @@ foreach($inputs as $timezone => $value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_sunset() : usage variation *** --Pacific/Samoa-- diff --git a/ext/date/tests/date_sunset_variation8.phpt b/ext/date/tests/date_sunset_variation8.phpt index 07319ab4e1..dcccfaccb6 100644 --- a/ext/date/tests/date_sunset_variation8.phpt +++ b/ext/date/tests/date_sunset_variation8.phpt @@ -36,7 +36,7 @@ foreach( $time_date as $date => $time ){ ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_sunset() : usage variation *** --12 Aug 2008-- diff --git a/ext/date/tests/date_time_set_basic1.phpt b/ext/date/tests/date_time_set_basic1.phpt index c0c9c66c56..9c1a025d47 100644 --- a/ext/date/tests/date_time_set_basic1.phpt +++ b/ext/date/tests/date_time_set_basic1.phpt @@ -35,7 +35,7 @@ echo "After modification5 " . date_format($datetime, DATE_RFC2822) . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_time_set() : basic functionality *** Initial date: Sat, 31 Jan 2009 15:14:10 +0000 After modification1 Sat, 31 Jan 2009 17:20:00 +0000 diff --git a/ext/date/tests/date_timestamp_set.phpt b/ext/date/tests/date_timestamp_set.phpt index e01660193f..24546ee2ad 100644 --- a/ext/date/tests/date_timestamp_set.phpt +++ b/ext/date/tests/date_timestamp_set.phpt @@ -15,5 +15,5 @@ date_timestamp_set($dtms021, 1234567890); var_dump(date_format($dtms021, 'B => (U) => T Y-M-d H:i:s')); ?> ---EXPECTF-- +--EXPECT-- string(47) "021 => (1234567890) => UTC 2009-Feb-13 23:31:30"
\ No newline at end of file diff --git a/ext/date/tests/date_timestamp_set_nullparam2.phpt b/ext/date/tests/date_timestamp_set_nullparam2.phpt index 1442da4426..8983cc4e2d 100644 --- a/ext/date/tests/date_timestamp_set_nullparam2.phpt +++ b/ext/date/tests/date_timestamp_set_nullparam2.phpt @@ -13,7 +13,7 @@ $dtms021 = date_create(); var_dump(date_timestamp_set($dtms021, null)); ?> ---EXPECTF-- +--EXPECT-- object(DateTime)#1 (3) { ["date"]=> string(26) "1970-01-01 00:00:00.000000" diff --git a/ext/date/tests/date_timezone_get_basic1.phpt b/ext/date/tests/date_timezone_get_basic1.phpt index f77352ef8f..7e86036ada 100644 --- a/ext/date/tests/date_timezone_get_basic1.phpt +++ b/ext/date/tests/date_timezone_get_basic1.phpt @@ -27,7 +27,7 @@ var_dump( timezone_name_get($tz) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_timezone_get() : basic functionality *** string(13) "Europe/London" string(16) "America/New_York" diff --git a/ext/date/tests/date_timezone_set_basic1.phpt b/ext/date/tests/date_timezone_set_basic1.phpt index 2e9154cebe..6df429b3a9 100644 --- a/ext/date/tests/date_timezone_set_basic1.phpt +++ b/ext/date/tests/date_timezone_set_basic1.phpt @@ -26,7 +26,7 @@ echo "New timezone: " . timezone_name_get($tz) . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_timezone_set() : basic functionality *** Default timezone: Europe/London New timezone: America/Los_Angeles diff --git a/ext/date/tests/getdate_variation2.phpt b/ext/date/tests/getdate_variation2.phpt index f987d2134d..bd3b6d5779 100644 --- a/ext/date/tests/getdate_variation2.phpt +++ b/ext/date/tests/getdate_variation2.phpt @@ -31,7 +31,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getdate() : usage variation *** --octal 05-- diff --git a/ext/date/tests/getdate_variation3.phpt b/ext/date/tests/getdate_variation3.phpt index f7d6863208..7001237d0a 100644 --- a/ext/date/tests/getdate_variation3.phpt +++ b/ext/date/tests/getdate_variation3.phpt @@ -31,7 +31,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getdate() : usage variation *** --hexadcimal 0x5-- diff --git a/ext/date/tests/getdate_variation4.phpt b/ext/date/tests/getdate_variation4.phpt index 92719ac650..59c1681cd7 100644 --- a/ext/date/tests/getdate_variation4.phpt +++ b/ext/date/tests/getdate_variation4.phpt @@ -32,7 +32,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getdate() : usage variation *** --01 Jan 1970-- diff --git a/ext/date/tests/getdate_variation5.phpt b/ext/date/tests/getdate_variation5.phpt index e4524a8659..9cf29a2fc8 100644 --- a/ext/date/tests/getdate_variation5.phpt +++ b/ext/date/tests/getdate_variation5.phpt @@ -36,7 +36,7 @@ foreach($inputs as $timezone) { }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getdate() : usage variation *** --Pacific/Samoa-- diff --git a/ext/date/tests/getdate_variation6.phpt b/ext/date/tests/getdate_variation6.phpt index 5c03a3bb71..64943ce864 100644 --- a/ext/date/tests/getdate_variation6.phpt +++ b/ext/date/tests/getdate_variation6.phpt @@ -26,7 +26,7 @@ foreach($inputs as $key => $value) { }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getdate() : usage variation *** --String 0-- diff --git a/ext/date/tests/gmmktime_variation8.phpt b/ext/date/tests/gmmktime_variation8.phpt index b0c56a127b..dac3ecfe99 100644 --- a/ext/date/tests/gmmktime_variation8.phpt +++ b/ext/date/tests/gmmktime_variation8.phpt @@ -33,7 +33,7 @@ echo "\n-- Testing gmmktime() function with supplying hexa decimal values to arg var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing gmmktime() : usage variation *** -- Testing gmmktime() function with supplying octal values to arguments -- diff --git a/ext/date/tests/gmstrftime_variation19.phpt b/ext/date/tests/gmstrftime_variation19.phpt index 9ba714750e..78af097cbd 100644 --- a/ext/date/tests/gmstrftime_variation19.phpt +++ b/ext/date/tests/gmstrftime_variation19.phpt @@ -37,7 +37,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing gmstrftime() : usage variation *** --Newline character-- diff --git a/ext/date/tests/gmstrftime_variation8.phpt b/ext/date/tests/gmstrftime_variation8.phpt index 59057aa173..0d3f6b0632 100644 --- a/ext/date/tests/gmstrftime_variation8.phpt +++ b/ext/date/tests/gmstrftime_variation8.phpt @@ -30,7 +30,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing gmstrftime() : usage variation *** --A literal % character-- diff --git a/ext/date/tests/idate_variation6.phpt b/ext/date/tests/idate_variation6.phpt index 161a80d511..bc02e275af 100644 --- a/ext/date/tests/idate_variation6.phpt +++ b/ext/date/tests/idate_variation6.phpt @@ -23,7 +23,7 @@ $timestamp = mktime(8, 8, 8, 8, 8, 2001); var_dump( idate($format, $timestamp) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing idate() : usage variation *** -- Testing idate() function for 2 digit year having no zero as starting number -- diff --git a/ext/date/tests/localtime_variation4.phpt b/ext/date/tests/localtime_variation4.phpt index 2796c22d5b..5eedb7a3f6 100644 --- a/ext/date/tests/localtime_variation4.phpt +++ b/ext/date/tests/localtime_variation4.phpt @@ -31,7 +31,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing localtime() : usage variation *** --Octal 0-- diff --git a/ext/date/tests/localtime_variation5.phpt b/ext/date/tests/localtime_variation5.phpt index 883e34887b..cd48a162af 100644 --- a/ext/date/tests/localtime_variation5.phpt +++ b/ext/date/tests/localtime_variation5.phpt @@ -31,7 +31,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing localtime() : usage variation *** --Hexa-decimal 0-- diff --git a/ext/date/tests/strftime_variation19.phpt b/ext/date/tests/strftime_variation19.phpt index f36d0a189e..49fe1c1f1c 100644 --- a/ext/date/tests/strftime_variation19.phpt +++ b/ext/date/tests/strftime_variation19.phpt @@ -37,7 +37,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strftime() : usage variation *** --Newline character-- diff --git a/ext/date/tests/strftime_variation8.phpt b/ext/date/tests/strftime_variation8.phpt index af8089f980..2dd50931e6 100644 --- a/ext/date/tests/strftime_variation8.phpt +++ b/ext/date/tests/strftime_variation8.phpt @@ -22,7 +22,7 @@ var_dump( strftime($format, $timestamp) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strftime() : usage variation *** -- Testing strftime() function with a literal % character to format -- diff --git a/ext/date/tests/timezone_abbreviations_list_basic1.phpt b/ext/date/tests/timezone_abbreviations_list_basic1.phpt index c3510f1e64..e5f2f6d718 100644 --- a/ext/date/tests/timezone_abbreviations_list_basic1.phpt +++ b/ext/date/tests/timezone_abbreviations_list_basic1.phpt @@ -23,7 +23,7 @@ var_dump( $abbr["acst"] ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing timezone_abbreviations_list() : basic functionality *** string(5) "array" int(142) diff --git a/ext/date/tests/timezone_identifiers_list_basic1.phpt b/ext/date/tests/timezone_identifiers_list_basic1.phpt index 4476da20dd..474c56c213 100644 --- a/ext/date/tests/timezone_identifiers_list_basic1.phpt +++ b/ext/date/tests/timezone_identifiers_list_basic1.phpt @@ -24,7 +24,7 @@ var_dump(in_array("UTC", $zones)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing timezone_identifiers_list() : basic functionality *** Check return tpe is ARRAY bool(true) diff --git a/ext/date/tests/timezone_name_from_abbr_basic1.phpt b/ext/date/tests/timezone_name_from_abbr_basic1.phpt index b6a0bd94f7..1a7ea5e4cf 100644 --- a/ext/date/tests/timezone_name_from_abbr_basic1.phpt +++ b/ext/date/tests/timezone_name_from_abbr_basic1.phpt @@ -36,7 +36,7 @@ var_dump( timezone_name_from_abbr("", 5400) ); // offset = 1.5 hrs var_dump( timezone_name_from_abbr("", 62400) ); // offset = 24 hrs ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing timezone_name_from_abbr() : basic functionality *** -- Tests with special cases first - no lookup needed -- string(3) "UTC" diff --git a/ext/date/tests/timezone_offset_get_variation1.phpt b/ext/date/tests/timezone_offset_get_variation1.phpt index ad0b8fd956..1aeab06c5c 100644 --- a/ext/date/tests/timezone_offset_get_variation1.phpt +++ b/ext/date/tests/timezone_offset_get_variation1.phpt @@ -119,7 +119,7 @@ fclose( $file_handle ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing timezone_offset_get() : usage variation - unexpected values to first argument $object*** -- int 0 -- diff --git a/ext/date/tests/timezone_offset_get_variation2.phpt b/ext/date/tests/timezone_offset_get_variation2.phpt index 64835500c4..3bb8e69823 100644 --- a/ext/date/tests/timezone_offset_get_variation2.phpt +++ b/ext/date/tests/timezone_offset_get_variation2.phpt @@ -119,7 +119,7 @@ fclose( $file_handle ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing timezone_offset_get() : usage variation - unexpected values to second argument $datetime*** -- int 0 -- |