diff options
Diffstat (limited to 'ext/date')
30 files changed, 61 insertions, 538 deletions
diff --git a/ext/date/tests/005.phpt b/ext/date/tests/005.phpt index e1075ef248..23fff3b731 100644 --- a/ext/date/tests/005.phpt +++ b/ext/date/tests/005.phpt @@ -6,9 +6,6 @@ date_default_timezone_set('UTC'); $t = mktime(0,0,0, 6, 27, 2006); -var_dump(idate()); -var_dump(idate(1,1,1)); - var_dump(idate(1,1)); var_dump(idate("")); var_dump(idate(0)); @@ -20,12 +17,6 @@ var_dump(idate("'")); echo "Done\n"; ?> --EXPECTF-- -Warning: idate() expects at least 1 parameter, 0 given in %s on line %d -bool(false) - -Warning: idate() expects at most 2 parameters, 3 given in %s on line %d -bool(false) - Warning: idate(): Unrecognized date format token. in %s on line %d bool(false) diff --git a/ext/date/tests/006.phpt b/ext/date/tests/006.phpt index 425430a470..5171c430e2 100644 --- a/ext/date/tests/006.phpt +++ b/ext/date/tests/006.phpt @@ -4,7 +4,6 @@ checkdate() tests <?php date_default_timezone_set('UTC'); -var_dump(checkdate()); var_dump(checkdate(1,1,1)); var_dump(checkdate(2,29,2006)); @@ -18,9 +17,7 @@ var_dump(checkdate(1,1,-1)); echo "Done\n"; ?> ---EXPECTF-- -Warning: checkdate() expects exactly 3 parameters, 0 given in %s on line %d -bool(false) +--EXPECT-- bool(true) bool(false) bool(false) diff --git a/ext/date/tests/007.phpt b/ext/date/tests/007.phpt index 141e251753..4e0b24ce75 100644 --- a/ext/date/tests/007.phpt +++ b/ext/date/tests/007.phpt @@ -5,7 +5,6 @@ localtime() tests date_default_timezone_set('UTC'); $t = mktime(0,0,0, 6, 27, 2006); -var_dump(localtime(1,1,1)); var_dump(localtime()); var_dump(localtime($t)); @@ -15,8 +14,6 @@ var_dump(localtime($t, false)); echo "Done\n"; ?> --EXPECTF-- -Warning: localtime() expects at most 2 parameters, 3 given in %s on line %d -bool(false) array(9) { [0]=> int(%d) diff --git a/ext/date/tests/008.phpt b/ext/date/tests/008.phpt index e67b4bd0a4..701403d1f8 100644 --- a/ext/date/tests/008.phpt +++ b/ext/date/tests/008.phpt @@ -5,7 +5,6 @@ getdate() tests date_default_timezone_set('UTC'); $t = mktime(0,0,0, 6, 27, 2006); -var_dump(getdate(1,1)); var_dump(getdate($t)); var_dump(getdate()); @@ -13,8 +12,6 @@ var_dump(getdate()); echo "Done\n"; ?> --EXPECTF-- -Warning: getdate() expects at most 1 parameter, 2 given in %s on line %d -bool(false) array(11) { ["seconds"]=> int(0) diff --git a/ext/date/tests/009.phpt b/ext/date/tests/009.phpt index ae8011eebd..40d5c5f72b 100644 --- a/ext/date/tests/009.phpt +++ b/ext/date/tests/009.phpt @@ -11,16 +11,12 @@ date_default_timezone_set('Asia/Jerusalem'); $t = mktime(0,0,0, 6, 27, 2006); -var_dump(strftime()); - var_dump(strftime("")); var_dump(strftime("%a %A %b %B %c %C %d %D %e %g %G %h %H %I %j %m %M %n %p %r %R %S %t %T %u %U %V %W %w %x %X %y %Y %Z %z %%", $t)); var_dump(strftime("%%q %%a", $t)); var_dump(strftime("%q", $t)); var_dump(strftime("blah", $t)); -var_dump(gmstrftime()); - var_dump(gmstrftime("")); var_dump(gmstrftime("%a %A %b %B %c %C %d %D %e %g %G %h %H %I %j %m %M %n %p %r %R %S %t %T %u %U %V %W %w %x %X %y %Y %Z %z %%", $t)); var_dump(gmstrftime("%%q %%a", $t)); @@ -30,17 +26,12 @@ var_dump(gmstrftime("blah", $t)); echo "Done\n"; ?> --EXPECTF-- -Warning: strftime() expects at least 1 parameter, 0 given in %s on line %d -bool(false) bool(false) string(%d) "Tue Tuesday Jun June Tue Jun 27 00:00:00 2006 %s %s %" string(5) "%q %a" string(%d) "%s" string(4) "blah" - -Warning: gmstrftime() expects at least 1 parameter, 0 given in %s on line %d -bool(false) bool(false) string(%d) "Mon Monday Jun June Mon Jun 26 21:00:00 2006 %s %s %" diff --git a/ext/date/tests/009_win32.phpt b/ext/date/tests/009_win32.phpt index 3da5b35c81..63ad623b18 100644 --- a/ext/date/tests/009_win32.phpt +++ b/ext/date/tests/009_win32.phpt @@ -15,8 +15,6 @@ setlocale(LC_TIME, "en-us"); $t = mktime(0,0,0, 6, 27, 2006); -var_dump(strftime()); - var_dump(strftime("")); var_dump(strftime("%a %A %b %B %c %d %H %I %j %m %M %p %S %U %W %w %x %X %y %Y %Z %z %%", $t)); @@ -25,8 +23,6 @@ var_dump(strftime("%%q %%a", $t)); var_dump(strftime("blah", $t)); -var_dump(gmstrftime()); - var_dump(gmstrftime("")); var_dump(gmstrftime("%a %A %b %B %c %d %H %I %j %m %M %p %S %U %W %w %x %X %y %Y %Z %z %%", $t)); @@ -40,15 +36,10 @@ echo "Done\n"; setlocale(LC_TIME, $loc); ?> --EXPECTF-- -Warning: strftime() expects at least 1 parameter, 0 given in %s on line %d -bool(false) bool(false) string(%d) "Tue Tuesday Jun June 6/27/2006 12:00:00 AM 27 00 12 178 06 00 AM 00 26 26 2 6/27/2006 12:00:00 AM 06 2006 %s" string(5) "%q %a" string(4) "blah" - -Warning: gmstrftime() expects at least 1 parameter, 0 given in %s on line %d -bool(false) bool(false) string(%d) "Mon Monday Jun June 6/26/2006 9:00:00 PM 26 21 09 177 06 00 PM 00 26 26 1 6/26/2006 9:00:00 PM 06 2006 %s" string(5) "%q %a" diff --git a/ext/date/tests/011.phpt b/ext/date/tests/011.phpt index 092a4b7758..ca9820c4ef 100644 --- a/ext/date/tests/011.phpt +++ b/ext/date/tests/011.phpt @@ -4,7 +4,6 @@ timezone_name_from_abbr() tests <?php date_default_timezone_set('UTC'); -var_dump(timezone_name_from_abbr()); var_dump(timezone_name_from_abbr("CET")); var_dump(timezone_name_from_abbr("AXST")); var_dump(timezone_name_from_abbr("", 3600)); @@ -12,9 +11,7 @@ var_dump(timezone_name_from_abbr("", 3600, 0)); echo "Done\n"; ?> ---EXPECTF-- -Warning: timezone_name_from_abbr() expects at least 1 parameter, 0 given in %s on line %d -bool(false) +--EXPECT-- string(13) "Europe/Berlin" bool(false) bool(false) diff --git a/ext/date/tests/012.phpt b/ext/date/tests/012.phpt index be7e4e32af..ee8faf1c00 100644 --- a/ext/date/tests/012.phpt +++ b/ext/date/tests/012.phpt @@ -7,15 +7,10 @@ date_default_timezone_set('UTC'); $dto = date_create("2006-12-12"); var_dump(date_isodate_set($dto, 2006, 2, 15)); var_dump($dto->format("Y/m/d H:i:s")); -var_dump(date_isodate_set($dto, 2006)); -var_dump($dto->format("Y/m/d H:i:s")); var_dump(date_isodate_set($dto, 2006, 5)); var_dump($dto->format("Y/m/d H:i:s")); var_dump(date_isodate_set($dto, 2006, 100, 15)); var_dump($dto->format("Y/m/d H:i:s")); -var_dump(date_isodate_set($dto, 2006, 100, 15, 10)); -var_dump($dto->format("Y/m/d H:i:s")); - echo "Done\n"; ?> --EXPECTF-- @@ -28,10 +23,6 @@ object(DateTime)#1 (3) { string(3) "UTC" } string(19) "2006/01/23 00:00:00" - -Warning: date_isodate_set() expects at least 3 parameters, 2 given in %s on line %d -bool(false) -string(19) "2006/01/23 00:00:00" object(DateTime)#1 (3) { ["date"]=> string(26) "2006-01-30 00:00:00.000000" @@ -50,8 +41,4 @@ object(DateTime)#1 (3) { string(3) "UTC" } string(19) "2007/12/10 00:00:00" - -Warning: date_isodate_set() expects at most 4 parameters, 5 given in %s on line %d -bool(false) -string(19) "2007/12/10 00:00:00" Done diff --git a/ext/date/tests/013.phpt b/ext/date/tests/013.phpt index 266dafe06a..6010071be6 100644 --- a/ext/date/tests/013.phpt +++ b/ext/date/tests/013.phpt @@ -7,10 +7,6 @@ date_default_timezone_set('UTC'); $dto = date_create("2006-12-12"); var_dump($dto); var_dump($dto->format("Y.m.d H:i:s")); -var_dump(date_date_set()); -var_dump($dto->format("Y.m.d H:i:s")); -var_dump(date_date_set($dto, 2006, 5)); -var_dump($dto->format("Y.m.d H:i:s")); var_dump(date_date_set($dto, 2006, 2, 15)); var_dump($dto->format("Y.m.d H:i:s")); var_dump(date_date_set($dto, 2006, 24, 60)); @@ -28,14 +24,6 @@ object(DateTime)#%d (3) { string(3) "UTC" } string(19) "2006.12.12 00:00:00" - -Warning: date_date_set() expects exactly 4 parameters, 0 given in %s on line %d -bool(false) -string(19) "2006.12.12 00:00:00" - -Warning: date_date_set() expects exactly 4 parameters, 3 given in %s on line %d -bool(false) -string(19) "2006.12.12 00:00:00" object(DateTime)#1 (3) { ["date"]=> string(26) "2006-02-15 00:00:00.000000" diff --git a/ext/date/tests/014.phpt b/ext/date/tests/014.phpt index 2e72bdabe0..5c1c061e75 100644 --- a/ext/date/tests/014.phpt +++ b/ext/date/tests/014.phpt @@ -10,7 +10,6 @@ var_dump($dto); $dtz = date_timezone_get($dto); var_dump($dtz); -var_dump(timezone_offset_get()); var_dump(timezone_offset_get($dtz, $dto)); var_dump(timezone_offset_get($dto, $dtz)); @@ -32,9 +31,6 @@ object(DateTimeZone)#%d (2) { ["timezone"]=> string(3) "UTC" } - -Warning: timezone_offset_get() expects exactly 2 parameters, 0 given in %s on line %d -bool(false) int(0) Fatal error: Uncaught TypeError: Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of DateTime given in %s:%d diff --git a/ext/date/tests/68062.phpt b/ext/date/tests/68062.phpt index 6b1e16ae67..1270382158 100644 --- a/ext/date/tests/68062.phpt +++ b/ext/date/tests/68062.phpt @@ -6,8 +6,12 @@ DateTimeZone::getOffset() accepts a DateTimeInterface object $tz = new DateTimeZone('Europe/London'); $dt = new DateTimeImmutable('2014-09-20', $tz); -echo $tz->getOffset($dt); -echo $tz->getOffset(1); ---EXPECTF-- +echo $tz->getOffset($dt), "\n"; +try { + echo $tz->getOffset(1); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} +--EXPECT-- 3600 -Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, int given in %s +DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, int given diff --git a/ext/date/tests/DateTimeImmutable_createFromMutable.phpt b/ext/date/tests/DateTimeImmutable_createFromMutable.phpt index ac92fb4bb4..671afc1229 100644 --- a/ext/date/tests/DateTimeImmutable_createFromMutable.phpt +++ b/ext/date/tests/DateTimeImmutable_createFromMutable.phpt @@ -1,5 +1,5 @@ --TEST-- -Tests for DateTimeImmutable::createFromMutable. +Tests for DateTimeImmutable::createFromMutable --INI-- date.timezone=Europe/London --FILE-- @@ -9,8 +9,11 @@ $current = "2014-03-02 16:24:08"; $i = DateTimeImmutable::createFromMutable( date_create( $current ) ); var_dump( $i ); -$i = DateTimeImmutable::createFromMutable( date_create_immutable( $current ) ); -var_dump( $i ); +try { + DateTimeImmutable::createFromMutable( date_create_immutable( $current ) ); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} ?> --EXPECTF-- object(DateTimeImmutable)#%d (3) { @@ -21,6 +24,4 @@ object(DateTimeImmutable)#%d (3) { ["timezone"]=> string(13) "Europe/London" } - -Warning: DateTimeImmutable::createFromMutable() expects parameter 1 to be DateTime, object given in %stests%eDateTimeImmutable_createFromMutable.php on line %d -NULL +DateTimeImmutable::createFromMutable() expects parameter 1 to be DateTime, object given diff --git a/ext/date/tests/DateTime_createFromImmutable.phpt b/ext/date/tests/DateTime_createFromImmutable.phpt index ee7731855a..841a3d4d33 100644 --- a/ext/date/tests/DateTime_createFromImmutable.phpt +++ b/ext/date/tests/DateTime_createFromImmutable.phpt @@ -14,8 +14,11 @@ $m->modify('+ 1 hour'); var_dump( $i->format('Y-m-d H:i:s') === $current ); -$m = DateTime::createFromImmutable( date_create( $current ) ); -var_dump( $m ); +try { + DateTime::createFromImmutable( date_create( $current ) ); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} ?> --EXPECTF-- object(DateTime)#%d (3) { @@ -27,6 +30,4 @@ object(DateTime)#%d (3) { string(13) "Europe/London" } bool(true) - -Warning: DateTime::createFromImmutable() expects parameter 1 to be DateTimeImmutable, object given in %stests%eDateTime_createFromImmutable.php on line %d -NULL +DateTime::createFromImmutable() expects parameter 1 to be DateTimeImmutable, object given diff --git a/ext/date/tests/bug36988.phpt b/ext/date/tests/bug36988.phpt index ab0f3a3c8a..691bb4a7e2 100644 --- a/ext/date/tests/bug36988.phpt +++ b/ext/date/tests/bug36988.phpt @@ -6,7 +6,11 @@ Bug #36988 (mktime freezes on long numbers) <?php date_default_timezone_set('GMT'); $start = microtime(true); -$a = mktime(1, 1, 1, 1, 1, 11111111111); +try { + $a = mktime(1, 1, 1, 1, 1, 11111111111); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} ?> ---EXPECTF-- -Warning: mktime() expects parameter 6 to be int, float given in %s on line %d +--EXPECT-- +mktime() expects parameter 6 to be int, float given diff --git a/ext/date/tests/bug52062.phpt b/ext/date/tests/bug52062.phpt index cbcccf84b9..b1f7f25d7b 100644 --- a/ext/date/tests/bug52062.phpt +++ b/ext/date/tests/bug52062.phpt @@ -13,7 +13,11 @@ var_dump($d->format('Y-m-d H:i:s U')); var_dump($d->getTimestamp()); var_dump($d->format('U')); -$d->setTimestamp(100000000000); +try { + $d->setTimestamp(100000000000); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} var_dump($d->format('Y-m-d H:i:s U')); var_dump($d->getTimestamp()); @@ -24,8 +28,7 @@ var_dump($i->format('%s')); string(32) "5138-11-16 09:46:40 100000000000" bool(false) string(12) "100000000000" - -Warning: DateTime::setTimestamp() expects parameter 1 to be int, float given in %s on line %d +DateTime::setTimestamp() expects parameter 1 to be int, float given string(32) "5138-11-16 09:46:40 100000000000" bool(false) string(10) "1215752192" diff --git a/ext/date/tests/bug70245.phpt b/ext/date/tests/bug70245.phpt index f754bf65a1..b480192326 100644 --- a/ext/date/tests/bug70245.phpt +++ b/ext/date/tests/bug70245.phpt @@ -3,8 +3,11 @@ Bug #70245 (strtotime does not emit warning when 2nd parameter is object or stri --FILE-- <?php $d = new DateTime('2011-01-15 00:00:00'); -var_dump(strtotime('-1 month', $d)); +try { + var_dump(strtotime('-1 month', $d)); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} ?> --EXPECTF-- -Warning: strtotime() expects parameter 2 to be int, object given in %sbug70245.php on line %d -bool(false) +strtotime() expects parameter 2 to be int, object given diff --git a/ext/date/tests/date_default_timezone_set_error.phpt b/ext/date/tests/date_default_timezone_set_error.phpt index 15c6aa6fed..24a851ff01 100644 --- a/ext/date/tests/date_default_timezone_set_error.phpt +++ b/ext/date/tests/date_default_timezone_set_error.phpt @@ -9,13 +9,6 @@ Test date_default_timezone_set() function : error variations echo "*** Testing date_default_timezone_set() : error variations ***\n"; -echo "\n-- Testing date_default_timezone_set() function with less than expected no. of arguments --\n"; -var_dump( date_default_timezone_set() ); - -echo "\n-- Testing date_default_timezone_set() function with more than expected no. of arguments --\n"; -$extra_arg = 10; -var_dump( date_default_timezone_set("GMT", $extra_arg) ); - echo "\n-- Testing date_default_timezone_set() function with invalid timezone identifier --\n"; var_dump( date_default_timezone_set("foo") ); @@ -24,16 +17,6 @@ var_dump( date_default_timezone_set("foo") ); --EXPECTF-- *** Testing date_default_timezone_set() : error variations *** --- Testing date_default_timezone_set() function with less than expected no. of arguments -- - -Warning: date_default_timezone_set() expects exactly 1 parameter, 0 given in %s on line %d -bool(false) - --- Testing date_default_timezone_set() function with more than expected no. of arguments -- - -Warning: date_default_timezone_set() expects exactly 1 parameter, 2 given in %s on line %d -bool(false) - -- Testing date_default_timezone_set() function with invalid timezone identifier -- Notice: date_default_timezone_set(): Timezone ID 'foo' is invalid in %s on line %d diff --git a/ext/date/tests/date_parse_001.phpt b/ext/date/tests/date_parse_001.phpt index b5c5ac0f48..0d58c1f8e9 100644 --- a/ext/date/tests/date_parse_001.phpt +++ b/ext/date/tests/date_parse_001.phpt @@ -12,7 +12,6 @@ Test basic date_parse() var_dump(date_parse("03-03")); var_dump(date_parse("0-0")); var_dump(date_parse("")); - var_dump(date_parse(array())); echo "Done\n"; ?> --EXPECTF-- @@ -298,7 +297,4 @@ array(12) { ["is_localtime"]=> bool(false) } - -Warning: date_parse() expects parameter 1 to be string, array given in %sdate_parse_001.php on line %d -bool(false) Done diff --git a/ext/date/tests/date_parse_error.phpt b/ext/date/tests/date_parse_error.phpt index 9f444bb435..dc03944004 100644 --- a/ext/date/tests/date_parse_error.phpt +++ b/ext/date/tests/date_parse_error.phpt @@ -12,14 +12,6 @@ date_default_timezone_set("Europe/London"); echo "*** Testing date_parse() : error conditions ***\n"; -echo "\n-- Testing date_parse() function with zero arguments --\n"; -var_dump( date_parse() ); - -echo "\n-- Testing date_parse() function with more than expected no. of arguments --\n"; -$date = "2009-02-27 10:00:00.5"; -$extra_arg = 10; -var_dump( date_parse($date, $extra_arg) ); - echo "\n-- Testing date_parse() function with unexpected characters in \$date argument --\n"; $invalid_date = "2OO9-02--27 10:00?00.5"; var_dump( date_parse($invalid_date) ); @@ -29,16 +21,6 @@ var_dump( date_parse($invalid_date) ); --EXPECTF-- *** Testing date_parse() : error conditions *** --- Testing date_parse() function with zero arguments -- - -Warning: date_parse() expects exactly 1 parameter, 0 given in %s on line %d -bool(false) - --- Testing date_parse() function with more than expected no. of arguments -- - -Warning: date_parse() expects exactly 1 parameter, 2 given in %s on line %d -bool(false) - -- Testing date_parse() function with unexpected characters in $date argument -- array(13) { ["year"]=> diff --git a/ext/date/tests/date_sunrise_variation9.phpt b/ext/date/tests/date_sunrise_variation9.phpt deleted file mode 100644 index 75794cc632..0000000000 --- a/ext/date/tests/date_sunrise_variation9.phpt +++ /dev/null @@ -1,61 +0,0 @@ ---TEST-- -Test date_sunrise() function : usage variation - Passing high positive and negative float values to time argument. ---SKIPIF-- -<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> ---FILE-- -<?php -/* Prototype : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) - * Description: Returns time of sunrise for a given day and location - * Source code: ext/date/php_date.c - * Alias to functions: - */ - -echo "*** Testing date_sunrise() : usage variation ***\n"; - -// GMT is zero for the timezone -date_default_timezone_set("Asia/Calcutta"); -//Initialise the variables -$latitude = 38.4; -$longitude = -9; -$zenith = 90; -$gmt_offset = 1; - -echo "\n-- Testing date_sunrise() function by passing float 12.3456789000e10 value to time --\n"; -$time = 12.3456789000e10; -var_dump( date_sunrise($time, SUNFUNCS_RET_STRING, $latitude, $longitude, $zenith, $gmt_offset) ); -var_dump( date_sunrise($time, SUNFUNCS_RET_DOUBLE, $latitude, $longitude, $zenith, $gmt_offset) ); -var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, $latitude, $longitude, $zenith, $gmt_offset) ); - -echo "\n-- Testing date_sunrise() function by passing float -12.3456789000e10 value to time --\n"; -$time = -12.3456789000e10; -var_dump( date_sunrise($time, SUNFUNCS_RET_STRING, $latitude, $longitude, $zenith, $gmt_offset) ); -var_dump( date_sunrise($time, SUNFUNCS_RET_DOUBLE, $latitude, $longitude, $zenith, $gmt_offset) ); -var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, $latitude, $longitude, $zenith, $gmt_offset) ); - -?> -===DONE=== ---EXPECTF-- -*** Testing date_sunrise() : usage variation *** - --- Testing date_sunrise() function by passing float 12.3456789000e10 value to time -- - -Warning: date_sunrise() expects parameter 1 to be int, float given in %s on line %d -bool(false) - -Warning: date_sunrise() expects parameter 1 to be int, float given in %s on line %d -bool(false) - -Warning: date_sunrise() expects parameter 1 to be int, float given in %s on line %d -bool(false) - --- Testing date_sunrise() function by passing float -12.3456789000e10 value to time -- - -Warning: date_sunrise() expects parameter 1 to be int, float given in %s on line %d -bool(false) - -Warning: date_sunrise() expects parameter 1 to be int, float given in %s on line %d -bool(false) - -Warning: date_sunrise() expects parameter 1 to be int, float given in %s on line %d -bool(false) -===DONE=== diff --git a/ext/date/tests/date_sunset_variation9.phpt b/ext/date/tests/date_sunset_variation9.phpt deleted file mode 100644 index 4f897e1df0..0000000000 --- a/ext/date/tests/date_sunset_variation9.phpt +++ /dev/null @@ -1,61 +0,0 @@ ---TEST-- -Test date_sunset() function : usage variation - Passing high positive and negative float values to time argument. ---SKIPIF-- -<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> ---FILE-- -<?php -/* Prototype : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]]) - * Description: Returns time of sunset for a given day and location - * Source code: ext/date/php_date.c - * Alias to functions: - */ - -echo "*** Testing date_sunset() : usage variation ***\n"; - -// GMT is zero for the timezone -date_default_timezone_set("Asia/Calcutta"); -//Initialise the variables -$latitude = 38.4; -$longitude = -9; -$zenith = 90; -$gmt_offset = 1; - -echo "\n-- Testing date_sunset() function by passing float 12.3456789000e10 value to time --\n"; -$time = 12.3456789000e10; -var_dump( date_sunset($time, SUNFUNCS_RET_STRING, $latitude, $longitude, $zenith, $gmt_offset) ); -var_dump( date_sunset($time, SUNFUNCS_RET_DOUBLE, $latitude, $longitude, $zenith, $gmt_offset) ); -var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, $latitude, $longitude, $zenith, $gmt_offset) ); - -echo "\n-- Testing date_sunset() function by passing float -12.3456789000e10 value to time --\n"; -$time = -12.3456789000e10; -var_dump( date_sunset($time, SUNFUNCS_RET_STRING, $latitude, $longitude, $zenith, $gmt_offset) ); -var_dump( date_sunset($time, SUNFUNCS_RET_DOUBLE, $latitude, $longitude, $zenith, $gmt_offset) ); -var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, $latitude, $longitude, $zenith, $gmt_offset) ); - -?> -===DONE=== ---EXPECTF-- -*** Testing date_sunset() : usage variation *** - --- Testing date_sunset() function by passing float 12.3456789000e10 value to time -- - -Warning: date_sunset() expects parameter 1 to be int, float given in %s on line %d -bool(false) - -Warning: date_sunset() expects parameter 1 to be int, float given in %s on line %d -bool(false) - -Warning: date_sunset() expects parameter 1 to be int, float given in %s on line %d -bool(false) - --- Testing date_sunset() function by passing float -12.3456789000e10 value to time -- - -Warning: date_sunset() expects parameter 1 to be int, float given in %s on line %d -bool(false) - -Warning: date_sunset() expects parameter 1 to be int, float given in %s on line %d -bool(false) - -Warning: date_sunset() expects parameter 1 to be int, float given in %s on line %d -bool(false) -===DONE=== diff --git a/ext/date/tests/getdate_variation7.phpt b/ext/date/tests/getdate_variation7.phpt deleted file mode 100644 index e24f3e6d84..0000000000 --- a/ext/date/tests/getdate_variation7.phpt +++ /dev/null @@ -1,37 +0,0 @@ ---TEST-- -Test getdate() function : usage variation - Passing high positive and negative float values to timestamp. ---SKIPIF-- -<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> ---FILE-- -<?php -/* Prototype : array getdate([int timestamp]) - * Description: Get date/time information - * Source code: ext/date/php_date.c - * Alias to functions: - */ - -echo "*** Testing getdate() : usage variation ***\n"; -date_default_timezone_set("Asia/Calcutta"); - -echo "\n-- Testing getdate() function by passing float 12.3456789000e10 value to timestamp --\n"; -$timestamp = 12.3456789000e10; -var_dump( getdate($timestamp) ); - -echo "\n-- Testing getdate() function by passing float -12.3456789000e10 value to timestamp --\n"; -$timestamp = -12.3456789000e10; -var_dump( getdate($timestamp) ); -?> -===DONE=== ---EXPECTF-- -*** Testing getdate() : usage variation *** - --- Testing getdate() function by passing float 12.3456789000e10 value to timestamp -- - -Warning: getdate() expects parameter 1 to be int, float given in %s on line %d -bool(false) - --- Testing getdate() function by passing float -12.3456789000e10 value to timestamp -- - -Warning: getdate() expects parameter 1 to be int, float given in %s on line %d -bool(false) -===DONE=== diff --git a/ext/date/tests/gmdate_variation14.phpt b/ext/date/tests/gmdate_variation14.phpt deleted file mode 100644 index 5b6c48fca5..0000000000 --- a/ext/date/tests/gmdate_variation14.phpt +++ /dev/null @@ -1,40 +0,0 @@ ---TEST-- -Test gmdate() function : usage variation - Passing high positive and negetive float values to timestamp. ---SKIPIF-- -<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> ---FILE-- -<?php -/* Prototype : string gmdate(string format [, long timestamp]) - * Description: Format a GMT date/time - * Source code: ext/date/php_date.c - */ - -echo "*** Testing gmdate() : usage variation ***\n"; - -// Initialise all required variables -date_default_timezone_set('UTC'); -$format = DATE_ISO8601; - -echo "\n-- Testing gmdate() function with float 12.3456789000e10 to timestamp --\n"; -$timestamp = 12.3456789000e10; -var_dump( gmdate($format, $timestamp) ); - -echo "\n-- Testing gmdate() function with float -12.3456789000e10 to timestamp --\n"; -$timestamp = -12.3456789000e10; -var_dump( gmdate($format, $timestamp) ); - -?> -===DONE=== ---EXPECTF-- -*** Testing gmdate() : usage variation *** - --- Testing gmdate() function with float 12.3456789000e10 to timestamp -- - -Warning: gmdate() expects parameter 2 to be int, float given in %s on line %d -bool(false) - --- Testing gmdate() function with float -12.3456789000e10 to timestamp -- - -Warning: gmdate() expects parameter 2 to be int, float given in %s on line %d -bool(false) -===DONE=== diff --git a/ext/date/tests/gmmktime_basic.phpt b/ext/date/tests/gmmktime_basic.phpt index c125e353c4..dca6675e6c 100644 --- a/ext/date/tests/gmmktime_basic.phpt +++ b/ext/date/tests/gmmktime_basic.phpt @@ -21,15 +21,9 @@ $year = 2008; // Calling gmmktime() with all possible arguments var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year) ); -// Calling gmmktime() with mandatory arguments -var_dump( gmmktime() ); - ?> ===DONE=== --EXPECTF-- *** Testing gmmktime() : basic functionality *** int(1218182888) - -Warning: gmmktime() expects at least 1 parameter, 0 given in %s on line %d -bool(false) ===DONE=== diff --git a/ext/date/tests/idate_variation3.phpt b/ext/date/tests/idate_variation3.phpt deleted file mode 100644 index 9b6bc567e0..0000000000 --- a/ext/date/tests/idate_variation3.phpt +++ /dev/null @@ -1,41 +0,0 @@ ---TEST-- -Test idate() function : usage variation - Passing higher positive and negetive float values to timestamp. ---SKIPIF-- -<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> ---FILE-- -<?php -/* Prototype : int idate(string format [, int timestamp]) - * Description: Format a local time/date as integer - * Source code: ext/date/php_date.c - * Alias to functions: - */ - -echo "*** Testing idate() : usage variation ***\n"; - -// Initialise function arguments not being substituted (if any) -$format = 'Y'; -date_default_timezone_set("Asia/Calcutta"); - -echo "\n-- Testing idate() function with float 12.3456789000e10 to timestamp --\n"; -$timestamp = 12.3456789000e10; -var_dump( idate($format, $timestamp) ); - -echo "\n-- Testing idate() function with float -12.3456789000e10 to timestamp --\n"; -$timestamp = -12.3456789000e10; -var_dump( idate($format, $timestamp) ); - -?> -===DONE=== ---EXPECTF-- -*** Testing idate() : usage variation *** - --- Testing idate() function with float 12.3456789000e10 to timestamp -- - -Warning: idate() expects parameter 2 to be int, float given in %s on line %d -bool(false) - --- Testing idate() function with float -12.3456789000e10 to timestamp -- - -Warning: idate() expects parameter 2 to be int, float given in %s on line %d -bool(false) -===DONE=== diff --git a/ext/date/tests/localtime_variation3.phpt b/ext/date/tests/localtime_variation3.phpt deleted file mode 100644 index 42731dc6ce..0000000000 --- a/ext/date/tests/localtime_variation3.phpt +++ /dev/null @@ -1,50 +0,0 @@ ---TEST-- -Test localtime() function : usage variation - Passing higher positive and negetive float values to timestamp. ---SKIPIF-- -<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> ---FILE-- -<?php -/* Prototype : array localtime([int timestamp [, bool associative_array]]) - * Description: Returns the results of the C system call localtime as an associative array - * if the associative_array argument is set to 1 other wise it is a regular array - * Source code: ext/date/php_date.c - * Alias to functions: - */ - -echo "*** Testing localtime() : usage variation ***\n"; - -date_default_timezone_set("UTC"); -// Initialise function arguments not being substituted (if any) -$is_associative = true; - -echo "\n-- Testing localtime() function with 'float 12.3456789000e10' to timestamp --\n"; -$timestamp = 12.3456789000e10; -var_dump( localtime($timestamp) ); -var_dump( localtime($timestamp, $is_associative) ); - -echo "\n-- Testing localtime() function with 'float -12.3456789000e10' to timestamp --\n"; -$timestamp = -12.3456789000e10; -var_dump( localtime($timestamp) ); -var_dump( localtime($timestamp, $is_associative) ); - -?> -===DONE=== ---EXPECTF-- -*** Testing localtime() : usage variation *** - --- Testing localtime() function with 'float 12.3456789000e10' to timestamp -- - -Warning: localtime() expects parameter 1 to be int, float given in %s on line %d -bool(false) - -Warning: localtime() expects parameter 1 to be int, float given in %s on line %d -bool(false) - --- Testing localtime() function with 'float -12.3456789000e10' to timestamp -- - -Warning: localtime() expects parameter 1 to be int, float given in %s on line %d -bool(false) - -Warning: localtime() expects parameter 1 to be int, float given in %s on line %d -bool(false) -===DONE=== diff --git a/ext/date/tests/microtime_error.phpt b/ext/date/tests/microtime_error.phpt index 699416d382..0e4b5d5a35 100644 --- a/ext/date/tests/microtime_error.phpt +++ b/ext/date/tests/microtime_error.phpt @@ -7,13 +7,6 @@ Test wrong number of arguments for microtime() * Function is implemented in ext/standard/microtime.c */ -$opt_arg_0 = true; -$extra_arg = 1; - -echo "\n-- Too many arguments --\n"; -var_dump(microtime($opt_arg_0, $extra_arg)); - - echo "\n-- Bad Arg types --\n"; $bad_args = array(null, @@ -25,17 +18,16 @@ $bad_args = array(null, foreach ($bad_args as $bad_arg) { echo "\n--> bad arg: "; var_dump($bad_arg); - var_dump(microtime($bad_arg)); + try { + var_dump(microtime($bad_arg)); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } } ?> ===DONE=== --EXPECTF-- --- Too many arguments -- - -Warning: microtime() expects at most 1 parameter, 2 given in %s on line 11 -NULL - -- Bad Arg types -- --> bad arg: NULL @@ -56,15 +48,11 @@ float(%s) int(0) } } - -Warning: microtime() expects parameter 1 to be bool, array given in %s on line 25 -NULL +microtime() expects parameter 1 to be bool, array given --> bad arg: object(stdClass)#%d (0) { } - -Warning: microtime() expects parameter 1 to be bool, object given in %s on line 25 -NULL +microtime() expects parameter 1 to be bool, object given --> bad arg: int(1) float(%s) diff --git a/ext/date/tests/mktime_error.phpt b/ext/date/tests/mktime_error.phpt index 02e94a7d4d..c507ecf78b 100644 --- a/ext/date/tests/mktime_error.phpt +++ b/ext/date/tests/mktime_error.phpt @@ -14,7 +14,11 @@ date_default_timezone_set("Europe/London"); echo "*** Testing mktime() : error conditions ***\n"; echo "\n-- Testing mktime() function with Zero arguments --\n"; -var_dump( mktime() ); +try { + var_dump( mktime() ); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} echo "\n-- Testing mktime() function with more than expected no. of arguments --\n"; $hour = 10; @@ -24,7 +28,11 @@ $month = 7; $day = 2; $year = 1963; $extra_arg = 10; -var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $extra_arg) ); +try { + var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $extra_arg) ); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} ?> ===DONE=== @@ -32,12 +40,8 @@ var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $extra_arg) ); *** Testing mktime() : error conditions *** -- Testing mktime() function with Zero arguments -- - -Warning: mktime() expects at least 1 parameter, 0 given in %s on line %d -bool(false) +mktime() expects at least 1 parameter, 0 given -- Testing mktime() function with more than expected no. of arguments -- - -Warning: mktime() expects at most 6 parameters, 7 given in %s on line %d -bool(false) +mktime() expects at most 6 parameters, 7 given ===DONE=== diff --git a/ext/date/tests/strftime_variation23.phpt b/ext/date/tests/strftime_variation23.phpt deleted file mode 100644 index 22f079702a..0000000000 --- a/ext/date/tests/strftime_variation23.phpt +++ /dev/null @@ -1,42 +0,0 @@ ---TEST-- -Test strftime() function : usage variation - Checking large positive and negative float values to timestamp. ---SKIPIF-- -<?php if (PHP_INT_SIZE != 4) echo "skip this test is for 32-bit only"; ?> ---FILE-- -<?php -/* Prototype : string strftime(string format [, int timestamp]) - * Description: Format a local time/date according to locale settings - * Source code: ext/date/php_date.c - * Alias to functions: - */ - -echo "*** Testing strftime() : usage variation ***\n"; - -// Initialise function arguments not being substituted (if any) -setlocale(LC_ALL, "en_US"); -date_default_timezone_set("UTC"); -$format = '%b %d %Y %H:%M:%S'; - -echo "\n-- Testing strftime() function with float 12.3456789000e10 to timestamp --\n"; -$timestamp = 12.3456789000e10; -var_dump( strftime($format, $timestamp) ); - -echo "\n-- Testing strftime() function with float -12.3456789000e10 to timestamp --\n"; -$timestamp = -12.3456789000e10; -var_dump( strftime($format, $timestamp) ); - -?> -===DONE=== ---EXPECTF-- -*** Testing strftime() : usage variation *** - --- Testing strftime() function with float 12.3456789000e10 to timestamp -- - -Warning: strftime() expects parameter 2 to be int, float given in %s on line %d -bool(false) - --- Testing strftime() function with float -12.3456789000e10 to timestamp -- - -Warning: strftime() expects parameter 2 to be int, float given in %s on line %d -bool(false) -===DONE=== diff --git a/ext/date/tests/timezone_offset_get_error.phpt b/ext/date/tests/timezone_offset_get_error.phpt index 413755ac72..f77836c8ef 100644 --- a/ext/date/tests/timezone_offset_get_error.phpt +++ b/ext/date/tests/timezone_offset_get_error.phpt @@ -15,31 +15,6 @@ $date = date_create("GMT"); echo "*** Testing timezone_offset_get() : error conditions ***\n"; -echo "\n-- Testing timezone_offset_get() function with zero arguments --\n"; -try { - var_dump( timezone_offset_get() ); -} catch (Error $ex) { - var_dump($ex->getMessage()); - echo "\n"; -} - -echo "\n-- Testing timezone_offset_get() function with less than expected no. of arguments --\n"; -try { - var_dump( timezone_offset_get($tz) ); -} catch (Error $ex) { - var_dump($ex->getMessage()); - echo "\n"; -} - -echo "\n-- Testing timezone_offset_get() function with more than expected no. of arguments --\n"; -$extra_arg = 99; -try { - var_dump( timezone_offset_get($tz, $date, $extra_arg) ); -} catch (Error $ex) { - var_dump($ex->getMessage()); - echo "\n"; -} - echo "\n-- Testing timezone_offset_get() function with an invalid values for \$object argument --\n"; $invalid_obj = new stdClass(); try { @@ -90,21 +65,6 @@ try { --EXPECTF-- *** Testing timezone_offset_get() : error conditions *** --- Testing timezone_offset_get() function with zero arguments -- - -Warning: timezone_offset_get() expects exactly 2 parameters, 0 given in %s on line %d -bool(false) - --- Testing timezone_offset_get() function with less than expected no. of arguments -- - -Warning: timezone_offset_get() expects exactly 2 parameters, 1 given in %s on line %d -bool(false) - --- Testing timezone_offset_get() function with more than expected no. of arguments -- - -Warning: timezone_offset_get() expects exactly 2 parameters, 3 given in %s on line %d -bool(false) - -- Testing timezone_offset_get() function with an invalid values for $object argument -- string(%d) "Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of stdClass given" |