From 143b2a8692829ebd774269e79205270ba71f5ceb Mon Sep 17 00:00:00 2001
From: Daniel Convissor <danielc@php.net>
Date: Mon, 22 Aug 2011 14:47:12 +0000
Subject: [PATCH] Fix spring tests for dst/st transition second.

---
 ext/date/tests/DateTime_data-spring-type2-type2.inc  | 8 ++++----
 ext/date/tests/DateTime_data-spring-type2-type3.inc  | 8 ++++----
 ext/date/tests/DateTime_data-spring-type3-type2.inc  | 8 ++++----
 ext/date/tests/DateTime_data-spring-type3-type3.inc  | 8 ++++----
 ext/date/tests/DateTime_days-spring-type2-type2.phpt | 2 +-
 ext/date/tests/DateTime_days-spring-type2-type3.phpt | 2 +-
 ext/date/tests/DateTime_days-spring-type3-type2.phpt | 2 +-
 ext/date/tests/DateTime_days-spring-type3-type3.phpt | 2 +-
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ext/date/tests/DateTime_data-spring-type2-type2.inc b/ext/date/tests/DateTime_data-spring-type2-type2.inc
index 3556b207b3..d9e07c3130 100644
--- a/ext/date/tests/DateTime_data-spring-type2-type2.inc
+++ b/ext/date/tests/DateTime_data-spring-type2-type2.inc
@@ -99,11 +99,11 @@ $start = new DateTime('2010-03-15 18:57:55 EDT');  // sp post, zt2
 examine_diff($end, $start, 'P+0Y0M0DT1H2M4S', 0);
 
 echo "test_time_spring_type2_stsec_type2_dtsec: ";
-$end   = new DateTime('2010-03-15 03:00:00 EDT');  // dtsec, zt2
-$start = new DateTime('2010-03-13 01:59:59 EST');  // stsec, zt2
+$end   = new DateTime('2010-03-14 03:00:00 EDT');  // dtsec, zt2
+$start = new DateTime('2010-03-14 01:59:59 EST');  // stsec, zt2
 examine_diff($end, $start, 'P+0Y0M0DT0H0M1S', 0);
 
 echo "test_time_spring_type2_dtsec_type2_stsec: ";
-$end   = new DateTime('2010-03-15 01:59:59 EST');  // stsec, zt2
-$start = new DateTime('2010-03-13 03:00:00 EDT');  // dtsec, zt2
+$end   = new DateTime('2010-03-14 01:59:59 EST');  // stsec, zt2
+$start = new DateTime('2010-03-14 03:00:00 EDT');  // dtsec, zt2
 examine_diff($end, $start, 'P-0Y0M0DT0H0M1S', 0);
diff --git a/ext/date/tests/DateTime_data-spring-type2-type3.inc b/ext/date/tests/DateTime_data-spring-type2-type3.inc
index b06825837c..d66fc51778 100644
--- a/ext/date/tests/DateTime_data-spring-type2-type3.inc
+++ b/ext/date/tests/DateTime_data-spring-type2-type3.inc
@@ -99,11 +99,11 @@ $start = new DateTime('2010-03-15 18:57:55 EDT');  // sp post, zt2
 examine_diff($end, $start, 'P+0Y0M0DT1H2M4S', 0);
 
 echo "test_time_spring_type2_stsec_type3_dtsec: ";
-$end   = new DateTime('2010-03-15 03:00:00');  // dtsec, zt3
-$start = new DateTime('2010-03-13 01:59:59 EST');  // stsec, zt2
+$end   = new DateTime('2010-03-14 03:00:00');  // dtsec, zt3
+$start = new DateTime('2010-03-14 01:59:59 EST');  // stsec, zt2
 examine_diff($end, $start, 'P+0Y0M0DT0H0M1S', 0);
 
 echo "test_time_spring_type2_dtsec_type3_stsec: ";
-$end   = new DateTime('2010-03-15 01:59:59');  // stsec, zt3
-$start = new DateTime('2010-03-13 03:00:00 EDT');  // dtsec, zt2
+$end   = new DateTime('2010-03-14 01:59:59');  // stsec, zt3
+$start = new DateTime('2010-03-14 03:00:00 EDT');  // dtsec, zt2
 examine_diff($end, $start, 'P-0Y0M0DT0H0M1S', 0);
diff --git a/ext/date/tests/DateTime_data-spring-type3-type2.inc b/ext/date/tests/DateTime_data-spring-type3-type2.inc
index 244cd58819..92211f4b1a 100644
--- a/ext/date/tests/DateTime_data-spring-type3-type2.inc
+++ b/ext/date/tests/DateTime_data-spring-type3-type2.inc
@@ -99,11 +99,11 @@ $start = new DateTime('2010-03-15 18:57:55');  // sp post, zt3
 examine_diff($end, $start, 'P+0Y0M0DT1H2M4S', 0);
 
 echo "test_time_spring_type3_stsec_type2_dtsec: ";
-$end   = new DateTime('2010-03-15 03:00:00 EDT');  // dtsec, zt2
-$start = new DateTime('2010-03-13 01:59:59');  // stsec, zt3
+$end   = new DateTime('2010-03-14 03:00:00 EDT');  // dtsec, zt2
+$start = new DateTime('2010-03-14 01:59:59');  // stsec, zt3
 examine_diff($end, $start, 'P+0Y0M0DT0H0M1S', 0);
 
 echo "test_time_spring_type3_dtsec_type2_stsec: ";
