From 319611ffbd21f003755b679a90ffbdccbecab769 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Fri, 23 May 2014 15:07:19 +0000 Subject: [PATCH 1/2] Fix broken test caused by fdb2709. --- ext/intl/tests/dateformat_format.phpt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ext/intl/tests/dateformat_format.phpt b/ext/intl/tests/dateformat_format.phpt index e5548196d10..20908b3f3f9 100644 --- a/ext/intl/tests/dateformat_format.phpt +++ b/ext/intl/tests/dateformat_format.phpt @@ -315,7 +315,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', )) @@ -323,7 +323,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', )) @@ -331,7 +331,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', )) @@ -339,7 +339,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', )) @@ -347,7 +347,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', )) @@ -355,7 +355,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', )) @@ -363,7 +363,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' => 3, 'timezone' => 'America/Los_Angeles', )) @@ -371,7 +371,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' => 3, 'timezone' => 'America/Los_Angeles', )) @@ -379,7 +379,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', )) @@ -387,7 +387,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', )) From 2260fca3ddac419de18319eb4fdd36183b83ff7b Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Fri, 23 May 2014 15:22:26 +0000 Subject: [PATCH 2/2] Further test fixes for the fdb2709 breakage. --- .../tests/dateformat_format_variant2.phpt | 20 +++++++++---------- .../tests/dateformat_format_variant3.phpt | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ext/intl/tests/dateformat_format_variant2.phpt b/ext/intl/tests/dateformat_format_variant2.phpt index eb606a53dbf..07c67e93229 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 40d49c8dc3d..d770473f440 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', ))