diff options
Diffstat (limited to 'ext/date/tests')
96 files changed, 136 insertions, 185 deletions
diff --git a/ext/date/tests/DateTimeZone_clone_basic1.phpt b/ext/date/tests/DateTimeZone_clone_basic1.phpt index 5f527202cd..a40efc7411 100644 --- a/ext/date/tests/DateTimeZone_clone_basic1.phpt +++ b/ext/date/tests/DateTimeZone_clone_basic1.phpt @@ -43,3 +43,5 @@ object(DateTimeZone)#%d (2) { } TEST PASSED : Objects equal but not indetical ===DONE=== + + diff --git a/ext/date/tests/DateTimeZone_compare_basic1.phpt b/ext/date/tests/DateTimeZone_compare_basic1.phpt index 790bb6cf7f..130b6fa754 100644 --- a/ext/date/tests/DateTimeZone_compare_basic1.phpt +++ b/ext/date/tests/DateTimeZone_compare_basic1.phpt @@ -51,4 +51,4 @@ bool(false) bool(false) bool(false) bool(false) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/DateTimeZone_extends_basic1.phpt b/ext/date/tests/DateTimeZone_extends_basic1.phpt index 462cb155d2..3922454865 100644 --- a/ext/date/tests/DateTimeZone_extends_basic1.phpt +++ b/ext/date/tests/DateTimeZone_extends_basic1.phpt @@ -31,4 +31,4 @@ echo $d . "\n"; -- Invoke __toString -- America/Los_Angeles -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/DateTimeZone_getName_basic1.phpt b/ext/date/tests/DateTimeZone_getName_basic1.phpt index c226aa39bb..ad59c8d9a1 100644 --- a/ext/date/tests/DateTimeZone_getName_basic1.phpt +++ b/ext/date/tests/DateTimeZone_getName_basic1.phpt @@ -29,4 +29,4 @@ var_dump( $tz3->getName() ); string(13) "Europe/London" string(16) "America/New_York" string(19) "America/Los_Angeles" -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/DateTimeZone_getOffset_basic1.phpt b/ext/date/tests/DateTimeZone_getOffset_basic1.phpt index ce1c04336e..8c4e409498 100644 --- a/ext/date/tests/DateTimeZone_getOffset_basic1.phpt +++ b/ext/date/tests/DateTimeZone_getOffset_basic1.phpt @@ -30,4 +30,4 @@ var_dump( $tz3->getOffset($date) ); %rint\(0\)|int\(3600\)%r %rint\(-18000\)|int\(-14400\)%r %rint\(-28800\)|int\(-25200\)%r -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/DateTimeZone_getOffset_error.phpt b/ext/date/tests/DateTimeZone_getOffset_error.phpt index c2e6e4eed7..58b852e44b 100644 --- a/ext/date/tests/DateTimeZone_getOffset_error.phpt +++ b/ext/date/tests/DateTimeZone_getOffset_error.phpt @@ -37,4 +37,4 @@ bool(false) Warning: DateTimeZone::getOffset() expects exactly 1 parameter, 2 given in %s on line %d bool(false) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt index ee88321fca..a88a34bf2d 100644 --- a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt +++ b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt @@ -47,4 +47,4 @@ array(5) { ["abbr"]=> string(3) "BST" } -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/DateTimeZone_getTransitions_error.phpt b/ext/date/tests/DateTimeZone_getTransitions_error.phpt index f50a77ddb9..e1d0a29420 100644 --- a/ext/date/tests/DateTimeZone_getTransitions_error.phpt +++ b/ext/date/tests/DateTimeZone_getTransitions_error.phpt @@ -31,4 +31,4 @@ var_dump( $tz->getTransitions($timestamp_begin, $timestamp_end, $extra_arg) ); Warning: DateTimeZone::getTransitions() expects at most 2 parameters, 3 given in %s on line %d bool(false) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt b/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt index 26a0c2fca2..4421964d71 100644 --- a/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt +++ b/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt @@ -33,4 +33,4 @@ bool(true) bool(true) bool(true) ===DONE=== - +
\ No newline at end of file diff --git a/ext/date/tests/DateTime_clone_basic3.phpt b/ext/date/tests/DateTime_clone_basic3.phpt index 5019b6685c..ebda6a8428 100644 --- a/ext/date/tests/DateTime_clone_basic3.phpt +++ b/ext/date/tests/DateTime_clone_basic3.phpt @@ -41,40 +41,34 @@ object(DateTime)#%d (3) { -- Add some properties -- object(DateTime)#%d (5) { - ["date"]=> - string(26) "2009-02-03 12:34:41.000000" - ["timezone_type"]=> - int(2) - ["timezone"]=> - string(3) "GMT" ["property1"]=> int(99) ["property2"]=> string(5) "Hello" -} - --- clone it -- -object(DateTime)#%d (5) { ["date"]=> string(26) "2009-02-03 12:34:41.000000" ["timezone_type"]=> int(2) ["timezone"]=> string(3) "GMT" +} + +-- clone it -- +object(DateTime)#%d (5) { ["property1"]=> int(99) ["property2"]=> string(5) "Hello" -} - --- Add some more properties -- -object(DateTime)#%d (7) { ["date"]=> string(26) "2009-02-03 12:34:41.000000" ["timezone_type"]=> int(2) ["timezone"]=> string(3) "GMT" +} + +-- Add some more properties -- +object(DateTime)#%d (7) { ["property1"]=> int(99) ["property2"]=> @@ -83,16 +77,16 @@ object(DateTime)#%d (7) { bool(true) ["property4"]=> float(10.5) -} - --- clone it -- -object(DateTime)#%d (7) { ["date"]=> string(26) "2009-02-03 12:34:41.000000" ["timezone_type"]=> int(2) ["timezone"]=> string(3) "GMT" +} + +-- clone it -- +object(DateTime)#%d (7) { ["property1"]=> int(99) ["property2"]=> @@ -101,5 +95,11 @@ object(DateTime)#%d (7) { bool(true) ["property4"]=> float(10.5) + ["date"]=> + string(26) "2009-02-03 12:34:41.000000" + ["timezone_type"]=> + int(2) + ["timezone"]=> + string(3) "GMT" } ===DONE=== diff --git a/ext/date/tests/DateTime_compare_basic1.phpt b/ext/date/tests/DateTime_compare_basic1.phpt index 0d3f15360d..7119f0f8dc 100644 --- a/ext/date/tests/DateTime_compare_basic1.phpt +++ b/ext/date/tests/DateTime_compare_basic1.phpt @@ -74,4 +74,4 @@ bool(false) bool(true) bool(true) bool(true) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/DateTime_construct_variation2.phpt b/ext/date/tests/DateTime_construct_variation2.phpt index 2e39f32715..625b24df2d 100644 --- a/ext/date/tests/DateTime_construct_variation2.phpt +++ b/ext/date/tests/DateTime_construct_variation2.phpt @@ -229,3 +229,4 @@ object(DateTime)#%d (3) { -- resource -- FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, resource given ===DONE=== + diff --git a/ext/date/tests/DateTime_extends_basic2.phpt b/ext/date/tests/DateTime_extends_basic2.phpt index 364fd55514..e6720c5797 100644 --- a/ext/date/tests/DateTime_extends_basic2.phpt +++ b/ext/date/tests/DateTime_extends_basic2.phpt @@ -28,4 +28,4 @@ echo $d->format("F j, Y, g:i:s a") . "\n"; --EXPECT-- *** Testing new DateTime() : with user space __construct magic method *** May 1, 1967, 10:30:41 pm -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/DateTime_format_basic1.phpt b/ext/date/tests/DateTime_format_basic1.phpt index 883f9a7a8e..354911875c 100644 --- a/ext/date/tests/DateTime_format_basic1.phpt +++ b/ext/date/tests/DateTime_format_basic1.phpt @@ -37,4 +37,4 @@ string(19) "it is the 14th day." string(28) "Thu Jul 14 22:30:41 BST 2005" string(19) "22:07:41 m is month" string(8) "22:30:41" -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/DateTime_getOffset_error.phpt b/ext/date/tests/DateTime_getOffset_error.phpt index 2cf65f1979..508ac7b940 100644 --- a/ext/date/tests/DateTime_getOffset_error.phpt +++ b/ext/date/tests/DateTime_getOffset_error.phpt @@ -30,3 +30,4 @@ var_dump( $datetime->getOffset($extra_arg) ); Warning: DateTime::getOffset() expects exactly 0 parameters, 1 given in %s on line %d bool(false) ===DONE=== + diff --git a/ext/date/tests/DateTime_modify_error.phpt b/ext/date/tests/DateTime_modify_error.phpt index 2562324fd7..5f0df79884 100644 --- a/ext/date/tests/DateTime_modify_error.phpt +++ b/ext/date/tests/DateTime_modify_error.phpt @@ -39,3 +39,4 @@ bool(false) Warning: DateTime::modify() expects exactly 1 parameter, 2 given in %s on line %d bool(false) ===DONE=== + diff --git a/ext/date/tests/DateTime_setDate_basic1.phpt b/ext/date/tests/DateTime_setDate_basic1.phpt index e3c9c587ac..e74799928c 100644 --- a/ext/date/tests/DateTime_setDate_basic1.phpt +++ b/ext/date/tests/DateTime_setDate_basic1.phpt @@ -27,4 +27,4 @@ echo $datetime->format(DATE_RFC2822) . "\n"; *** Testing DateTime::setDate() : basic functionality *** Fri, 30 Jan 2009 19:34:10 +0000 Fri, 01 Feb 2008 19:34:10 +0000 -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/bug39782.phpt b/ext/date/tests/bug39782.phpt index 99aaeaf380..99abdd7bc8 100644 --- a/ext/date/tests/bug39782.phpt +++ b/ext/date/tests/bug39782.phpt @@ -16,4 +16,4 @@ echo $dttTest->format('D M j Y - H:i:s') . "\n"; --EXPECT-- Wed Dec 13 2006 - 00:00:00 Wed Dec 13 2006 - 12:00:00 -Wed Dec 13 2006 - 12:00:00 +Wed Dec 13 2006 - 12:00:00
\ No newline at end of file diff --git a/ext/date/tests/bug45543.phpt b/ext/date/tests/bug45543.phpt index 42a97ab20c..8e36e6287c 100644 --- a/ext/date/tests/bug45543.phpt +++ b/ext/date/tests/bug45543.phpt @@ -31,3 +31,4 @@ foreach ($test_dates as $test_date) 2008-01-01T12:00:00+0000 2008-01-01T12:00:00+0200 2008-01-01T14:00:00+0200 + diff --git a/ext/date/tests/bug48187.phpt b/ext/date/tests/bug48187.phpt index 6dc0f8b56a..e3af51d767 100644 --- a/ext/date/tests/bug48187.phpt +++ b/ext/date/tests/bug48187.phpt @@ -25,4 +25,4 @@ if (time() - $begin_t < 1) { ?> --EXPECT-- string(36) "microtime() difference less 1 second" -string(31) "time() difference less 1 second" +string(31) "time() difference less 1 second"
\ No newline at end of file diff --git a/ext/date/tests/bug48476.phpt b/ext/date/tests/bug48476.phpt index 1335025c76..2daa594871 100644 --- a/ext/date/tests/bug48476.phpt +++ b/ext/date/tests/bug48476.phpt @@ -29,3 +29,5 @@ bool(false) Warning: timezone_location_get(): The DateTimeZone object has not been correctly initialized by its constructor in %sbug48476.php on line 18 bool(false) + + diff --git a/ext/date/tests/bug50475.phpt b/ext/date/tests/bug50475.phpt index 3cb5e89d5a..454e86c6b5 100644 --- a/ext/date/tests/bug50475.phpt +++ b/ext/date/tests/bug50475.phpt @@ -15,4 +15,4 @@ var_dump($date->format('Y-m-d H:i:s')); ?> --EXPECT-- string(19) "2009-02-02 00:00:00" -string(19) "2009-02-02 08:00:00" +string(19) "2009-02-02 08:00:00"
\ No newline at end of file diff --git a/ext/date/tests/bug52062.phpt b/ext/date/tests/bug52062.phpt index cbcccf84b9..bc528e21d7 100644 --- a/ext/date/tests/bug52062.phpt +++ b/ext/date/tests/bug52062.phpt @@ -28,4 +28,4 @@ string(12) "100000000000" Warning: DateTime::setTimestamp() expects parameter 1 to be int, float given in %s on line %d string(32) "5138-11-16 09:46:40 100000000000" bool(false) -string(10) "1215752192" +string(10) "1215752192"
\ No newline at end of file diff --git a/ext/date/tests/bug52113.phpt b/ext/date/tests/bug52113.phpt index dfc7d6112d..f6d0962625 100644 --- a/ext/date/tests/bug52113.phpt +++ b/ext/date/tests/bug52113.phpt @@ -32,8 +32,8 @@ $p = new DatePeriod($start, $diff_un, 2); var_dump($unser, $p); ?> ---EXPECT-- -object(DateInterval)#3 (16) { +--EXPECTF-- +object(DateInterval)#%d (16) { ["y"]=> int(0) ["m"]=> @@ -85,7 +85,7 @@ DateInterval::__set_state(array( 'special_amount' => 0, 'have_weekday_relative' => 0, 'have_special_relative' => 0, -))object(DateInterval)#5 (16) { +))object(DateInterval)#%d (16) { ["y"]=> int(0) ["m"]=> @@ -119,9 +119,9 @@ DateInterval::__set_state(array( ["have_special_relative"]=> int(0) } -object(DatePeriod)#6 (6) { +object(DatePeriod)#%d (6) { ["start"]=> - object(DateTime)#4 (3) { + object(DateTime)#%d (3) { ["date"]=> string(26) "2003-01-02 08:00:00.000000" ["timezone_type"]=> @@ -134,7 +134,7 @@ object(DatePeriod)#6 (6) { ["end"]=> NULL ["interval"]=> - object(DateInterval)#7 (16) { + object(DateInterval)#%d (16) { ["y"]=> int(0) ["m"]=> @@ -173,7 +173,7 @@ object(DatePeriod)#6 (6) { ["include_start_date"]=> bool(true) } -object(DateInterval)#8 (16) { +object(DateInterval)#%d (16) { ["y"]=> int(7) ["m"]=> @@ -207,9 +207,9 @@ object(DateInterval)#8 (16) { ["have_special_relative"]=> int(0) } -object(DatePeriod)#9 (6) { +object(DatePeriod)#%d (6) { ["start"]=> - object(DateTime)#6 (3) { + object(DateTime)#%d (3) { ["date"]=> string(26) "2003-01-02 08:00:00.000000" ["timezone_type"]=> @@ -222,7 +222,7 @@ object(DatePeriod)#9 (6) { ["end"]=> NULL ["interval"]=> - object(DateInterval)#7 (16) { + object(DateInterval)#%d (16) { ["y"]=> int(0) ["m"]=> diff --git a/ext/date/tests/bug52290.phpt b/ext/date/tests/bug52290.phpt index c202c0e0cc..735df6ad18 100644 --- a/ext/date/tests/bug52290.phpt +++ b/ext/date/tests/bug52290.phpt @@ -24,4 +24,4 @@ var_dump($dt->format('o-\WW-N | Y-m-d | H:i:s | U')); 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" -string(47) "2007-W41-3 | 2007-10-10 | 20:30:40 | 1192048240" +string(47) "2007-W41-3 | 2007-10-10 | 20:30:40 | 1192048240"
\ No newline at end of file diff --git a/ext/date/tests/bug62852.phpt b/ext/date/tests/bug62852.phpt index 77c92ce55f..a1b5190281 100644 --- a/ext/date/tests/bug62852.phpt +++ b/ext/date/tests/bug62852.phpt @@ -9,6 +9,7 @@ $s1 = 'O:8:"DateTime":3:{s:4:"date";s:20:"10007-06-07 03:51:49";s:13:"timezone_t try { unserialize( $s1 ); } catch ( Exception $e ) {} + --EXPECTF-- Fatal error: Uncaught Error: Invalid serialization data for DateTime object in %sbug62852.php:%d Stack trace: diff --git a/ext/date/tests/bug62852_var2.phpt b/ext/date/tests/bug62852_var2.phpt index afec265d50..9d742d9363 100644 --- a/ext/date/tests/bug62852_var2.phpt +++ b/ext/date/tests/bug62852_var2.phpt @@ -20,6 +20,7 @@ try { unserialize( $s2 ); } catch ( Exception $e ) {} var_dump( $foo ); + --EXPECTF-- Fatal error: Uncaught Error: Invalid serialization data for DateTime object in %sbug62852_var2.php:%d Stack trace: diff --git a/ext/date/tests/bug62852_var3.phpt b/ext/date/tests/bug62852_var3.phpt index 5dbc1efa3f..bef8d4ec6b 100644 --- a/ext/date/tests/bug62852_var3.phpt +++ b/ext/date/tests/bug62852_var3.phpt @@ -20,6 +20,7 @@ try { unserialize( $s2 ); } catch ( Exception $e ) {} var_dump( $foo ); + --EXPECTF-- Fatal error: Uncaught Error: Invalid serialization data for DateTime object in %sbug62852_var3.php:%d Stack trace: diff --git a/ext/date/tests/bug67118.phpt b/ext/date/tests/bug67118.phpt index 332142856e..4884d77bac 100644 --- a/ext/date/tests/bug67118.phpt +++ b/ext/date/tests/bug67118.phpt @@ -23,5 +23,7 @@ class mydt extends datetime new mydt("Funktionsansvarig rådgivning och juridik", "UTC"); ?> --EXPECTF-- + Warning: DateTime::format(): The DateTime object has not been correctly initialized by its constructor in %s on line %d Bad date + diff --git a/ext/date/tests/bug67253.phpt b/ext/date/tests/bug67253.phpt index c18cdebeb1..c7d38956ff 100644 --- a/ext/date/tests/bug67253.phpt +++ b/ext/date/tests/bug67253.phpt @@ -41,3 +41,4 @@ array(12) { ["is_localtime"]=> bool(false) } + diff --git a/ext/date/tests/bug68406.phpt b/ext/date/tests/bug68406.phpt index f2181d1006..a6a41c1078 100644 --- a/ext/date/tests/bug68406.phpt +++ b/ext/date/tests/bug68406.phpt @@ -17,6 +17,7 @@ if($tz2 == $d->getTimezone()) { else { echo "no"; } + --EXPECT-- object(DateTimeZone)#4 (2) { ["timezone_type"]=> diff --git a/ext/date/tests/bug71525.phpt b/ext/date/tests/bug71525.phpt index 9a9d10342d..d0c99e4f84 100644 --- a/ext/date/tests/bug71525.phpt +++ b/ext/date/tests/bug71525.phpt @@ -8,6 +8,7 @@ $date = new DateTime('2011-12-25 00:00:00'); $date->modify('first day of next month'); $date->setDate('2012', '1', '29'); var_dump($date); + --EXPECTF-- object(DateTime)#%d (3) { ["date"]=> diff --git a/ext/date/tests/bug71635.phpt b/ext/date/tests/bug71635.phpt index 422dee60e4..8c5ae25db3 100644 --- a/ext/date/tests/bug71635.phpt +++ b/ext/date/tests/bug71635.phpt @@ -8,4 +8,4 @@ $period = new DatePeriod(new DateTimeImmutable("now"), new DateInterval("P2Y4DT6 var_dump($period->getEndDate()); ?> --EXPECT-- -NULL +NULL
\ No newline at end of file diff --git a/ext/date/tests/bug75232.phpt b/ext/date/tests/bug75232.phpt new file mode 100644 index 0000000000..9200f65e91 --- /dev/null +++ b/ext/date/tests/bug75232.phpt @@ -0,0 +1,26 @@ +--TEST-- +Bug #75232: print_r of DateTime creating side-effect +--INI-- +date.timezone=UTC +--FILE-- +<?php + +$d1 = DateTime::createFromFormat("Ymd\THis\Z", '20170920T091600Z'); +echo $d1->date, "\n"; + +$d2 = DateTime::createFromFormat("Ymd\THis\Z", '20170920T091600Z'); +print_r($d2); +echo $d2->date, "\n"; + +?> +--EXPECTF-- +Notice: Undefined property: DateTime::$date in %s on line %d + +DateTime Object +( + [date] => 2017-09-20 09:16:00.000000 + [timezone_type] => 3 + [timezone] => UTC +) + +Notice: Undefined property: DateTime::$date in %s on line %d diff --git a/ext/date/tests/checkdate_variation1.phpt b/ext/date/tests/checkdate_variation1.phpt index 8913963de0..a29212b1ae 100644 --- a/ext/date/tests/checkdate_variation1.phpt +++ b/ext/date/tests/checkdate_variation1.phpt @@ -199,3 +199,4 @@ bool(false) Warning: checkdate() expects parameter 1 to be int, resource given in %s on line %d bool(false) ===DONE=== + diff --git a/ext/date/tests/checkdate_variation2.phpt b/ext/date/tests/checkdate_variation2.phpt index 8f555314bd..2474ca9e53 100644 --- a/ext/date/tests/checkdate_variation2.phpt +++ b/ext/date/tests/checkdate_variation2.phpt @@ -199,3 +199,4 @@ bool(false) Warning: checkdate() expects parameter 2 to be int, resource given in %s on line %d bool(false) ===DONE=== + diff --git a/ext/date/tests/date_add_basic2.phpt b/ext/date/tests/date_add_basic2.phpt index a54c63658e..5beef23f45 100644 --- a/ext/date/tests/date_add_basic2.phpt +++ b/ext/date/tests/date_add_basic2.phpt @@ -11,4 +11,4 @@ display_errors=false var_dump(date_add()); // invalid parameters ?> --EXPECT-- -bool(false) +bool(false)
\ No newline at end of file diff --git a/ext/date/tests/date_basic1.phpt b/ext/date/tests/date_basic1.phpt index 088bdce6d5..2b94ac34e7 100644 --- a/ext/date/tests/date_basic1.phpt +++ b/ext/date/tests/date_basic1.phpt @@ -38,3 +38,4 @@ string(28) "Fri Feb 27 10:44:30 GMT 2009" string(19) "10:02:30 m is month" string(8) "10:44:30" ===DONE=== + diff --git a/ext/date/tests/date_create_from_format_basic.phpt b/ext/date/tests/date_create_from_format_basic.phpt index 823a4ccbeb..592692b5a7 100644 --- a/ext/date/tests/date_create_from_format_basic.phpt +++ b/ext/date/tests/date_create_from_format_basic.phpt @@ -11,4 +11,4 @@ display_errors=false var_dump(date_create_from_format()); // invalid parameters ?> --EXPECT-- -bool(false) +bool(false)
\ No newline at end of file diff --git a/ext/date/tests/date_create_from_format_basic2.phpt b/ext/date/tests/date_create_from_format_basic2.phpt index 61c553ddd4..2b220a7275 100644 --- a/ext/date/tests/date_create_from_format_basic2.phpt +++ b/ext/date/tests/date_create_from_format_basic2.phpt @@ -10,4 +10,4 @@ date.timezone=UTC var_dump(date_create_from_format('Y-m-d', '2009---01')); // invalid date ?> --EXPECT-- -bool(false) +bool(false)
\ No newline at end of file diff --git a/ext/date/tests/date_default_timezone_get-1-win32.phpt b/ext/date/tests/date_default_timezone_get-1-win32.phpt deleted file mode 100644 index 73003fb689..0000000000 --- a/ext/date/tests/date_default_timezone_get-1-win32.phpt +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -date_default_timezone_get() function [1] ---SKIPIF-- -<?php - if(substr(PHP_OS, 0, 3) != 'WIN') die("skip skip on non windows"); -?> ---INI-- -date.timezone= ---FILE-- -<?php - putenv('TZ='); - echo date_default_timezone_get(), "\n"; - echo date('e'), "\n"; - /* The behaviour on windows is to select an arbitrary timezone name from the current system settings. - This gives no chance to hardcode the timezone name, for instance for UTC+1 it could choose - from the multiple names like Europe/Berlin or Europe/Paris . For this reason the test is - parametrized so there is no hardcoded timezone data.*/ -?> ---EXPECT-- -UTC -UTC diff --git a/ext/date/tests/date_get_last_errors_basic.phpt b/ext/date/tests/date_get_last_errors_basic.phpt index 26e470a7d8..5e83a5272f 100644 --- a/ext/date/tests/date_get_last_errors_basic.phpt +++ b/ext/date/tests/date_get_last_errors_basic.phpt @@ -10,4 +10,4 @@ date.timezone=UTC var_dump(date_get_last_errors()); // no date was parsed, so no errors ?> --EXPECT-- -bool(false) +bool(false)
\ No newline at end of file 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 abf2b354c6..1333f747eb 100644 --- a/ext/date/tests/date_interval_create_from_date_string.phpt +++ b/ext/date/tests/date_interval_create_from_date_string.phpt @@ -31,4 +31,4 @@ int(14) int(3) int(4) int(1) -int(1) +int(1)
\ No newline at end of file diff --git a/ext/date/tests/date_interval_create_from_date_string_wrongparam_001.phpt b/ext/date/tests/date_interval_create_from_date_string_wrongparam_001.phpt index fa675fa2fe..15db956553 100644 --- a/ext/date/tests/date_interval_create_from_date_string_wrongparam_001.phpt +++ b/ext/date/tests/date_interval_create_from_date_string_wrongparam_001.phpt @@ -8,4 +8,4 @@ $wrong_parameter = array(); $i = date_interval_create_from_date_string($wrong_parameter); ?> --EXPECTF-- -Warning: date_interval_create_from_date_string() expects parameter 1 to be string, array given in %s on line %d +Warning: date_interval_create_from_date_string() expects parameter 1 to be string, array given in %s on line %d
\ No newline at end of file diff --git a/ext/date/tests/date_parse_from_format_basic.phpt b/ext/date/tests/date_parse_from_format_basic.phpt index 717dfabe21..644949a2e8 100644 --- a/ext/date/tests/date_parse_from_format_basic.phpt +++ b/ext/date/tests/date_parse_from_format_basic.phpt @@ -11,4 +11,4 @@ display_errors=false var_dump(date_parse_from_format()); // invalid parameters ?> --EXPECT-- -bool(false) +bool(false)
\ No newline at end of file diff --git a/ext/date/tests/date_sun_info_error.phpt b/ext/date/tests/date_sun_info_error.phpt index 0b27757309..8d572479f3 100644 --- a/ext/date/tests/date_sun_info_error.phpt +++ b/ext/date/tests/date_sun_info_error.phpt @@ -43,4 +43,4 @@ bool(false) Warning: date_create() expects at most 2 parameters, 4 given in %s on line %d bool(false) -===Done=== +===Done===
\ No newline at end of file diff --git a/ext/date/tests/date_sunrise_variation9.phpt b/ext/date/tests/date_sunrise_variation9.phpt index 75794cc632..fb71d52228 100644 --- a/ext/date/tests/date_sunrise_variation9.phpt +++ b/ext/date/tests/date_sunrise_variation9.phpt @@ -58,4 +58,4 @@ bool(false) Warning: date_sunrise() expects parameter 1 to be int, float given in %s on line %d bool(false) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/date_timestamp_set.phpt b/ext/date/tests/date_timestamp_set.phpt index 09eeac0d76..d17ffcd985 100644 --- a/ext/date/tests/date_timestamp_set.phpt +++ b/ext/date/tests/date_timestamp_set.phpt @@ -16,4 +16,4 @@ date_timestamp_set($dtms021, 1234567890); var_dump(date_format($dtms021, 'B => (U) => T Y-M-d H:i:s')); ?> --EXPECT-- -string(47) "021 => (1234567890) => UTC 2009-Feb-13 23:31:30" +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_nullparam.phpt b/ext/date/tests/date_timestamp_set_nullparam.phpt index 27b105c998..04cde83346 100644 --- a/ext/date/tests/date_timestamp_set_nullparam.phpt +++ b/ext/date/tests/date_timestamp_set_nullparam.phpt @@ -14,4 +14,4 @@ $dtms021 = date_create(); date_timestamp_set(null, 1234567890); ?> --EXPECTF-- -Warning: date_timestamp_set() expects parameter 1 to be DateTime, null given in %s on line %d +Warning: date_timestamp_set() expects parameter 1 to be DateTime, null given in %s on line %d
\ 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 c22dc3011a..ee4477e907 100644 --- a/ext/date/tests/date_timestamp_set_nullparam2.phpt +++ b/ext/date/tests/date_timestamp_set_nullparam2.phpt @@ -21,4 +21,4 @@ object(DateTime)#1 (3) { int(3) ["timezone"]=> string(3) "UTC" -} +}
\ No newline at end of file diff --git a/ext/date/tests/date_timestamp_set_wrongparam_001.phpt b/ext/date/tests/date_timestamp_set_wrongparam_001.phpt index a7af0572f3..43fec3796a 100644 --- a/ext/date/tests/date_timestamp_set_wrongparam_001.phpt +++ b/ext/date/tests/date_timestamp_set_wrongparam_001.phpt @@ -14,4 +14,4 @@ $dtms021 = array(); date_timestamp_set($dtms021, 123456789); ?> --EXPECTF-- -Warning: date_timestamp_set() expects parameter 1 to be DateTime, array given in %s on line %d +Warning: date_timestamp_set() expects parameter 1 to be DateTime, array given in %s on line %d
\ No newline at end of file diff --git a/ext/date/tests/date_timestamp_set_wrongparam_002.phpt b/ext/date/tests/date_timestamp_set_wrongparam_002.phpt index 8fe38ff539..1f436d6c2f 100644 --- a/ext/date/tests/date_timestamp_set_wrongparam_002.phpt +++ b/ext/date/tests/date_timestamp_set_wrongparam_002.phpt @@ -12,4 +12,4 @@ $dftz021 = date_default_timezone_get(); //UTC date_timestamp_set(987654321, 123456789); ?> --EXPECTF-- -Warning: date_timestamp_set() expects parameter 1 to be DateTime, int given in %s on line %d +Warning: date_timestamp_set() expects parameter 1 to be DateTime, int given in %s on line %d
\ No newline at end of file diff --git a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt index bd2a71172a..149033660d 100644 --- a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt +++ b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt @@ -16,4 +16,4 @@ $wrong_parameter = array(); date_timestamp_set($dtms021, $wrong_parameter); ?> --EXPECTF-- -Warning: date_timestamp_set() expects parameter 2 to be int, array given in %s on line %d +Warning: date_timestamp_set() expects parameter 2 to be int, array given in %s on line %d
\ No newline at end of file diff --git a/ext/date/tests/date_timestamp_set_wrongparam_004.phpt b/ext/date/tests/date_timestamp_set_wrongparam_004.phpt index 3a6d304561..a9aab110e2 100644 --- a/ext/date/tests/date_timestamp_set_wrongparam_004.phpt +++ b/ext/date/tests/date_timestamp_set_wrongparam_004.phpt @@ -14,4 +14,4 @@ $dtms021 = new DateTime(); date_timestamp_set($dtms021, 123456789, 'error'); ?> --EXPECTF-- -Warning: date_timestamp_set() expects exactly 2 parameters, 3 given in %s on line %d +Warning: date_timestamp_set() expects exactly 2 parameters, 3 given in %s on line %d
\ No newline at end of file diff --git a/ext/date/tests/date_timezone_get_basic1.phpt b/ext/date/tests/date_timezone_get_basic1.phpt index 9e8e92cde8..7e0f32a6ca 100644 --- a/ext/date/tests/date_timezone_get_basic1.phpt +++ b/ext/date/tests/date_timezone_get_basic1.phpt @@ -32,4 +32,4 @@ var_dump( timezone_name_get($tz) ); string(13) "Europe/London" string(16) "America/New_York" string(19) "America/Los_Angeles" -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/date_timezone_set_basic1.phpt b/ext/date/tests/date_timezone_set_basic1.phpt index bfab43eda6..b38354dae0 100644 --- a/ext/date/tests/date_timezone_set_basic1.phpt +++ b/ext/date/tests/date_timezone_set_basic1.phpt @@ -31,3 +31,4 @@ echo "New timezone: " . timezone_name_get($tz) . "\n"; Default timezone: Europe/London New timezone: America/Los_Angeles ===DONE=== + diff --git a/ext/date/tests/date_timezone_set_variation1.phpt b/ext/date/tests/date_timezone_set_variation1.phpt index 549993b532..4fc44c6667 100644 --- a/ext/date/tests/date_timezone_set_variation1.phpt +++ b/ext/date/tests/date_timezone_set_variation1.phpt @@ -251,3 +251,4 @@ bool(false) Warning: date_timezone_set() expects parameter 1 to be DateTime, resource given in %s on line %d bool(false) ===DONE=== + diff --git a/ext/date/tests/date_variation1.phpt b/ext/date/tests/date_variation1.phpt index 533d0d3d7c..0a3b9d4189 100644 --- a/ext/date/tests/date_variation1.phpt +++ b/ext/date/tests/date_variation1.phpt @@ -205,3 +205,4 @@ string(0) "" Warning: date() expects parameter 1 to be string, resource given in %s on line %d bool(false) ===DONE=== + diff --git a/ext/date/tests/date_variation2.phpt b/ext/date/tests/date_variation2.phpt index 77dc822396..10a9f88793 100644 --- a/ext/date/tests/date_variation2.phpt +++ b/ext/date/tests/date_variation2.phpt @@ -219,3 +219,4 @@ string(24) "January 1, 1970, 1:00 am" Warning: date() expects parameter 2 to be int, resource 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 index e24f3e6d84..a6ef3b6fb9 100644 --- a/ext/date/tests/getdate_variation7.phpt +++ b/ext/date/tests/getdate_variation7.phpt @@ -34,4 +34,4 @@ bool(false) Warning: getdate() expects parameter 1 to be int, float given in %s on line %d bool(false) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/gmdate_variation14.phpt b/ext/date/tests/gmdate_variation14.phpt index 5b6c48fca5..86350f4e7a 100644 --- a/ext/date/tests/gmdate_variation14.phpt +++ b/ext/date/tests/gmdate_variation14.phpt @@ -37,4 +37,4 @@ bool(false) Warning: gmdate() expects parameter 2 to be int, float given in %s on line %d bool(false) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/gmstrftime_variation11.phpt b/ext/date/tests/gmstrftime_variation11.phpt index bb37757c7a..f64c3ea1e2 100644 --- a/ext/date/tests/gmstrftime_variation11.phpt +++ b/ext/date/tests/gmstrftime_variation11.phpt @@ -1,11 +1,5 @@ --TEST-- Test gmstrftime() function : usage variation - Checking month related formats which was not supported on Windows before VC14. ---SKIPIF-- -<?php -if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - die("skip Test is valid for Windows"); -} -?> --FILE-- <?php /* Prototype : string gmstrftime(string format [, int timestamp]) diff --git a/ext/date/tests/gmstrftime_variation13.phpt b/ext/date/tests/gmstrftime_variation13.phpt index c8c77c8055..9a7a9b3c4b 100644 --- a/ext/date/tests/gmstrftime_variation13.phpt +++ b/ext/date/tests/gmstrftime_variation13.phpt @@ -1,11 +1,5 @@ --TEST-- Test gmstrftime() function : usage variation - Checking date related formats which was not supported on Windows before VC14. ---SKIPIF-- -<?php -if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - die("skip Test is valid for Windows"); -} -?> --FILE-- <?php /* Prototype : string gmstrftime(string format [, int timestamp]) diff --git a/ext/date/tests/gmstrftime_variation15.phpt b/ext/date/tests/gmstrftime_variation15.phpt index 157eaa8fec..ac91c66a9e 100644 --- a/ext/date/tests/gmstrftime_variation15.phpt +++ b/ext/date/tests/gmstrftime_variation15.phpt @@ -1,11 +1,5 @@ --TEST-- Test gmstrftime() function : usage variation - Checking time related formats which was not supported on Windows before VC14. ---SKIPIF-- -<?php -if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - die("skip Test is valid for Windows"); -} -?> --FILE-- <?php /* Prototype : string gmstrftime(string format [, int timestamp]) diff --git a/ext/date/tests/gmstrftime_variation17.phpt b/ext/date/tests/gmstrftime_variation17.phpt index d4d82efd10..9abdb76e0c 100644 --- a/ext/date/tests/gmstrftime_variation17.phpt +++ b/ext/date/tests/gmstrftime_variation17.phpt @@ -1,11 +1,5 @@ --TEST-- Test gmstrftime() function : usage variation - Checking day related formats which was not supported on Windows before vc14. ---SKIPIF-- -<?php -if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - die("skip Test is valid for Windows"); -} -?> --FILE-- <?php /* Prototype : string gmstrftime(string format [, int timestamp]) diff --git a/ext/date/tests/gmstrftime_variation19.phpt b/ext/date/tests/gmstrftime_variation19.phpt index 3000860bb9..983911fa48 100644 --- a/ext/date/tests/gmstrftime_variation19.phpt +++ b/ext/date/tests/gmstrftime_variation19.phpt @@ -1,11 +1,5 @@ --TEST-- Test gmstrftime() function : usage variation - Checking newline and tab formats which was not supported on Windows before VC14. ---SKIPIF-- -<?php -if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - die("skip Test is valid for Windows"); -} -?> --FILE-- <?php /* Prototype : string gmstrftime(string format [, int timestamp]) diff --git a/ext/date/tests/gmstrftime_variation21.phpt b/ext/date/tests/gmstrftime_variation21.phpt index a427090942..8ff050fc9a 100644 --- a/ext/date/tests/gmstrftime_variation21.phpt +++ b/ext/date/tests/gmstrftime_variation21.phpt @@ -1,11 +1,5 @@ --TEST-- Test gmstrftime() function : usage variation - Checking Preferred date and time representation on Windows. ---SKIPIF-- -<?php -if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - die("skip Test is valid for Windows"); -} -?> --FILE-- <?php /* Prototype : string gmstrftime(string format [, int timestamp]) diff --git a/ext/date/tests/gmstrftime_variation9.phpt b/ext/date/tests/gmstrftime_variation9.phpt index ec69404cfc..560ea2db47 100644 --- a/ext/date/tests/gmstrftime_variation9.phpt +++ b/ext/date/tests/gmstrftime_variation9.phpt @@ -1,11 +1,5 @@ --TEST-- Test gmstrftime() function : usage variation - Checking week related formats which was not supported on Windows before vc14. ---SKIPIF-- -<?php -if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - die("skip Test is only valid for Windows"); -} -?> --FILE-- <?php /* Prototype : string gmstrftime(string format [, int timestamp]) diff --git a/ext/date/tests/idate_error.phpt b/ext/date/tests/idate_error.phpt index ff277ecd6a..b9a8354923 100644 --- a/ext/date/tests/idate_error.phpt +++ b/ext/date/tests/idate_error.phpt @@ -34,3 +34,4 @@ bool(false) Warning: idate() expects at most 2 parameters, 3 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 index 9b6bc567e0..7e5a9eb103 100644 --- a/ext/date/tests/idate_variation3.phpt +++ b/ext/date/tests/idate_variation3.phpt @@ -38,4 +38,4 @@ bool(false) Warning: idate() expects parameter 2 to be int, float given in %s on line %d bool(false) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/localtime_error.phpt b/ext/date/tests/localtime_error.phpt index 4c9dee85f7..0224c3538e 100644 --- a/ext/date/tests/localtime_error.phpt +++ b/ext/date/tests/localtime_error.phpt @@ -30,3 +30,4 @@ var_dump( localtime($timestamp, $assoc, $extra_arg) ); Warning: localtime() expects at most 2 parameters, 3 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..201456b8c0 100644 --- a/ext/date/tests/microtime_error.phpt +++ b/ext/date/tests/microtime_error.phpt @@ -31,6 +31,7 @@ foreach ($bad_args as $bad_arg) { ?> ===DONE=== --EXPECTF-- + -- Too many arguments -- Warning: microtime() expects at most 1 parameter, 2 given in %s on line 11 @@ -68,4 +69,4 @@ NULL --> bad arg: int(1) float(%s) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/mktime-3.phpt b/ext/date/tests/mktime-3.phpt index ce1a203a20..4347826aa0 100644 --- a/ext/date/tests/mktime-3.phpt +++ b/ext/date/tests/mktime-3.phpt @@ -56,4 +56,4 @@ Y: 1999 - January 1999-01-01T01:01:01+0100 Y: 2000 - January 2000-01-01T01:01:01+0100 Y: 2001 - January 2001-01-01T01:01:01+0100 -===Done=== +===Done===
\ No newline at end of file diff --git a/ext/date/tests/mktime_basic1.phpt b/ext/date/tests/mktime_basic1.phpt index 955c05f55c..b2cf13da79 100644 --- a/ext/date/tests/mktime_basic1.phpt +++ b/ext/date/tests/mktime_basic1.phpt @@ -38,3 +38,4 @@ int(%i) int(%i) int(%i) ===DONE=== + diff --git a/ext/date/tests/mktime_variation1.phpt b/ext/date/tests/mktime_variation1.phpt index da4dd1836a..59e336d9a5 100644 --- a/ext/date/tests/mktime_variation1.phpt +++ b/ext/date/tests/mktime_variation1.phpt @@ -221,4 +221,4 @@ int(%i) Warning: mktime() expects parameter 1 to be int, resource given in %s on line %d bool(false) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/mktime_variation6.phpt b/ext/date/tests/mktime_variation6.phpt index 82f42634a1..cf3617039c 100644 --- a/ext/date/tests/mktime_variation6.phpt +++ b/ext/date/tests/mktime_variation6.phpt @@ -220,3 +220,4 @@ int(%i) Warning: mktime() expects parameter 6 to be int, resource given in %s on line %d bool(false) ===DONE=== + diff --git a/ext/date/tests/strftime_variation11.phpt b/ext/date/tests/strftime_variation11.phpt index 55eb7226b8..737f7c96de 100644 --- a/ext/date/tests/strftime_variation11.phpt +++ b/ext/date/tests/strftime_variation11.phpt @@ -1,11 +1,5 @@ --TEST-- Test strftime() function : usage variation - Checking month related formats which was not supported on Windows before VC14. ---SKIPIF-- -<?php -if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - die("skip Test is valid for Windows"); -} -?> --FILE-- <?php /* Prototype : string strftime(string format [, int timestamp]) diff --git a/ext/date/tests/strftime_variation13.phpt b/ext/date/tests/strftime_variation13.phpt index 887a14e7e7..cce13fbc3b 100644 --- a/ext/date/tests/strftime_variation13.phpt +++ b/ext/date/tests/strftime_variation13.phpt @@ -1,11 +1,5 @@ --TEST-- Test strftime() function : usage variation - Checking date related formats which was not supported on Windows before VC14. ---SKIPIF-- -<?php -if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - die("skip Test is valid for Windows"); -} -?> --FILE-- <?php /* Prototype : string strftime(string format [, int timestamp]) diff --git a/ext/date/tests/strftime_variation15.phpt b/ext/date/tests/strftime_variation15.phpt index 41be0bfeaf..f6e8fedf0b 100644 --- a/ext/date/tests/strftime_variation15.phpt +++ b/ext/date/tests/strftime_variation15.phpt @@ -1,11 +1,5 @@ --TEST-- Test strftime() function : usage variation - Checking time related formats which was not supported on Windows before VC14. ---SKIPIF-- -<?php -if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - die("skip Test is valid for Windows"); -} -?> --FILE-- <?php /* Prototype : string strftime(string format [, int timestamp]) diff --git a/ext/date/tests/strftime_variation17.phpt b/ext/date/tests/strftime_variation17.phpt index 05ff3a0c8a..04e1cadab0 100644 --- a/ext/date/tests/strftime_variation17.phpt +++ b/ext/date/tests/strftime_variation17.phpt @@ -1,11 +1,5 @@ --TEST-- Test strftime() function : usage variation - Checking day related formats which was not supported on Windows before VC14. ---SKIPIF-- -<?php -if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - die("skip Test is valid for Windows"); -} -?> --FILE-- <?php /* Prototype : string strftime(string format [, int timestamp]) diff --git a/ext/date/tests/strftime_variation19.phpt b/ext/date/tests/strftime_variation19.phpt index 37e6c85eb9..125a47c789 100644 --- a/ext/date/tests/strftime_variation19.phpt +++ b/ext/date/tests/strftime_variation19.phpt @@ -1,11 +1,5 @@ --TEST-- Test strftime() function : usage variation - Checking newline and tab formats which was not supported on Windows before VC14. ---SKIPIF-- -<?php -if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - die("skip Test is valid for Windows"); -} -?> --FILE-- <?php /* Prototype : string strftime(string format [, int timestamp]) diff --git a/ext/date/tests/strftime_variation21.phpt b/ext/date/tests/strftime_variation21.phpt index 0eb0bea02b..730716c392 100644 --- a/ext/date/tests/strftime_variation21.phpt +++ b/ext/date/tests/strftime_variation21.phpt @@ -1,11 +1,5 @@ --TEST-- Test strftime() function : usage variation - Checking Preferred date and time representation on Windows. ---SKIPIF-- -<?php -if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - die("skip Test is valid for Windows"); -} -?> --FILE-- <?php /* Prototype : string strftime(string format [, int timestamp]) diff --git a/ext/date/tests/strftime_variation23.phpt b/ext/date/tests/strftime_variation23.phpt index 22f079702a..d1adf052e9 100644 --- a/ext/date/tests/strftime_variation23.phpt +++ b/ext/date/tests/strftime_variation23.phpt @@ -39,4 +39,4 @@ bool(false) Warning: strftime() expects parameter 2 to be int, float given in %s on line %d bool(false) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/strftime_variation9.phpt b/ext/date/tests/strftime_variation9.phpt index d9898e0294..49363ec27b 100644 --- a/ext/date/tests/strftime_variation9.phpt +++ b/ext/date/tests/strftime_variation9.phpt @@ -1,11 +1,5 @@ --TEST-- Test strftime() function : usage variation - Checking week related formats which was not supported on Windows before VC14. ---SKIPIF-- -<?php -if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - die("skip Test is valid for Windows"); -} -?> --FILE-- <?php /* Prototype : string strftime(string format [, int timestamp]) diff --git a/ext/date/tests/strtotime-mysql-64bit.phpt b/ext/date/tests/strtotime-mysql-64bit.phpt index c511d626e9..38e7f15dff 100644 --- a/ext/date/tests/strtotime-mysql-64bit.phpt +++ b/ext/date/tests/strtotime-mysql-64bit.phpt @@ -25,3 +25,4 @@ foreach($d as $date) { string(31) "Fri, 23 May 1997 09:15:28 +0000" string(31) "Sun, 31 Dec 2000 18:58:59 +0000" string(31) "Wed, 10 Apr 2080 10:10:10 +0000" + diff --git a/ext/date/tests/strtotime_basic.phpt b/ext/date/tests/strtotime_basic.phpt index 0afd6d2bc1..55c145722d 100644 --- a/ext/date/tests/strtotime_basic.phpt +++ b/ext/date/tests/strtotime_basic.phpt @@ -35,7 +35,7 @@ var_dump(date('Y-m-d', strtotime('second Monday December 2008'))); */ var_dump(date('Y-m-d', strtotime('third Monday December 2008'))); ?> ---EXPECTF-- +--EXPECT-- string(10) "2008-12-01" string(10) "2008-12-08" string(10) "2008-12-15" diff --git a/ext/date/tests/strtotime_basic2.phpt b/ext/date/tests/strtotime_basic2.phpt index 5f9bcd552e..f90e66da87 100644 --- a/ext/date/tests/strtotime_basic2.phpt +++ b/ext/date/tests/strtotime_basic2.phpt @@ -10,4 +10,4 @@ date.timezone=UTC var_dump(strtotime('mayy 2 2009')); // misspelled month name ?> --EXPECT-- -bool(false) +bool(false)
\ No newline at end of file diff --git a/ext/date/tests/strtotime_variation_scottish.phpt b/ext/date/tests/strtotime_variation_scottish.phpt index 0cd642cc82..740583a78e 100644 --- a/ext/date/tests/strtotime_variation_scottish.phpt +++ b/ext/date/tests/strtotime_variation_scottish.phpt @@ -8,7 +8,7 @@ Checking whisky time var_dump(date('H:i:s', strtotime('back of 19'))); var_dump(date('H:i:s', strtotime('front of 19'))); ?> ---EXPECTF-- +--EXPECT-- string(8) "07:15:00" string(8) "06:45:00" string(8) "19:15:00" diff --git a/ext/date/tests/time_basic.phpt b/ext/date/tests/time_basic.phpt index 0ff2f0120c..7b93e9dac2 100644 --- a/ext/date/tests/time_basic.phpt +++ b/ext/date/tests/time_basic.phpt @@ -13,4 +13,4 @@ var_dump(time()); ===DONE=== --EXPECTF-- int(%d) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/timezone_identifiers_list_basic1.phpt b/ext/date/tests/timezone_identifiers_list_basic1.phpt index b6b0ca43b8..f38ae7f86e 100644 --- a/ext/date/tests/timezone_identifiers_list_basic1.phpt +++ b/ext/date/tests/timezone_identifiers_list_basic1.phpt @@ -33,4 +33,4 @@ bool(true) bool(true) bool(true) ===DONE=== - +
\ No newline at end of file diff --git a/ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt b/ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt index 39c71ab1db..5b8493ba11 100644 --- a/ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt +++ b/ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt @@ -12,4 +12,4 @@ print_r(timezone_identifiers_list(4096)); ?> --EXPECTF-- -Notice: timezone_identifiers_list(): A two-letter ISO 3166-1 compatible country code is expected in %s on line %d +Notice: timezone_identifiers_list(): A two-letter ISO 3166-1 compatible country code is expected in %s on line %d
\ No newline at end of file diff --git a/ext/date/tests/timezone_location_get.phpt b/ext/date/tests/timezone_location_get.phpt index a74bf7fd73..93f7ed6d75 100644 --- a/ext/date/tests/timezone_location_get.phpt +++ b/ext/date/tests/timezone_location_get.phpt @@ -21,3 +21,4 @@ array(4) { ["comments"]=> string(0) "" } + diff --git a/ext/date/tests/timezone_offset_get_basic1.phpt b/ext/date/tests/timezone_offset_get_basic1.phpt index c7e197af85..90fc4bb9a3 100644 --- a/ext/date/tests/timezone_offset_get_basic1.phpt +++ b/ext/date/tests/timezone_offset_get_basic1.phpt @@ -31,4 +31,4 @@ var_dump(timezone_offset_get($tz, $date)); %rint\(0\)|int\(3600\)%r %rint\(-18000\)|int\(-14400\)%r %rint\(-28800\)|int\(-25200\)%r -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/timezone_transitions_get_basic1.phpt b/ext/date/tests/timezone_transitions_get_basic1.phpt index 2fd44a430d..3189e35074 100644 --- a/ext/date/tests/timezone_transitions_get_basic1.phpt +++ b/ext/date/tests/timezone_transitions_get_basic1.phpt @@ -50,4 +50,4 @@ array(5) { ["abbr"]=> string(3) "BST" } -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/date/tests/timezone_version_get.phpt b/ext/date/tests/timezone_version_get.phpt index c6e88e7bb3..2c75de7ebc 100644 --- a/ext/date/tests/timezone_version_get.phpt +++ b/ext/date/tests/timezone_version_get.phpt @@ -10,4 +10,4 @@ date_default_timezone_set("America/Sao_Paulo"); var_dump(timezone_version_get()); ?> --EXPECTREGEX-- -string\([6-7]\) \"20[0-9][0-9]\.[1-9][0-9]?\" +string\([6-7]\) \"20[0-9][0-9]\.[1-9][0-9]?\"
\ No newline at end of file diff --git a/ext/date/tests/timezone_version_get_basic1.phpt b/ext/date/tests/timezone_version_get_basic1.phpt index f008486b1f..ba0ac00715 100644 --- a/ext/date/tests/timezone_version_get_basic1.phpt +++ b/ext/date/tests/timezone_version_get_basic1.phpt @@ -9,4 +9,4 @@ date.timezone=UTC <?php $versionTimezone = timezone_version_get(); echo $versionTimezone; ?> --EXPECTREGEX-- -^[12][0-9]{3}.[0-9]+$ +^[12][0-9]{3}.[0-9]+$
\ No newline at end of file |