-$end   = new DateTime('2010-03-15 01:59:59 EST');  // stsec, zt2
-$start = new DateTime('2010-03-13 03:00:00');  // dtsec, zt3
+$end   = new DateTime('2010-03-14 01:59:59 EST');  // stsec, zt2
+$start = new DateTime('2010-03-14 03:00:00');  // dtsec, zt3
 examine_diff($end, $start, 'P-0Y0M0DT0H0M1S', 0);
diff --git a/ext/date/tests/DateTime_data-spring-type3-type3.inc b/ext/date/tests/DateTime_data-spring-type3-type3.inc
index d87373c5a4..de1dee12e6 100644
--- a/ext/date/tests/DateTime_data-spring-type3-type3.inc
+++ b/ext/date/tests/DateTime_data-spring-type3-type3.inc
@@ -99,11 +99,11 @@ $start = new DateTime('2010-03-15 18:57:55');  // sp post, zt3
 examine_diff($end, $start, 'P+0Y0M0DT1H2M4S', 0);
 
 echo "test_time_spring_type3_stsec_type3_dtsec: ";
-$end   = new DateTime('2010-03-15 03:00:00');  // dtsec, zt3
-$start = new DateTime('2010-03-13 01:59:59');  // stsec, zt3
+$end   = new DateTime('2010-03-14 03:00:00');  // dtsec, zt3
+$start = new DateTime('2010-03-14 01:59:59');  // stsec, zt3
 examine_diff($end, $start, 'P+0Y0M0DT0H0M1S', 0);
 
 echo "test_time_spring_type3_dtsec_type3_stsec: ";
-$end   = new DateTime('2010-03-15 01:59:59');  // stsec, zt3
-$start = new DateTime('2010-03-13 03:00:00');  // dtsec, zt3
+$end   = new DateTime('2010-03-14 01:59:59');  // stsec, zt3
+$start = new DateTime('2010-03-14 03:00:00');  // dtsec, zt3
 examine_diff($end, $start, 'P-0Y0M0DT0H0M1S', 0);
diff --git a/ext/date/tests/DateTime_days-spring-type2-type2.phpt b/ext/date/tests/DateTime_days-spring-type2-type2.phpt
index 3f9c353523..3e702ace09 100644
--- a/ext/date/tests/DateTime_days-spring-type2-type2.phpt
+++ b/ext/date/tests/DateTime_days-spring-type2-type2.phpt
@@ -27,5 +27,5 @@ test_time_spring_type2_post_type2_prev: DAYS: **2**
 test_time_spring_type2_post_type2_st: DAYS: **1**
 test_time_spring_type2_post_type2_dt: DAYS: **1**
 test_time_spring_type2_post_type2_post: DAYS: **0**
-test_time_spring_type2_stsec_type2_dtsec: DAYS: **0** 
+test_time_spring_type2_stsec_type2_dtsec: DAYS: **0**
 test_time_spring_type2_dtsec_type2_stsec: DAYS: **0**
diff --git a/ext/date/tests/DateTime_days-spring-type2-type3.phpt b/ext/date/tests/DateTime_days-spring-type2-type3.phpt
index 77ac5fdb6d..0e23ac3e2c 100644
--- a/ext/date/tests/DateTime_days-spring-type2-type3.phpt
+++ b/ext/date/tests/DateTime_days-spring-type2-type3.phpt
@@ -27,5 +27,5 @@ test_time_spring_type2_post_type3_prev: DAYS: **2**
 test_time_spring_type2_post_type3_st: DAYS: **1**
 test_time_spring_type2_post_type3_dt: DAYS: **1**
 test_time_spring_type2_post_type3_post: DAYS: **0**
-test_time_spring_type2_stsec_type3_dtsec: DAYS: **0** 
+test_time_spring_type2_stsec_type3_dtsec: DAYS: **0**
 test_time_spring_type2_dtsec_type3_stsec: DAYS: **0**
diff --git a/ext/date/tests/DateTime_days-spring-type3-type2.phpt b/ext/date/tests/DateTime_days-spring-type3-type2.phpt
index 09aa8d9c1d..4fb9ba76d2 100644
--- a/ext/date/tests/DateTime_days-spring-type3-type2.phpt
+++ b/ext/date/tests/DateTime_days-spring-type3-type2.phpt
@@ -27,5 +27,5 @@ test_time_spring_type3_post_type2_prev: DAYS: **2**
 test_time_spring_type3_post_type2_st: DAYS: **1**
 test_time_spring_type3_post_type2_dt: DAYS: **1**
 test_time_spring_type3_post_type2_post: DAYS: **0**
-test_time_spring_type3_stsec_type2_dtsec: DAYS: **0** 
+test_time_spring_type3_stsec_type2_dtsec: DAYS: **0**
 test_time_spring_type3_dtsec_type2_stsec: DAYS: **0**
diff --git a/ext/date/tests/DateTime_days-spring-type3-type3.phpt b/ext/date/tests/DateTime_days-spring-type3-type3.phpt
index f947329dea..df44925fbd 100644
--- a/ext/date/tests/DateTime_days-spring-type3-type3.phpt
+++ b/ext/date/tests/DateTime_days-spring-type3-type3.phpt
@@ -27,5 +27,5 @@ test_time_spring_type3_post_type3_prev: DAYS: **2**
 test_time_spring_type3_post_type3_st: DAYS: **1**
 test_time_spring_type3_post_type3_dt: DAYS: **1**
 test_time_spring_type3_post_type3_post: DAYS: **0**
-test_time_spring_type3_stsec_type3_dtsec: DAYS: **0** 
+test_time_spring_type3_stsec_type3_dtsec: DAYS: **0**
 test_time_spring_type3_dtsec_type3_stsec: DAYS: **0**
-- 
2.40.0