summaryrefslogtreecommitdiff
path: root/ext/date
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2014-08-12 10:37:44 +0200
committerFerenc Kovacs <tyrael@php.net>2014-08-12 10:37:44 +0200
commit7aa776c7b46b5913564d9599988bd41ff2ddc05c (patch)
tree7692cda6dfb14feb1eb4fb579df27fd7d60711e9 /ext/date
parentb6ddcf9c7176f6cca06804c747c08bee89980e44 (diff)
parent39dd715382b6b2e0c19ff8edac7a185ded3721c9 (diff)
downloadphp-git-7aa776c7b46b5913564d9599988bd41ff2ddc05c.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
Diffstat (limited to 'ext/date')
-rw-r--r--ext/date/tests/bug20382-2.phpt12
-rw-r--r--ext/date/tests/bug33415-2.phpt4
-rw-r--r--ext/date/tests/bug33532.phpt4
3 files changed, 10 insertions, 10 deletions
diff --git a/ext/date/tests/bug20382-2.phpt b/ext/date/tests/bug20382-2.phpt
index 5e075686e3..cc2d967895 100644
--- a/ext/date/tests/bug20382-2.phpt
+++ b/ext/date/tests/bug20382-2.phpt
@@ -95,18 +95,18 @@ result = Monday 2037-10-05 00:00:00 NZDT
wanted = Monday 00:00:00
Australia/Adelaide
-ts = Friday 1971-01-01 17:17:17 CST
-result = Monday 1971-01-04 00:00:00 CST
+ts = Friday 1971-01-01 17:17:17 ACST
+result = Monday 1971-01-04 00:00:00 ACST
wanted = Monday 00:00:00
Australia/Darwin
-ts = Monday 1971-03-29 17:17:17 CST
-result = Monday 1971-04-05 00:00:00 CST
+ts = Monday 1971-03-29 17:17:17 ACST
+result = Monday 1971-04-05 00:00:00 ACST
wanted = Monday 00:00:00
Australia/Perth
-ts = Friday 1971-01-01 17:17:17 WST
-result = Monday 1971-01-04 00:00:00 WST
+ts = Friday 1971-01-01 17:17:17 AWST
+result = Monday 1971-01-04 00:00:00 AWST
wanted = Monday 00:00:00
America/Aruba
diff --git a/ext/date/tests/bug33415-2.phpt b/ext/date/tests/bug33415-2.phpt
index 424be76fc4..c284f2503e 100644
--- a/ext/date/tests/bug33415-2.phpt
+++ b/ext/date/tests/bug33415-2.phpt
@@ -233,8 +233,8 @@ result=Saturday 1970-01-03 00:00:00 CAT 0
wanted=Saturday 00:00:00
TZ=Asia/Kashgar - Is it OK for this to be 3 AM? yes
-tStamp=Thursday 1980-04-24 17:17:17 KAST 0
-result=Thursday 1980-05-01 03:00:00 CST 0
+tStamp=Thursday 1980-04-24 17:17:17 XJT 0
+result=Thursday 1980-05-01 00:00:00 XJT 0
wanted=Thursday 03:00:00
TZ=Indian/Christmas - Is it OK for this to be 7 AM? Note: does
diff --git a/ext/date/tests/bug33532.phpt b/ext/date/tests/bug33532.phpt
index 148630855d..5323e8c8db 100644
--- a/ext/date/tests/bug33532.phpt
+++ b/ext/date/tests/bug33532.phpt
@@ -39,5 +39,5 @@ datestr 10:00:00 AM July 1 2005 UTC
Setting TZ
input 10:00:00 AM July 1 2005
-strftime 10:00:00 AM July 1 2005 EST +1000
-datestr 10:00:00 AM July 1 2005 EST
+strftime 10:00:00 AM July 1 2005 AEST +1000
+datestr 10:00:00 AM July 1 2005 AEST