From: Derick Rethans Date: Mon, 25 Feb 2008 22:32:26 +0000 (+0000) Subject: - Fixed tests on 64bit platform. X-Git-Tag: RELEASE_2_0_0a1~325 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a39148adf71d15298998eae383c5254b28a57fb9;p=php - Fixed tests on 64bit platform. --- diff --git a/ext/date/php_date.c b/ext/date/php_date.c index eba64e3a44..a5c0f4e2e6 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -1193,7 +1193,7 @@ PHP_FUNCTION(idate) ret = php_idate(format[0], ts, 0); if (ret == -1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized date format token."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized date format token"); RETURN_FALSE; } RETURN_LONG(ret); diff --git a/ext/date/tests/bug41523-64bit.phpt b/ext/date/tests/bug41523-64bit.phpt new file mode 100644 index 0000000000..594cdf8855 --- /dev/null +++ b/ext/date/tests/bug41523-64bit.phpt @@ -0,0 +1,80 @@ +--TEST-- +Bug #41523 (strtotime('0000-00-00 00:00:00') is parsed as 1999-11-30) (64 bit) +--SKIPIF-- + +--FILE-- +format( DateTime::ISO8601 ), "\n"; + +?> +--EXPECT-- +array(12) { + ["year"]=> + int(0) + ["month"]=> + int(0) + ["day"]=> + int(0) + ["hour"]=> + int(0) + ["minute"]=> + int(0) + ["second"]=> + int(0) + ["fraction"]=> + float(0) + ["warning_count"]=> + int(0) + ["warnings"]=> + array(0) { + } + ["error_count"]=> + int(0) + ["errors"]=> + array(0) { + } + ["is_localtime"]=> + bool(false) +} +int(-62169984000) +object(DateTime)#1 (0) { +} +-0001-11-30T00:00:00+0000 +--UEXPECT-- +array(12) { + [u"year"]=> + int(0) + [u"month"]=> + int(0) + [u"day"]=> + int(0) + [u"hour"]=> + int(0) + [u"minute"]=> + int(0) + [u"second"]=> + int(0) + [u"fraction"]=> + float(0) + [u"warning_count"]=> + int(0) + [u"warnings"]=> + array(0) { + } + [u"error_count"]=> + int(0) + [u"errors"]=> + array(0) { + } + [u"is_localtime"]=> + bool(false) +} +int(-62169984000) +object(DateTime)#1 (0) { +} +-0001-11-30T00:00:00+0000 diff --git a/ext/date/tests/bug41523.phpt b/ext/date/tests/bug41523.phpt index b053e321ef..a74dd103da 100644 --- a/ext/date/tests/bug41523.phpt +++ b/ext/date/tests/bug41523.phpt @@ -1,5 +1,7 @@ --TEST-- -Bug #41523 (strtotime('0000-00-00 00:00:00') is parsed as 1999-11-30) +Bug #41523 (strtotime('0000-00-00 00:00:00') is parsed as 1999-11-30) (32 bit) +--SKIPIF-- + --FILE-- +--INI-- +error_reporting=2047 +--FILE-- + +--EXPECT-- +America/Toronto +Y: 0 - January 2000-01-01T01:01:01-0500 +Y: 69 - January 2069-01-01T01:01:01-0500 +Y: 70 - January 1970-01-01T01:01:01-0500 +Y: 71 - January 1971-01-01T01:01:01-0500 +Y: 99 - January 1999-01-01T01:01:01-0500 +Y: 100 - January 2000-01-01T01:01:01-0500 +Y: 105 - January 2005-01-01T01:01:01-0500 +Y: 1900 - January 1900-01-01T01:01:01-0500 +Y: 1901 - January 1901-01-01T01:01:01-0500 +Y: 1902 - January 1902-01-01T01:01:01-0500 +Y: 1999 - January 1999-01-01T01:01:01-0500 +Y: 2000 - January 2000-01-01T01:01:01-0500 +Y: 2001 - January 2001-01-01T01:01:01-0500 + +Europe/Oslo +Y: 0 - January 2000-01-01T01:01:01+0100 +Y: 69 - January 2069-01-01T01:01:01+0100 +Y: 70 - January 1970-01-01T01:01:01+0100 +Y: 71 - January 1971-01-01T01:01:01+0100 +Y: 99 - January 1999-01-01T01:01:01+0100 +Y: 100 - January 2000-01-01T01:01:01+0100 +Y: 105 - January 2005-01-01T01:01:01+0100 +Y: 1900 - January 1900-01-01T01:01:01+0100 +Y: 1901 - January 1901-01-01T01:01:01+0100 +Y: 1902 - January 1902-01-01T01:01:01+0100 +Y: 1999 - January 1999-01-01T01:01:01+0100 +Y: 2000 - January 2000-01-01T01:01:01+0100 +Y: 2001 - January 2001-01-01T01:01:01+0100 diff --git a/ext/date/tests/mktime-3.phpt b/ext/date/tests/mktime-3.phpt index 0d19074fc3..3201def6ca 100644 --- a/ext/date/tests/mktime-3.phpt +++ b/ext/date/tests/mktime-3.phpt @@ -1,5 +1,7 @@ --TEST-- -mktime() [3] +mktime() [3] (32-bit) +--SKIPIF-- + --INI-- error_reporting=2047 --FILE-- diff --git a/ext/date/tests/strtotime-mysql-64bit.phpt b/ext/date/tests/strtotime-mysql-64bit.phpt new file mode 100644 index 0000000000..ff4da8996b --- /dev/null +++ b/ext/date/tests/strtotime-mysql-64bit.phpt @@ -0,0 +1,33 @@ +--TEST-- +strtotime() and mysql timestamps (64 bit) +--SKIPIF-- + +--FILE-- + +--EXPECT-- +string(31) "Fri, 23 May 1997 09:15:28 +0000" +string(31) "Sun, 31 Dec 2000 18:58:59 +0000" +string(31) "Wed, 10 Apr 2080 10:10:10 +0000" + +--UEXPECT-- +unicode(31) "Fri, 23 May 1997 09:15:28 +0000" +unicode(31) "Sun, 31 Dec 2000 18:58:59 +0000" +unicode(31) "Wed, 10 Apr 2080 10:10:10 +0000" + diff --git a/ext/date/tests/strtotime-mysql.phpt b/ext/date/tests/strtotime-mysql.phpt index 73c3e336dd..f69de8abe7 100755 --- a/ext/date/tests/strtotime-mysql.phpt +++ b/ext/date/tests/strtotime-mysql.phpt @@ -1,5 +1,7 @@ --TEST-- -strtotime() and mysql timestamps +strtotime() and mysql timestamps (32 bit) +--SKIPIF-- + --FILE-- +--FILE-- + +--EXPECT-- +bool(false) +bool(false) +string(31) "Thu, 15 Jun 2006 00:00:00 +0100" +string(31) "Fri, 16 Jun 2006 22:49:12 +0100" +bool(false) +string(31) "Fri, 16 Jun 2006 23:49:12 +0100" +bool(false) +string(31) "Fri, 16 Jun 2006 02:22:00 +0100" +string(31) "Mon, 16 Jun 0222 02:22:00 -0036" +string(31) "Fri, 16 Jun 2006 02:22:33 +0100" +bool(false) +string(31) "Tue, 02 Mar 2004 00:00:00 +0000" +string(31) "Tue, 02 Mar 2004 00:00:00 +0000" +string(31) "Sun, 12 Feb 2006 23:12:23 +0000" +bool(false) +string(31) "Fri, 16 Jun 2006 00:00:00 +0100" +string(31) "Sun, 15 Jan 2006 00:00:00 +0000" +string(31) "Sun, 15 Jan 2006 00:00:00 +0000" +string(31) "Tue, 10 Oct 2000 13:55:36 +0100" +bool(false) +string(31) "Fri, 16 Jun 2006 20:06:00 +0100" +string(31) "Mon, 16 Jun 1986 22:51:59 +0100" +string(31) "Mon, 16 Jan 2006 00:00:00 +0000" +string(31) "Mon, 16 Jan 2006 00:00:00 +0000" +--UEXPECT-- +bool(false) +bool(false) +unicode(31) "Thu, 15 Jun 2006 00:00:00 +0100" +unicode(31) "Fri, 16 Jun 2006 22:49:12 +0100" +bool(false) +unicode(31) "Fri, 16 Jun 2006 23:49:12 +0100" +bool(false) +unicode(31) "Fri, 16 Jun 2006 02:22:00 +0100" +unicode(31) "Mon, 16 Jun 0222 02:22:00 -0036" +unicode(31) "Fri, 16 Jun 2006 02:22:33 +0100" +bool(false) +unicode(31) "Tue, 02 Mar 2004 00:00:00 +0000" +unicode(31) "Tue, 02 Mar 2004 00:00:00 +0000" +unicode(31) "Sun, 12 Feb 2006 23:12:23 +0000" +bool(false) +unicode(31) "Fri, 16 Jun 2006 00:00:00 +0100" +unicode(31) "Sun, 15 Jan 2006 00:00:00 +0000" +unicode(31) "Sun, 15 Jan 2006 00:00:00 +0000" +unicode(31) "Tue, 10 Oct 2000 13:55:36 +0100" +bool(false) +unicode(31) "Fri, 16 Jun 2006 20:06:00 +0100" +unicode(31) "Mon, 16 Jun 1986 22:51:59 +0100" +unicode(31) "Mon, 16 Jan 2006 00:00:00 +0000" +unicode(31) "Mon, 16 Jan 2006 00:00:00 +0000" diff --git a/ext/date/tests/strtotime3.phpt b/ext/date/tests/strtotime3.phpt index 67861e53f2..fa9373d823 100644 --- a/ext/date/tests/strtotime3.phpt +++ b/ext/date/tests/strtotime3.phpt @@ -1,5 +1,7 @@ --TEST-- -strtotime() function +strtotime() function (32 bit) +--SKIPIF-- + --FILE-- + +--INI-- +precision=14 +--FILE-- + +--EXPECT-- +array(11) { + ["aNull"]=> + NULL + ["aString"]=> + string(8) "a string" + ["aNumber"]=> + float(-12.456) + ["aDateTime"]=> + int(897625932) + ["aDateTime2"]=> + int(329632332) + ["aDateTime3"]=> + int(2223088332) + ["aBoolean"]=> + bool(true) + ["anArray"]=> + array(2) { + [0]=> + int(10) + [1]=> + string(14) "second element" + } + ["aBinary"]=> + string(11) "binary data" + ["anObject"]=> + array(2) { + ["s"]=> + string(8) "a string" + ["n"]=> + float(-12.456) + } + ["aRecordset"]=> + array(2) { + ["NAME"]=> + array(2) { + [0]=> + string(8) "John Doe" + [1]=> + string(8) "Jane Doe" + } + ["AGE"]=> + array(2) { + [0]=> + int(34) + [1]=> + int(31) + } + } +} diff --git a/ext/wddx/tests/001.phpt b/ext/wddx/tests/001.phpt index 9d08bf6cb5..80d96ec7e6 100644 --- a/ext/wddx/tests/001.phpt +++ b/ext/wddx/tests/001.phpt @@ -1,7 +1,8 @@ --TEST-- -wddx unserialization test +wddx unserialization test (32-bit) --SKIPIF-- + --INI-- precision=14 --FILE--