diff options
author | Dmitry Stogov <dmitry@zend.com> | 2014-05-26 10:52:43 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-26 10:52:43 +0400 |
commit | 9dd66e4d537073ea311929a65622d898193618c8 (patch) | |
tree | c1a205487d4156c439d1b4f8e8e9f82b425fa9eb | |
parent | 066c1d5451a33c652e23a59e6455dca331007919 (diff) | |
parent | 347b430a03a394f31048ad16b2bbc22e29f3baf5 (diff) | |
download | php-git-9dd66e4d537073ea311929a65622d898193618c8.tar.gz |
Merge branch 'master' into phpng
* master:
Fixed issue #183 (TMP_VAR is not only used once)
Fix broken Junit output with --disable-cgi
Added folder mark
Further test fixes for the fdb2709 breakage.
Fix broken test caused by fdb2709.
Added tests for ZipArchive::addGlob() and ZipArchive::addPattern()
Fix run-tests.php with Valgrind >= 3.10.0.
Add microseconds to the serialised form of DateTime objects.
Improved test for bug #62479
fix typo in ODBC code
gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
5.5.14 now
Fix bug #67060: use default mode of 660
Conflicts:
ext/date/php_date.c
57 files changed, 599 insertions, 430 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 3d203eb227..493033b60b 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -2196,7 +2196,7 @@ static HashTable *date_object_get_properties(zval *object TSRMLS_DC) /* {{{ */ } /* first we add the date and time in ISO format */ - ZVAL_STR(&zv, date_format("Y-m-d H:i:s", sizeof("Y-m-d H:i:s")-1, dateobj->time, 1 TSRMLS_CC)); + ZVAL_STR(&zv, date_format("Y-m-d H:i:s.u", sizeof("Y-m-d H:i:s.u")-1, dateobj->time, 1 TSRMLS_CC)); zend_hash_str_update(props, "date", sizeof("date")-1, &zv); /* then we add the timezone name (or similar) */ diff --git a/ext/date/tests/012.phpt b/ext/date/tests/012.phpt index 0577f18233..be7e4e32af 100644 --- a/ext/date/tests/012.phpt +++ b/ext/date/tests/012.phpt @@ -21,7 +21,7 @@ echo "Done\n"; --EXPECTF-- object(DateTime)#1 (3) { ["date"]=> - string(19) "2006-01-23 00:00:00" + string(26) "2006-01-23 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -34,7 +34,7 @@ bool(false) string(19) "2006/01/23 00:00:00" object(DateTime)#1 (3) { ["date"]=> - string(19) "2006-01-30 00:00:00" + string(26) "2006-01-30 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -43,7 +43,7 @@ object(DateTime)#1 (3) { string(19) "2006/01/30 00:00:00" object(DateTime)#1 (3) { ["date"]=> - string(19) "2007-12-10 00:00:00" + string(26) "2007-12-10 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/013.phpt b/ext/date/tests/013.phpt index 60fac24f6e..266dafe06a 100644 --- a/ext/date/tests/013.phpt +++ b/ext/date/tests/013.phpt @@ -21,7 +21,7 @@ echo "Done\n"; --EXPECTF-- object(DateTime)#%d (3) { ["date"]=> - string(19) "2006-12-12 00:00:00" + string(26) "2006-12-12 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -38,7 +38,7 @@ bool(false) string(19) "2006.12.12 00:00:00" object(DateTime)#1 (3) { ["date"]=> - string(19) "2006-02-15 00:00:00" + string(26) "2006-02-15 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -47,7 +47,7 @@ object(DateTime)#1 (3) { string(19) "2006.02.15 00:00:00" object(DateTime)#1 (3) { ["date"]=> - string(19) "2008-01-29 00:00:00" + string(26) "2008-01-29 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/014.phpt b/ext/date/tests/014.phpt index 5e609c8685..3adb32c965 100644 --- a/ext/date/tests/014.phpt +++ b/ext/date/tests/014.phpt @@ -20,7 +20,7 @@ echo "Done\n"; --EXPECTF-- object(DateTime)#%d (3) { ["date"]=> - string(19) "2006-12-12 00:00:00" + string(26) "2006-12-12 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/DateTimeImmutable_createFromMutable.phpt b/ext/date/tests/DateTimeImmutable_createFromMutable.phpt index db893b9821..ac92fb4bb4 100644 --- a/ext/date/tests/DateTimeImmutable_createFromMutable.phpt +++ b/ext/date/tests/DateTimeImmutable_createFromMutable.phpt @@ -15,7 +15,7 @@ var_dump( $i ); --EXPECTF-- object(DateTimeImmutable)#%d (3) { ["date"]=> - string(19) "2014-03-02 16:24:08" + string(26) "2014-03-02 16:24:08.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/DateTime_clone_basic2.phpt b/ext/date/tests/DateTime_clone_basic2.phpt index db7ba22719..99659c10a0 100644 --- a/ext/date/tests/DateTime_clone_basic2.phpt +++ b/ext/date/tests/DateTime_clone_basic2.phpt @@ -37,7 +37,7 @@ object(DateTimeExt1)#%d (5) { ["property2"]=> string(5) "Hello" ["date"]=> - string(19) "2009-02-03 12:34:41" + string(26) "2009-02-03 12:34:41.000000" ["timezone_type"]=> int(2) ["timezone"]=> @@ -49,7 +49,7 @@ object(DateTimeExt1)#%d (5) { ["property2"]=> string(5) "Hello" ["date"]=> - string(19) "2009-02-03 12:34:41" + string(26) "2009-02-03 12:34:41.000000" ["timezone_type"]=> int(2) ["timezone"]=> @@ -65,7 +65,7 @@ object(DateTimeExt2)#%d (7) { ["property2"]=> string(5) "Hello" ["date"]=> - string(19) "2009-02-03 12:34:41" + string(26) "2009-02-03 12:34:41.000000" ["timezone_type"]=> int(2) ["timezone"]=> @@ -81,7 +81,7 @@ object(DateTimeExt2)#%d (7) { ["property2"]=> string(5) "Hello" ["date"]=> - string(19) "2009-02-03 12:34:41" + string(26) "2009-02-03 12:34:41.000000" ["timezone_type"]=> int(2) ["timezone"]=> diff --git a/ext/date/tests/DateTime_clone_basic3.phpt b/ext/date/tests/DateTime_clone_basic3.phpt index 43e289817e..f3d9c142fb 100644 --- a/ext/date/tests/DateTime_clone_basic3.phpt +++ b/ext/date/tests/DateTime_clone_basic3.phpt @@ -32,7 +32,7 @@ var_dump($d2_clone); -- Create a DateTime object -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-02-03 12:34:41" + string(26) "2009-02-03 12:34:41.000000" ["timezone_type"]=> int(2) ["timezone"]=> @@ -42,7 +42,7 @@ object(DateTime)#%d (3) { -- Add some properties -- object(DateTime)#%d (5) { ["date"]=> - string(19) "2009-02-03 12:34:41" + string(26) "2009-02-03 12:34:41.000000" ["timezone_type"]=> int(2) ["timezone"]=> @@ -56,7 +56,7 @@ object(DateTime)#%d (5) { -- clone it -- object(DateTime)#%d (5) { ["date"]=> - string(19) "2009-02-03 12:34:41" + string(26) "2009-02-03 12:34:41.000000" ["timezone_type"]=> int(2) ["timezone"]=> @@ -70,7 +70,7 @@ object(DateTime)#%d (5) { -- Add some more properties -- object(DateTime)#%d (7) { ["date"]=> - string(19) "2009-02-03 12:34:41" + string(26) "2009-02-03 12:34:41.000000" ["timezone_type"]=> int(2) ["timezone"]=> @@ -88,7 +88,7 @@ object(DateTime)#%d (7) { -- clone it -- object(DateTime)#%d (7) { ["date"]=> - string(19) "2009-02-03 12:34:41" + string(26) "2009-02-03 12:34:41.000000" ["timezone_type"]=> int(2) ["timezone"]=> diff --git a/ext/date/tests/DateTime_construct_basic1.phpt b/ext/date/tests/DateTime_construct_basic1.phpt index a865e6bb97..d6a8956bf3 100644 --- a/ext/date/tests/DateTime_construct_basic1.phpt +++ b/ext/date/tests/DateTime_construct_basic1.phpt @@ -41,7 +41,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "2005-07-14 22:30:41" + string(26) "2005-07-14 22:30:41.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -49,7 +49,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "2005-07-14 22:30:41" + string(26) "2005-07-14 22:30:41.000000" ["timezone_type"]=> int(2) ["timezone"]=> diff --git a/ext/date/tests/DateTime_construct_variation1.phpt b/ext/date/tests/DateTime_construct_variation1.phpt index d335b5ab1b..f106a40935 100644 --- a/ext/date/tests/DateTime_construct_variation1.phpt +++ b/ext/date/tests/DateTime_construct_variation1.phpt @@ -142,7 +142,7 @@ FAILED: DateTime::__construct(): Failed to parse time string (-12345) at positio -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -150,7 +150,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -164,7 +164,7 @@ FAILED: DateTime::__construct(): Failed to parse time string (-10.5) at position -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -172,7 +172,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -198,7 +198,7 @@ FAILED: DateTime::__construct() expects parameter 1 to be string, array given -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -206,7 +206,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -216,7 +216,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -224,7 +224,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -238,7 +238,7 @@ FAILED: DateTime::__construct(): Failed to parse time string (1) at position 0 ( -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -246,7 +246,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -260,7 +260,7 @@ FAILED: DateTime::__construct(): Failed to parse time string (1) at position 0 ( -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -268,7 +268,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -278,7 +278,7 @@ object(DateTime)#%d (3) { -- empty string DQ -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -286,7 +286,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -296,7 +296,7 @@ object(DateTime)#%d (3) { -- empty string SQ -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -304,7 +304,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -338,7 +338,7 @@ FAILED: DateTime::__construct() expects parameter 1 to be string, object given -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -346,7 +346,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -356,7 +356,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -364,7 +364,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/DateTime_construct_variation2.phpt b/ext/date/tests/DateTime_construct_variation2.phpt index b1d80f9002..dfc1047bc4 100644 --- a/ext/date/tests/DateTime_construct_variation2.phpt +++ b/ext/date/tests/DateTime_construct_variation2.phpt @@ -153,7 +153,7 @@ FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, array gi -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2005-07-14 22:30:41" + string(26) "2005-07-14 22:30:41.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -163,7 +163,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2005-07-14 22:30:41" + string(26) "2005-07-14 22:30:41.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -209,7 +209,7 @@ FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, object g -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2005-07-14 22:30:41" + string(26) "2005-07-14 22:30:41.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -219,7 +219,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2005-07-14 22:30:41" + string(26) "2005-07-14 22:30:41.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/DateTime_modify_variation1.phpt b/ext/date/tests/DateTime_modify_variation1.phpt index faeb70cbd9..ddb36751ce 100644 --- a/ext/date/tests/DateTime_modify_variation1.phpt +++ b/ext/date/tests/DateTime_modify_variation1.phpt @@ -133,7 +133,7 @@ bool(false) -- float 10.5 -- object(DateTime)#3 (3) { ["date"]=> - string(19) "2009-01-31 10:05:00" + string(26) "2009-01-31 10:05:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -148,7 +148,7 @@ bool(false) -- float .5 -- object(DateTime)#3 (3) { ["date"]=> - string(19) "2009-01-31 00:05:00" + string(26) "2009-01-31 00:05:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/DateTime_serialize.phpt b/ext/date/tests/DateTime_serialize.phpt index ff827360fb..b8af87eee1 100644 --- a/ext/date/tests/DateTime_serialize.phpt +++ b/ext/date/tests/DateTime_serialize.phpt @@ -20,20 +20,20 @@ var_dump( $date2->format( "F j, Y, g:i a") ); --EXPECTF-- object(DateTime)#%d (3) { ["date"]=> - string(19) "2005-07-14 22:30:41" + string(26) "2005-07-14 22:30:41.000000" ["timezone_type"]=> int(3) ["timezone"]=> string(13) "Europe/London" } -string(118) "O:8:"DateTime":3:{s:4:"date";s:19:"2005-07-14 22:30:41";s:13:"timezone_type";i:3;s:8:"timezone";s:13:"Europe/London";}" +string(125) "O:8:"DateTime":3:{s:4:"date";s:26:"2005-07-14 22:30:41.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:13:"Europe/London";}" object(DateTime)#%d (3) { ["date"]=> - string(19) "2005-07-14 22:30:41" + string(26) "2005-07-14 22:30:41.000000" ["timezone_type"]=> int(3) ["timezone"]=> string(13) "Europe/London" } string(23) "July 14, 2005, 10:30 pm" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/DateTime_setDate_variation1.phpt b/ext/date/tests/DateTime_setDate_variation1.phpt index 5017cc1d78..f5ca4cb727 100644 --- a/ext/date/tests/DateTime_setDate_variation1.phpt +++ b/ext/date/tests/DateTime_setDate_variation1.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-07-02 08:34:10" + string(26) "0000-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0001-07-02 08:34:10" + string(26) "0001-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(20) "12345-07-02 08:34:10" + string(27) "12345-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(21) "-12345-07-02 08:34:10" + string(28) "-12345-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0010-07-02 08:34:10" + string(26) "0010-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(20) "-0010-07-02 08:34:10" + string(27) "-0010-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-07-02 08:34:10" + string(26) "0000-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-07-02 08:34:10" + string(26) "0000-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-07-02 08:34:10" + string(26) "0000-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0001-07-02 08:34:10" + string(26) "0001-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-07-02 08:34:10" + string(26) "0000-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0001-07-02 08:34:10" + string(26) "0001-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-07-02 08:34:10" + string(26) "0000-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-07-02 08:34:10" + string(26) "0000-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-07-02 08:34:10" + string(26) "0000-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -326,4 +326,4 @@ object(DateTime)#%d (3) { Warning: DateTime::setDate() expects parameter 1 to be long, resource given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/DateTime_setDate_variation2.phpt b/ext/date/tests/DateTime_setDate_variation2.phpt index a853f5ee2b..ab715c39a6 100644 --- a/ext/date/tests/DateTime_setDate_variation2.phpt +++ b/ext/date/tests/DateTime_setDate_variation2.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-01-02 08:34:10" + string(26) "1963-01-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2991-09-02 08:34:10" + string(26) "2991-09-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0934-03-02 08:34:10" + string(26) "0934-03-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-10-02 08:34:10" + string(26) "1963-10-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-02-02 08:34:10" + string(26) "1962-02-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-01-02 08:34:10" + string(26) "1963-01-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-01-02 08:34:10" + string(26) "1963-01-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/DateTime_setDate_variation3.phpt b/ext/date/tests/DateTime_setDate_variation3.phpt index da98e593fa..8f2e894b1f 100644 --- a/ext/date/tests/DateTime_setDate_variation3.phpt +++ b/ext/date/tests/DateTime_setDate_variation3.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-07-01 08:34:10" + string(26) "1963-07-01 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1997-04-17 08:34:10" + string(26) "1997-04-17 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1929-09-11 08:34:10" + string(26) "1929-09-11 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-07-10 08:34:10" + string(26) "1963-07-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-20 08:34:10" + string(26) "1963-06-20 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-07-01 08:34:10" + string(26) "1963-07-01 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-07-01 08:34:10" + string(26) "1963-07-01 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/DateTime_setISODate_variation1.phpt b/ext/date/tests/DateTime_setISODate_variation1.phpt index ded968fa8f..d685f27ed0 100644 --- a/ext/date/tests/DateTime_setISODate_variation1.phpt +++ b/ext/date/tests/DateTime_setISODate_variation1.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0001-02-13 08:34:10" + string(26) "0001-02-13 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(20) "12345-02-13 08:34:10" + string(27) "12345-02-13 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(21) "-12345-02-15 08:34:10" + string(28) "-12345-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0010-02-16 08:34:10" + string(26) "0010-02-16 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(20) "-0010-02-19 08:34:10" + string(27) "-0010-02-19 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0001-02-13 08:34:10" + string(26) "0001-02-13 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0001-02-13 08:34:10" + string(26) "0001-02-13 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/DateTime_setISODate_variation2.phpt b/ext/date/tests/DateTime_setISODate_variation2.phpt index ce322d2530..496e1c91f6 100644 --- a/ext/date/tests/DateTime_setISODate_variation2.phpt +++ b/ext/date/tests/DateTime_setISODate_variation2.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-01-01 08:34:10" + string(26) "1963-01-01 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2199-07-30 08:34:10" + string(26) "2199-07-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1726-05-21 08:34:10" + string(26) "1726-05-21 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-03-05 08:34:10" + string(26) "1963-03-05 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-10-16 08:34:10" + string(26) "1962-10-16 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-01-01 08:34:10" + string(26) "1963-01-01 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-01-01 08:34:10" + string(26) "1963-01-01 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/DateTime_setISODate_variation3.phpt b/ext/date/tests/DateTime_setISODate_variation3.phpt index d2d5644fbf..5b69b2faad 100644 --- a/ext/date/tests/DateTime_setISODate_variation3.phpt +++ b/ext/date/tests/DateTime_setISODate_variation3.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-11 08:34:10" + string(26) "1963-02-11 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1996-11-28 08:34:10" + string(26) "1996-11-28 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1929-04-24 08:34:10" + string(26) "1929-04-24 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-20 08:34:10" + string(26) "1963-02-20 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-01-31 08:34:10" + string(26) "1963-01-31 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-11 08:34:10" + string(26) "1963-02-11 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-11 08:34:10" + string(26) "1963-02-11 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/DateTime_setTime_variation1.phpt b/ext/date/tests/DateTime_setTime_variation1.phpt index 7edbd4ea47..1805081912 100644 --- a/ext/date/tests/DateTime_setTime_variation1.phpt +++ b/ext/date/tests/DateTime_setTime_variation1.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 00:13:45" + string(26) "2009-01-31 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 01:13:45" + string(26) "2009-01-31 01:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2010-06-29 09:13:45" + string(26) "2010-06-29 09:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 15:13:45" + string(26) "2009-01-30 15:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:13:45" + string(26) "2009-01-30 10:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 14:13:45" + string(26) "2009-01-29 14:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 00:13:45" + string(26) "2009-01-29 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 00:13:45" + string(26) "2009-01-29 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 00:13:45" + string(26) "2009-01-29 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 01:13:45" + string(26) "2009-01-29 01:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 00:13:45" + string(26) "2009-01-29 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 01:13:45" + string(26) "2009-01-29 01:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 00:13:45" + string(26) "2009-01-29 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 00:13:45" + string(26) "2009-01-29 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 00:13:45" + string(26) "2009-01-29 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/DateTime_setTime_variation2.phpt b/ext/date/tests/DateTime_setTime_variation2.phpt index 300eb9c001..fc034bf212 100644 --- a/ext/date/tests/DateTime_setTime_variation2.phpt +++ b/ext/date/tests/DateTime_setTime_variation2.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:00:45" + string(26) "2009-01-31 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:01:45" + string(26) "2009-01-31 10:01:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-02-08 23:45:45" + string(26) "2009-02-08 23:45:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 20:15:45" + string(26) "2009-01-30 20:15:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:10:45" + string(26) "2009-01-30 10:10:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 09:50:45" + string(26) "2009-01-30 09:50:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:00:45" + string(26) "2009-01-30 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:00:45" + string(26) "2009-01-30 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:00:45" + string(26) "2009-01-30 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:01:45" + string(26) "2009-01-30 10:01:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:00:45" + string(26) "2009-01-30 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:01:45" + string(26) "2009-01-30 10:01:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:00:45" + string(26) "2009-01-30 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:00:45" + string(26) "2009-01-30 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:00:45" + string(26) "2009-01-30 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/DateTime_setTime_variation3.phpt b/ext/date/tests/DateTime_setTime_variation3.phpt index 05bf4b5e52..21c62e0012 100644 --- a/ext/date/tests/DateTime_setTime_variation3.phpt +++ b/ext/date/tests/DateTime_setTime_variation3.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:01" + string(26) "2009-01-31 10:13:01.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 13:38:45" + string(26) "2009-01-31 13:38:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 06:47:15" + string(26) "2009-01-31 06:47:15.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:10" + string(26) "2009-01-31 10:13:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:12:50" + string(26) "2009-01-31 10:12:50.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:01" + string(26) "2009-01-31 10:13:01.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:01" + string(26) "2009-01-31 10:13:01.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/bug41523-64bit.phpt b/ext/date/tests/bug41523-64bit.phpt index d6d1320034..0c0e8076c3 100644 --- a/ext/date/tests/bug41523-64bit.phpt +++ b/ext/date/tests/bug41523-64bit.phpt @@ -46,7 +46,7 @@ array(12) { int(-62169984000) object(DateTime)#1 (3) { ["date"]=> - string(20) "-0001-11-30 00:00:00" + string(27) "-0001-11-30 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/bug41523.phpt b/ext/date/tests/bug41523.phpt index 948dae7dbf..05c591f063 100644 --- a/ext/date/tests/bug41523.phpt +++ b/ext/date/tests/bug41523.phpt @@ -46,7 +46,7 @@ array(12) { bool(false) object(DateTime)#1 (3) { ["date"]=> - string(20) "-0001-11-30 00:00:00" + string(20) "-0001-11-30 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/bug48097.phpt b/ext/date/tests/bug48097.phpt index d71a97e5a6..41ade81247 100644 --- a/ext/date/tests/bug48097.phpt +++ b/ext/date/tests/bug48097.phpt @@ -16,7 +16,7 @@ echo $d->format( 'U' ), "\n\n"; --EXPECT-- object(DateTime)#1 (3) { ["date"]=> - string(19) "1955-05-23 00:00:00" + string(26) "1955-05-23 00:00:00.000000" ["timezone_type"]=> int(1) ["timezone"]=> @@ -27,7 +27,7 @@ object(DateTime)#1 (3) { object(DateTime)#1 (3) { ["date"]=> - string(19) "1955-05-22 23:00:00" + string(26) "1955-05-22 23:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/bug51866.phpt b/ext/date/tests/bug51866.phpt index 01ca555fd9..9481aebe9d 100644 --- a/ext/date/tests/bug51866.phpt +++ b/ext/date/tests/bug51866.phpt @@ -46,7 +46,7 @@ string(6) "Y-m-d+" string(19) "2001-11-29 13:20:01" object(DateTime)#%d (3) { ["date"]=> - string(19) "2001-11-29 %d:%d:%d" + string(26) "2001-11-29 %d:%d:%d.%d" ["timezone_type"]=> int(3) ["timezone"]=> @@ -72,7 +72,7 @@ string(7) "Y-m-d +" string(19) "2001-11-29 13:20:01" object(DateTime)#%d (3) { ["date"]=> - string(19) "2001-11-29 %d:%d:%d" + string(26) "2001-11-29 %d:%d:%d.%d" ["timezone_type"]=> int(3) ["timezone"]=> @@ -98,7 +98,7 @@ string(6) "Y-m-d+" string(10) "2001-11-29" object(DateTime)#%d (3) { ["date"]=> - string(19) "2001-11-29 %d:%d:%d" + string(26) "2001-11-29 %d:%d:%d.%d" ["timezone_type"]=> int(3) ["timezone"]=> @@ -141,7 +141,7 @@ string(7) "Y-m-d +" string(11) "2001-11-29 " object(DateTime)#%d (3) { ["date"]=> - string(19) "2001-11-29 %d:%d:%d" + string(26) "2001-11-29 %d:%d:%d.%d" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/bug52113.phpt b/ext/date/tests/bug52113.phpt index f4730c6a44..62c2fca94e 100644 --- a/ext/date/tests/bug52113.phpt +++ b/ext/date/tests/bug52113.phpt @@ -117,7 +117,7 @@ object(DatePeriod)#6 (6) { ["start"]=> object(DateTime)#4 (3) { ["date"]=> - string(19) "2003-01-02 08:00:00" + string(26) "2003-01-02 08:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -201,7 +201,7 @@ object(DatePeriod)#9 (6) { ["start"]=> object(DateTime)#6 (3) { ["date"]=> - string(19) "2003-01-02 08:00:00" + string(26) "2003-01-02 08:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/bug53437.phpt b/ext/date/tests/bug53437.phpt index 2ea091453f..f82a4879b3 100644 --- a/ext/date/tests/bug53437.phpt +++ b/ext/date/tests/bug53437.phpt @@ -33,7 +33,7 @@ object(DatePeriod)#1 (6) { ["start"]=> object(DateTime)#2 (3) { ["date"]=> - string(19) "2010-01-01 00:00:00" + string(26) "2010-01-01 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -42,7 +42,7 @@ object(DatePeriod)#1 (6) { ["current"]=> object(DateTime)#4 (3) { ["date"]=> - string(19) "2010-01-04 00:00:00" + string(26) "2010-01-04 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -92,7 +92,7 @@ object(DatePeriod)#5 (6) { ["start"]=> object(DateTime)#10 (3) { ["date"]=> - string(19) "2010-01-01 00:00:00" + string(26) "2010-01-01 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -101,7 +101,7 @@ object(DatePeriod)#5 (6) { ["current"]=> object(DateTime)#7 (3) { ["date"]=> - string(19) "2010-01-04 00:00:00" + string(26) "2010-01-04 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/bug53879.phpt b/ext/date/tests/bug53879.phpt index 3d16c97209..3fd8250415 100644 --- a/ext/date/tests/bug53879.phpt +++ b/ext/date/tests/bug53879.phpt @@ -10,7 +10,7 @@ print_r($date); --EXPECTF-- DateTime Object ( - [date] => 2041-01-21 15:24:52 + [date] => 2041-01-21 15:24:52.000000 [timezone_type] => 2 [timezone] => GMT ) diff --git a/ext/date/tests/bug54316.phpt b/ext/date/tests/bug54316.phpt index a02288cdba..21afa637d8 100644 --- a/ext/date/tests/bug54316.phpt +++ b/ext/date/tests/bug54316.phpt @@ -12,7 +12,7 @@ var_dump($dt); --EXPECT-- object(DateTime)#1 (3) { ["date"]=> - string(19) "2011-02-02 00:00:00" + string(26) "2011-02-02 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -20,7 +20,7 @@ object(DateTime)#1 (3) { } object(DateTime)#2 (3) { ["date"]=> - string(19) "1970-01-01 00:00:00" + string(26) "1970-01-01 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/bug54340.phpt b/ext/date/tests/bug54340.phpt index 7f00309c93..eb977c35ee 100644 --- a/ext/date/tests/bug54340.phpt +++ b/ext/date/tests/bug54340.phpt @@ -19,7 +19,7 @@ var_dump($dt); --EXPECT-- object(DateTime)#2 (3) { ["date"]=> - string(19) "2011-01-01 00:00:00" + string(26) "2011-01-01 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -27,7 +27,7 @@ object(DateTime)#2 (3) { } object(DateTime)#2 (3) { ["date"]=> - string(19) "2011-01-02 00:00:00" + string(26) "2011-01-02 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -35,7 +35,7 @@ object(DateTime)#2 (3) { } object(DateTime)#3 (3) { ["date"]=> - string(19) "2010-12-31 00:00:00" + string(26) "2010-12-31 00:00:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/bug60236.phpt b/ext/date/tests/bug60236.phpt index faa0e160ce..a71bb5a17d 100644 --- a/ext/date/tests/bug60236.phpt +++ b/ext/date/tests/bug60236.phpt @@ -14,7 +14,7 @@ var_dump($t); string(10) "1278455908" object(DateTime)#1 (3) { ["date"]=> - string(19) "2010-07-06 18:38:28" + string(26) "2010-07-06 18:38:28.000000" ["timezone_type"]=> int(2) ["timezone"]=> diff --git a/ext/date/tests/bug67308.phpt b/ext/date/tests/bug67308.phpt new file mode 100644 index 0000000000..39fb781884 --- /dev/null +++ b/ext/date/tests/bug67308.phpt @@ -0,0 +1,28 @@ +--TEST-- +Bug #67308 (Serialize of DateTime truncates fractions of second) +--INI-- +date.timezone=America/Vancouver +--FILE-- +<?php +// Ensure we can still unserialize the old style. +var_dump(unserialize('O:8:"DateTime":3:{s:4:"date";s:19:"2005-07-14 22:30:41";s:13:"timezone_type";i:3;s:8:"timezone";s:13:"Europe/London";}')); + +// New style. +var_dump(unserialize('O:8:"DateTime":3:{s:4:"date";s:26:"2005-07-14 22:30:41.123456";s:13:"timezone_type";i:3;s:8:"timezone";s:13:"Europe/London";}')); +--EXPECTF-- +object(DateTime)#%d (3) { + ["date"]=> + string(26) "2005-07-14 22:30:41.000000" + ["timezone_type"]=> + int(3) + ["timezone"]=> + string(13) "Europe/London" +} +object(DateTime)#%d (3) { + ["date"]=> + string(26) "2005-07-14 22:30:41.123456" + ["timezone_type"]=> + int(3) + ["timezone"]=> + string(13) "Europe/London" +} diff --git a/ext/date/tests/date-lenient-create.phpt b/ext/date/tests/date-lenient-create.phpt index 49ee3c1371..2d59ceba79 100644 --- a/ext/date/tests/date-lenient-create.phpt +++ b/ext/date/tests/date-lenient-create.phpt @@ -46,7 +46,7 @@ Array == DateTime Object ( - [date] => 2004-06-08 00:00:00 + [date] => 2004-06-08 00:00:00.000000 [timezone_type] => 3 [timezone] => UTC ) @@ -67,7 +67,7 @@ Array == DateTime Object ( - [date] => 2004-06-08 00:00:00 + [date] => 2004-06-08 00:00:00.000000 [timezone_type] => 3 [timezone] => UTC ) @@ -88,7 +88,7 @@ Array == DateTime Object ( - [date] => 2004-06-08 00:00:00 + [date] => 2004-06-08 00:00:00.000000 [timezone_type] => 3 [timezone] => UTC ) @@ -109,7 +109,7 @@ Array == DateTime Object ( - [date] => 2004-06-08 00:00:00 + [date] => 2004-06-08 00:00:00.000000 [timezone_type] => 3 [timezone] => UTC ) @@ -129,7 +129,7 @@ Array == DateTime Object ( - [date] => 2004-06-08 00:00:00 + [date] => 2004-06-08 00:00:00.000000 [timezone_type] => 3 [timezone] => UTC ) diff --git a/ext/date/tests/date_create_basic.phpt b/ext/date/tests/date_create_basic.phpt index edec80bda1..4e13afebb3 100644 --- a/ext/date/tests/date_create_basic.phpt +++ b/ext/date/tests/date_create_basic.phpt @@ -25,7 +25,7 @@ var_dump( date_create("2005-07-14 22:30:41 GMT") ); *** Testing date_create() : basic functionality *** object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -33,7 +33,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(2) ["timezone"]=> @@ -41,7 +41,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "2005-07-14 22:30:41" + string(26) "2005-07-14 22:30:41.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -49,10 +49,10 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "2005-07-14 22:30:41" + string(26) "2005-07-14 22:30:41.000000" ["timezone_type"]=> int(2) ["timezone"]=> string(3) "GMT" } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/date_create_variation1.phpt b/ext/date/tests/date_create_variation1.phpt index f5fb2fd912..a476473a10 100644 --- a/ext/date/tests/date_create_variation1.phpt +++ b/ext/date/tests/date_create_variation1.phpt @@ -130,7 +130,7 @@ bool(false) -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -138,7 +138,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -152,7 +152,7 @@ bool(false) -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -160,7 +160,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -202,7 +202,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -210,7 +210,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -220,7 +220,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -228,7 +228,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -242,7 +242,7 @@ bool(false) -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -250,7 +250,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -264,7 +264,7 @@ bool(false) -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -272,7 +272,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -282,7 +282,7 @@ object(DateTime)#%d (3) { -- empty string DQ -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -290,7 +290,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -300,7 +300,7 @@ object(DateTime)#%d (3) { -- empty string SQ -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -308,7 +308,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -346,7 +346,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -354,7 +354,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -364,7 +364,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> @@ -372,7 +372,7 @@ object(DateTime)#%d (3) { } object(DateTime)#%d (3) { ["date"]=> - string(19) "%s" + string(26) "%s" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/date_create_variation2.phpt b/ext/date/tests/date_create_variation2.phpt index c43ccb0699..ad5d0e8705 100644 --- a/ext/date/tests/date_create_variation2.phpt +++ b/ext/date/tests/date_create_variation2.phpt @@ -168,7 +168,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2005-07-14 22:30:41" + string(26) "2005-07-14 22:30:41.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -178,7 +178,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2005-07-14 22:30:41" + string(26) "2005-07-14 22:30:41.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -248,7 +248,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2005-07-14 22:30:41" + string(26) "2005-07-14 22:30:41.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -258,7 +258,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2005-07-14 22:30:41" + string(26) "2005-07-14 22:30:41.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/date_date_set_variation2.phpt b/ext/date/tests/date_date_set_variation2.phpt index 384885c6fc..85bfc5e82d 100644 --- a/ext/date/tests/date_date_set_variation2.phpt +++ b/ext/date/tests/date_date_set_variation2.phpt @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0001-07-02 08:34:10" + string(26) "0001-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(20) "12345-07-02 08:34:10" + string(27) "12345-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(21) "-12345-07-02 08:34:10" + string(28) "-12345-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0010-07-02 08:34:10" + string(26) "0010-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(20) "-0010-07-02 08:34:10" + string(27) "-0010-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0001-07-02 08:34:10" + string(26) "0001-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0001-07-02 08:34:10" + string(26) "0001-07-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/date_date_set_variation3.phpt b/ext/date/tests/date_date_set_variation3.phpt index 80703414be..2cca53d651 100644 --- a/ext/date/tests/date_date_set_variation3.phpt +++ b/ext/date/tests/date_date_set_variation3.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-01-02 08:34:10" + string(26) "1963-01-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2991-09-02 08:34:10" + string(26) "2991-09-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0934-03-02 08:34:10" + string(26) "0934-03-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-10-02 08:34:10" + string(26) "1963-10-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-02-02 08:34:10" + string(26) "1962-02-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-01-02 08:34:10" + string(26) "1963-01-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-01-02 08:34:10" + string(26) "1963-01-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-02 08:34:10" + string(26) "1962-12-02 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/date_date_set_variation4.phpt b/ext/date/tests/date_date_set_variation4.phpt index 4c7df3d33b..f87988e51e 100644 --- a/ext/date/tests/date_date_set_variation4.phpt +++ b/ext/date/tests/date_date_set_variation4.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-07-01 08:34:10" + string(26) "1963-07-01 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1997-04-17 08:34:10" + string(26) "1997-04-17 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1929-09-11 08:34:10" + string(26) "1929-09-11 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-07-10 08:34:10" + string(26) "1963-07-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-20 08:34:10" + string(26) "1963-06-20 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-07-01 08:34:10" + string(26) "1963-07-01 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-07-01 08:34:10" + string(26) "1963-07-01 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-06-30 08:34:10" + string(26) "1963-06-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/date_diff1.phpt b/ext/date/tests/date_diff1.phpt index a908cdba75..fefffcde52 100644 --- a/ext/date/tests/date_diff1.phpt +++ b/ext/date/tests/date_diff1.phpt @@ -14,7 +14,7 @@ var_dump($int); --EXPECT-- object(DateTime)#1 (3) { ["date"]=> - string(19) "2010-10-04 02:18:48" + string(26) "2010-10-04 02:18:48.000000" ["timezone_type"]=> int(2) ["timezone"]=> @@ -22,7 +22,7 @@ object(DateTime)#1 (3) { } object(DateTime)#2 (3) { ["date"]=> - string(19) "2010-11-06 18:38:28" + string(26) "2010-11-06 18:38:28.000000" ["timezone_type"]=> int(2) ["timezone"]=> diff --git a/ext/date/tests/date_isodate_set_variation2.phpt b/ext/date/tests/date_isodate_set_variation2.phpt index fa42a95814..5b59a696c6 100644 --- a/ext/date/tests/date_isodate_set_variation2.phpt +++ b/ext/date/tests/date_isodate_set_variation2.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0001-02-13 08:34:10" + string(26) "0001-02-13 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(20) "12345-02-13 08:34:10" + string(27) "12345-02-13 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(21) "-12345-02-15 08:34:10" + string(28) "-12345-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0010-02-16 08:34:10" + string(26) "0010-02-16 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(20) "-0010-02-19 08:34:10" + string(27) "-0010-02-19 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0001-02-13 08:34:10" + string(26) "0001-02-13 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0001-02-13 08:34:10" + string(26) "0001-02-13 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "0000-02-15 08:34:10" + string(26) "0000-02-15 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/date_isodate_set_variation3.phpt b/ext/date/tests/date_isodate_set_variation3.phpt index eeb8471e2c..52c2348fe3 100644 --- a/ext/date/tests/date_isodate_set_variation3.phpt +++ b/ext/date/tests/date_isodate_set_variation3.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-01-01 08:34:10" + string(26) "1963-01-01 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2199-07-30 08:34:10" + string(26) "2199-07-30 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1726-05-21 08:34:10" + string(26) "1726-05-21 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-03-05 08:34:10" + string(26) "1963-03-05 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-10-16 08:34:10" + string(26) "1962-10-16 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-01-01 08:34:10" + string(26) "1963-01-01 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-01-01 08:34:10" + string(26) "1963-01-01 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1962-12-25 08:34:10" + string(26) "1962-12-25 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/date_isodate_set_variation4.phpt b/ext/date/tests/date_isodate_set_variation4.phpt index 5da3c038e3..b223f39b69 100644 --- a/ext/date/tests/date_isodate_set_variation4.phpt +++ b/ext/date/tests/date_isodate_set_variation4.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-11 08:34:10" + string(26) "1963-02-11 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1996-11-28 08:34:10" + string(26) "1996-11-28 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1929-04-24 08:34:10" + string(26) "1929-04-24 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-20 08:34:10" + string(26) "1963-02-20 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-01-31 08:34:10" + string(26) "1963-01-31 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-11 08:34:10" + string(26) "1963-02-11 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-11 08:34:10" + string(26) "1963-02-11 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "1963-02-10 08:34:10" + string(26) "1963-02-10 08:34:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/date_modify_variation2.phpt b/ext/date/tests/date_modify_variation2.phpt index fe6afb16dd..a28261be44 100644 --- a/ext/date/tests/date_modify_variation2.phpt +++ b/ext/date/tests/date_modify_variation2.phpt @@ -133,7 +133,7 @@ bool(false) -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:05:00" + string(26) "2009-01-31 10:05:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -148,7 +148,7 @@ bool(false) -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 00:05:00" + string(26) "2009-01-31 00:05:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/date_time_set_variation2.phpt b/ext/date/tests/date_time_set_variation2.phpt index e8a6d7ef9e..c19650c161 100644 --- a/ext/date/tests/date_time_set_variation2.phpt +++ b/ext/date/tests/date_time_set_variation2.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 00:13:45" + string(26) "2009-01-31 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 01:13:45" + string(26) "2009-01-31 01:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2010-06-29 09:13:45" + string(26) "2010-06-29 09:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 15:13:45" + string(26) "2009-01-30 15:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:13:45" + string(26) "2009-01-30 10:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 14:13:45" + string(26) "2009-01-29 14:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 00:13:45" + string(26) "2009-01-29 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 00:13:45" + string(26) "2009-01-29 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 00:13:45" + string(26) "2009-01-29 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 01:13:45" + string(26) "2009-01-29 01:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 00:13:45" + string(26) "2009-01-29 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 01:13:45" + string(26) "2009-01-29 01:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 00:13:45" + string(26) "2009-01-29 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 00:13:45" + string(26) "2009-01-29 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-29 00:13:45" + string(26) "2009-01-29 00:13:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/date_time_set_variation3.phpt b/ext/date/tests/date_time_set_variation3.phpt index 9be25b5923..0ad04c8a66 100644 --- a/ext/date/tests/date_time_set_variation3.phpt +++ b/ext/date/tests/date_time_set_variation3.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#3 (3) { ["date"]=> - string(19) "2009-01-31 10:00:45" + string(26) "2009-01-31 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#3 (3) { -- int 1 -- object(DateTime)#3 (3) { ["date"]=> - string(19) "2009-01-31 10:01:45" + string(26) "2009-01-31 10:01:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#3 (3) { -- int 12345 -- object(DateTime)#3 (3) { ["date"]=> - string(19) "2009-02-08 23:45:45" + string(26) "2009-02-08 23:45:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#3 (3) { -- int -12345 -- object(DateTime)#3 (3) { ["date"]=> - string(19) "2009-01-30 20:15:45" + string(26) "2009-01-30 20:15:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#3 (3) { -- float 10.5 -- object(DateTime)#3 (3) { ["date"]=> - string(19) "2009-01-30 10:10:45" + string(26) "2009-01-30 10:10:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#3 (3) { -- float -10.5 -- object(DateTime)#3 (3) { ["date"]=> - string(19) "2009-01-30 09:50:45" + string(26) "2009-01-30 09:50:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#3 (3) { -- float .5 -- object(DateTime)#3 (3) { ["date"]=> - string(19) "2009-01-30 10:00:45" + string(26) "2009-01-30 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:00:45" + string(26) "2009-01-30 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:00:45" + string(26) "2009-01-30 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:01:45" + string(26) "2009-01-30 10:01:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:00:45" + string(26) "2009-01-30 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:01:45" + string(26) "2009-01-30 10:01:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:00:45" + string(26) "2009-01-30 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:00:45" + string(26) "2009-01-30 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-30 10:00:45" + string(26) "2009-01-30 10:00:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -326,4 +326,4 @@ object(DateTime)#%d (3) { Warning: date_time_set() expects parameter 3 to be long, resource given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/date_time_set_variation4.phpt b/ext/date/tests/date_time_set_variation4.phpt index 1da497b85e..8e6fbfb606 100644 --- a/ext/date/tests/date_time_set_variation4.phpt +++ b/ext/date/tests/date_time_set_variation4.phpt @@ -115,7 +115,7 @@ fclose( $file_handle ); -- int 0 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -125,7 +125,7 @@ object(DateTime)#%d (3) { -- int 1 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:01" + string(26) "2009-01-31 10:13:01.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -135,7 +135,7 @@ object(DateTime)#%d (3) { -- int 12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 13:38:45" + string(26) "2009-01-31 13:38:45.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -145,7 +145,7 @@ object(DateTime)#%d (3) { -- int -12345 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 06:47:15" + string(26) "2009-01-31 06:47:15.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -155,7 +155,7 @@ object(DateTime)#%d (3) { -- float 10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:10" + string(26) "2009-01-31 10:13:10.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -165,7 +165,7 @@ object(DateTime)#%d (3) { -- float -10.5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:12:50" + string(26) "2009-01-31 10:12:50.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -175,7 +175,7 @@ object(DateTime)#%d (3) { -- float .5 -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -205,7 +205,7 @@ bool(false) -- uppercase NULL -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -215,7 +215,7 @@ object(DateTime)#%d (3) { -- lowercase null -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -225,7 +225,7 @@ object(DateTime)#%d (3) { -- lowercase true -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:01" + string(26) "2009-01-31 10:13:01.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -235,7 +235,7 @@ object(DateTime)#%d (3) { -- lowercase false -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -245,7 +245,7 @@ object(DateTime)#%d (3) { -- uppercase TRUE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:01" + string(26) "2009-01-31 10:13:01.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -255,7 +255,7 @@ object(DateTime)#%d (3) { -- uppercase FALSE -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -305,7 +305,7 @@ bool(false) -- undefined var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> @@ -315,7 +315,7 @@ object(DateTime)#%d (3) { -- unset var -- object(DateTime)#%d (3) { ["date"]=> - string(19) "2009-01-31 10:13:00" + string(26) "2009-01-31 10:13:00.000000" ["timezone_type"]=> int(3) ["timezone"]=> diff --git a/ext/date/tests/test-parse-from-format.phpt b/ext/date/tests/test-parse-from-format.phpt index 5bb5fe5325..ee0bd68d6b 100644 --- a/ext/date/tests/test-parse-from-format.phpt +++ b/ext/date/tests/test-parse-from-format.phpt @@ -25,7 +25,7 @@ string(13) "Y-m-d\TH:i:sP" string(25) "2008-07-08T22:14:12+02:00" object(DateTime)#2 (3) { ["date"]=> - string(19) "2008-07-08 22:14:12" + string(26) "2008-07-08 22:14:12.000000" ["timezone_type"]=> int(1) ["timezone"]=> @@ -36,7 +36,7 @@ string(16) "l, d-M-Y H:i:s T" string(38) "Tuesday, 08-Jul-2008 22:14:12 GMT+0200" object(DateTime)#1 (3) { ["date"]=> - string(19) "2008-07-08 22:14:12" + string(26) "2008-07-08 22:14:12.000000" ["timezone_type"]=> int(1) ["timezone"]=> @@ -47,7 +47,7 @@ string(13) "Y-m-d\TH:i:sO" string(24) "2008-07-08T22:14:12+0200" object(DateTime)#3 (3) { ["date"]=> - string(19) "2008-07-08 22:14:12" + string(26) "2008-07-08 22:14:12.000000" ["timezone_type"]=> int(1) ["timezone"]=> @@ -58,7 +58,7 @@ string(16) "D, d M y H:i:s O" string(29) "Tue, 08 Jul 08 22:14:12 +0200" object(DateTime)#2 (3) { ["date"]=> - string(19) "2008-07-08 22:14:12" + string(26) "2008-07-08 22:14:12.000000" ["timezone_type"]=> int(1) ["timezone"]=> @@ -69,7 +69,7 @@ string(16) "l, d-M-y H:i:s T" string(36) "Tuesday, 08-Jul-08 22:14:12 GMT+0200" object(DateTime)#1 (3) { ["date"]=> - string(19) "2008-07-08 22:14:12" + string(26) "2008-07-08 22:14:12.000000" ["timezone_type"]=> int(1) ["timezone"]=> @@ -80,7 +80,7 @@ string(16) "D, d M y H:i:s O" string(29) "Tue, 08 Jul 08 22:14:12 +0200" object(DateTime)#3 (3) { ["date"]=> - string(19) "2008-07-08 22:14:12" + string(26) "2008-07-08 22:14:12.000000" ["timezone_type"]=> int(1) ["timezone"]=> @@ -91,7 +91,7 @@ string(16) "D, d M Y H:i:s O" string(31) "Tue, 08 Jul 2008 22:14:12 +0200" object(DateTime)#2 (3) { ["date"]=> - string(19) "2008-07-08 22:14:12" + string(26) "2008-07-08 22:14:12.000000" ["timezone_type"]=> int(1) ["timezone"]=> @@ -102,7 +102,7 @@ string(16) "D, d M Y H:i:s O" string(31) "Tue, 08 Jul 2008 22:14:12 +0200" object(DateTime)#1 (3) { ["date"]=> - string(19) "2008-07-08 22:14:12" + string(26) "2008-07-08 22:14:12.000000" ["timezone_type"]=> int(1) ["timezone"]=> @@ -113,7 +113,7 @@ string(13) "Y-m-d\TH:i:sP" string(25) "2008-07-08T22:14:12+02:00" object(DateTime)#3 (3) { ["date"]=> - string(19) "2008-07-08 22:14:12" + string(26) "2008-07-08 22:14:12.000000" ["timezone_type"]=> int(1) ["timezone"]=> @@ -124,7 +124,7 @@ string(16) "D, d M Y H:i:s O" string(31) "Tue, 08 Jul 2008 22:14:12 +0200" object(DateTime)#2 (3) { ["date"]=> - string(19) "2008-07-08 22:14:12" + string(26) "2008-07-08 22:14:12.000000" ["timezone_type"]=> int(1) ["timezone"]=> @@ -135,7 +135,7 @@ string(13) "Y-m-d\TH:i:sP" string(25) "2008-07-08T22:14:12+02:00" object(DateTime)#1 (3) { ["date"]=> - string(19) "2008-07-08 22:14:12" + string(26) "2008-07-08 22:14:12.000000" ["timezone_type"]=> int(1) ["timezone"]=> diff --git a/ext/intl/tests/dateformat_format.phpt b/ext/intl/tests/dateformat_format.phpt index 8b410876c0..f9a90684dd 100644 --- a/ext/intl/tests/dateformat_format.phpt +++ b/ext/intl/tests/dateformat_format.phpt @@ -318,7 +318,7 @@ IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1 Formatted localtime_array is : 18951217 12:13 AM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -326,7 +326,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Thursday, December 31, 2009 3:02:03 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -334,7 +334,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : December 31, 2009 3:02:03 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -342,7 +342,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Dec 31, 2009 3:02:03 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -350,7 +350,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 12/31/09 3:02 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -358,7 +358,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 20091231 03:02 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -366,7 +366,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Saturday, December 30, 2000 5:04:05 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -374,7 +374,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : December 30, 2000 5:04:05 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -382,7 +382,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Dec 30, 2000 5:04:05 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -390,7 +390,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 12/30/00 5:04 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) diff --git a/ext/intl/tests/dateformat_format_variant2.phpt b/ext/intl/tests/dateformat_format_variant2.phpt index eb606a53db..07c67e9322 100644 --- a/ext/intl/tests/dateformat_format_variant2.phpt +++ b/ext/intl/tests/dateformat_format_variant2.phpt @@ -318,7 +318,7 @@ IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1 Formatted localtime_array is : 18951217 12:13 AM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -326,7 +326,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Thursday, December 31, 2009 at 3:02:03 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -334,7 +334,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : December 31, 2009 at 3:02:03 PM GMT-10 ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -342,7 +342,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Dec 31, 2009, 3:02:03 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -350,7 +350,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 12/31/09, 3:02 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -358,7 +358,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 20091231 03:02 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', )) @@ -366,7 +366,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Saturday, December 30, 2000 at 5:04:05 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', )) @@ -374,7 +374,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : December 30, 2000 at 5:04:05 PM GMT-10 ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', )) @@ -382,7 +382,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Dec 30, 2000, 5:04:05 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', )) @@ -390,7 +390,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 12/30/00, 5:04 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', )) diff --git a/ext/intl/tests/dateformat_format_variant3.phpt b/ext/intl/tests/dateformat_format_variant3.phpt index 40d49c8dc3..d770473f44 100644 --- a/ext/intl/tests/dateformat_format_variant3.phpt +++ b/ext/intl/tests/dateformat_format_variant3.phpt @@ -318,7 +318,7 @@ IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1 Formatted localtime_array is : 18951217 12:13 AM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -326,7 +326,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Thursday, December 31, 2009 at 3:02:03 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -334,7 +334,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : December 31, 2009 at 3:02:03 PM GMT-10 ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -342,7 +342,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Dec 31, 2009, 3:02:03 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -350,7 +350,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 12/31/09, 3:02 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2010-01-01 01:02:03', + 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', )) @@ -358,7 +358,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 20091231 03:02 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -366,7 +366,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Saturday, December 30, 2000 at 5:04:05 PM GMT-10:00 ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -374,7 +374,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : December 30, 2000 at 5:04:05 PM GMT-10 ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -382,7 +382,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : Dec 30, 2000, 5:04:05 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) @@ -390,7 +390,7 @@ Date is: DateTime::__set_state(array( Formatted DateTime is : 12/30/00, 5:04 PM ------------ Date is: DateTime::__set_state(array( - 'date' => '2000-12-30 19:04:05', + 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', )) diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c index 602a63ec0b..7244aafcc0 100644 --- a/ext/opcache/Optimizer/zend_optimizer.c +++ b/ext/opcache/Optimizer/zend_optimizer.c @@ -381,20 +381,41 @@ static void replace_tmp_by_const(zend_op_array *op_array, if (ZEND_OP1_TYPE(opline) == IS_TMP_VAR && ZEND_OP1(opline).var == var) { - update_op1_const(op_array, opline, val TSRMLS_CC); - /* TMP_VAR my be used only once */ - break; + /* In most cases IS_TMP_VAR operand may be used only once. + * The operands are usually destroyed by the opcode handler. + * ZEND_CASE is an exception, that keeps operand unchanged, + * and allows its reuse. The number of ZEND_CASE instructions + * usually terminated by ZEND_FREE that finally kills the value. + */ + if (opline->opcode == ZEND_CASE) { + zval old_val; + ZVAL_COPY_VALUE(&old_val, val); + zval_copy_ctor(val); + update_op1_const(op_array, opline, val TSRMLS_CC); + ZVAL_COPY_VALUE(val, &old_val); + } else if (opline->opcode == ZEND_FREE) { + MAKE_NOP(opline); + break; + } else { + update_op1_const(op_array, opline, val TSRMLS_CC); + val = NULL; + break; + } } if (ZEND_OP2_TYPE(opline) == IS_TMP_VAR && ZEND_OP2(opline).var == var) { update_op2_const(op_array, opline, val TSRMLS_CC); - /* TMP_VAR my be used only once */ + /* TMP_VAR may be used only once */ + val = NULL; break; } opline++; } + if (val) { + zval_dtor(val); + } } #include "Optimizer/nop_removal.c" diff --git a/ext/pdo_pgsql/tests/bug62479.phpt b/ext/pdo_pgsql/tests/bug62479.phpt index a12bb8d1ff..913321828e 100644 --- a/ext/pdo_pgsql/tests/bug62479.phpt +++ b/ext/pdo_pgsql/tests/bug62479.phpt @@ -6,15 +6,34 @@ if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not lo require dirname(__FILE__) . '/config.inc'; require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc'; PDOTest::skip(); -if (!isset($conf['ENV']['PDOTEST_DSN'])) die('no dsn found in env'); + +$dsn = getenv('PDOTEST_DSN'); +if (empty($dsn)) die('skip no dsn found in env'); + $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); -$rand = rand(5, 5); +$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + + +$user = 'pdo_test_'.rand(5, 400); +$pass = 'testpass'; + +// Assume that if we can't create or drop a user, this test needs to be skipped +try { + $db->exec("DROP USER IF EXISTS $user"); + $db->exec("CREATE USER $user WITH PASSWORD '$pass'"); +} catch (PDOException $e) { + die("skip You need CREATEUSER permissions to run the test"); +} + +// Peer authentication might prevent the test from properly running +try { + $testConn = new PDO($dsn, $user, $pass); +} catch (PDOException $e) { + echo "skip ".$e->getMessage(); +} + +$db->exec("DROP USER $user"); -// Assume that if we can't create a user, this test needs to be skipped -$testQuery = "CREATE USER pdo_$rand WITH PASSWORD 'testpass'"; -$db->query($testQuery); -$testQuery = "DROP USER pdo_$rand"; -$db->query($testQuery); ?> --FILE-- <?php @@ -22,7 +41,7 @@ require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc'; $pdo = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); $pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); $rand = rand(5, 400); -$user = "pdo_$rand"; +$user = "pdo_test_$rand"; $template = "CREATE USER $user WITH PASSWORD '%s'"; $dropUser = "DROP USER $user"; $testQuery = 'SELECT 1 as verification'; diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 9f5d9d03ca..053cc68058 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -328,7 +328,7 @@ static int php_zip_parse_options(zval *options, long *remove_all_path, char **re } /* If I add more options, it would make sense to create a nice static struct and loop over it. */ - if ((options = zend_hash_str_find(HASH_OF(options), "remove_path", sizeof("remove_path") - 1)) != NULL) { + if ((option = zend_hash_str_find(HASH_OF(options), "remove_path", sizeof("remove_path") - 1)) != NULL) { if (Z_TYPE_P(option) != IS_STRING) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "remove_path option expected to be a string"); return -1; diff --git a/ext/zip/tests/oo_addglob.phpt b/ext/zip/tests/oo_addglob.phpt new file mode 100644 index 0000000000..970bfc7678 --- /dev/null +++ b/ext/zip/tests/oo_addglob.phpt @@ -0,0 +1,50 @@ +--TEST-- +ZipArchive::addGlob() method +--CREDITS-- +Sammy Kaye Powers <sammyk@sammykmedia.com> +w/Kenzo over the shoulder +#phptek Chicago 2014 +--SKIPIF-- +<?php +/* $Id$ */ +if(!extension_loaded('zip')) die('skip'); +?> +--FILE-- +<?php +$dirname = dirname(__FILE__) . '/'; +include $dirname . 'utils.inc'; +$file = $dirname . '__tmp_oo_addglob.zip'; + +copy($dirname . 'test.zip', $file); +touch($dirname . 'foo.txt'); +touch($dirname . 'bar.baz'); + +$zip = new ZipArchive(); +if (!$zip->open($file)) { + exit('failed'); +} +$options = array('add_path' => 'baz/', 'remove_all_path' => TRUE); +if (!$zip->addGlob($dirname . '*.{txt,baz}', GLOB_BRACE, $options)) { + echo "failed1\n"; +} +if ($zip->status == ZIPARCHIVE::ER_OK) { + dump_entries_name($zip); + $zip->close(); +} else { + echo "failed2\n"; +} +?> +--CLEAN-- +<?php +$dirname = dirname(__FILE__) . '/'; +unlink($dirname . '__tmp_oo_addglob.zip'); +unlink($dirname . 'foo.txt'); +unlink($dirname . 'bar.baz'); +?> +--EXPECTF-- +0 bar +1 foobar/ +2 foobar/baz +3 entry1.txt +4 baz/foo.txt +5 baz/bar.baz diff --git a/ext/zip/tests/oo_addpattern.phpt b/ext/zip/tests/oo_addpattern.phpt new file mode 100644 index 0000000000..4e1cab4ad9 --- /dev/null +++ b/ext/zip/tests/oo_addpattern.phpt @@ -0,0 +1,51 @@ +--TEST-- +ZipArchive::addPattern() method +--CREDITS-- +Sammy Kaye Powers <sammyk@sammykmedia.com> +w/Kenzo over the shoulder +#phptek Chicago 2014 +--SKIPIF-- +<?php +/* $Id$ */ +if(!extension_loaded('zip')) die('skip'); +?> +--FILE-- +<?php +$dirname = dirname(__FILE__) . '/'; +include $dirname . 'utils.inc'; +$file = $dirname . '__tmp_oo_addpattern.zip'; + +copy($dirname . 'test.zip', $file); +touch($dirname . 'foo.txt'); +touch($dirname . 'bar.txt'); + +$zip = new ZipArchive(); +if (!$zip->open($file)) { + exit('failed'); +} +$dir = realpath($dirname); +$options = array('add_path' => 'baz/', 'remove_path' => $dir); +if (!$zip->addPattern('/\.txt$/', $dir, $options)) { + echo "failed\n"; +} +if ($zip->status == ZIPARCHIVE::ER_OK) { + dump_entries_name($zip); + $zip->close(); +} else { + echo "failed\n"; +} +?> +--CLEAN-- +<?php +$dirname = dirname(__FILE__) . '/'; +unlink($dirname . '__tmp_oo_addpattern.zip'); +unlink($dirname . 'foo.txt'); +unlink($dirname . 'bar.txt'); +?> +--EXPECTF-- +0 bar +1 foobar/ +2 foobar/baz +3 entry1.txt +4 baz/bar.txt +5 baz/foo.txt diff --git a/run-tests.php b/run-tests.php index 6c220e7ac7..030e95a684 100755 --- a/run-tests.php +++ b/run-tests.php @@ -581,8 +581,8 @@ if (isset($argc) && $argc > 1) { if (!$valgrind_header) { error("Valgrind returned no version info, cannot proceed.\nPlease check if Valgrind is installed."); } else { - $valgrind_version = preg_replace("/valgrind-(\d)\.(\d)\.(\d+)([.\w_-]+)?(\s+)/", '$1$2$3', $valgrind_header, 1, $replace_count); - if ($replace_count != 1 || !is_numeric($valgrind_version)) { + $valgrind_version = preg_replace("/valgrind-(\d+)\.(\d+)\.(\d+)([.\w_-]+)?(\s+)/", '$1.$2.$3', $valgrind_header, 1, $replace_count); + if ($replace_count != 1) { error("Valgrind returned invalid version info (\"$valgrind_header\"), cannot proceed."); } $valgrind_header = trim($valgrind_header); @@ -1785,7 +1785,7 @@ TEST $file $env['USE_ZEND_ALLOC'] = '0'; $env['ZEND_DONT_UNLOAD_MODULES'] = 1; - if ($valgrind_version >= 330) { + if (version_compare($valgrind_version, '3.3.0', '>=')) { /* valgrind 3.3.0+ doesn't have --log-file-exactly option */ $cmd = "valgrind -q --tool=memcheck --trace-children=yes --log-file=$memcheck_filename $cmd"; } else { |