com php-src: Further test fixes for the fdb2709 breakage.: ext/intl/tests/dateformat_format_variant2.phpt ext/in
tl/tests/dateformat_format_variant3.phpt
| From: | Adam Harvey | Date: | Fri, 23 May 2014 15:22:26 +0000 |
| Subject: | com php-src: Further test fixes for the fdb2709 breakage.: ext/intl/tests/dateformat_format_variant2.phpt ext/in tl/tests/dateformat_format_variant3.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78510@lists.php.net to get a copy of this message | ||
Commit: 2260fca3ddac419de18319eb4fdd36183b83ff7b
Author: Adam Harvey <aharvey@php.net> Fri, 23 May 2014 15:22:26 +0000
Parents: 6d9cc9223894a0683b4e20abe6d3f25fd96c8b67
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2260fca3ddac419de18319eb4fdd36183b83ff7b
Log:
Further test fixes for the fdb2709 breakage.
Changed paths:
M ext/intl/tests/dateformat_format_variant2.phpt
M ext/intl/tests/dateformat_format_variant3.phpt
Diff:
diff --git a/ext/intl/tests/dateformat_format_variant2.phpt
b/ext/intl/tests/dateformat_format_variant2.phpt
index eb606a5..07c67e9 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 40d49c8..d770473 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',
))