archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'PHP-5.6' into PHP-7.0

Browse source
This commit is contained in:
Derick Rethans 2016-09-30 20:49:53 +01:00
commit 6ad288ee23
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/date/tests/bug20382-2.phpt
View file

@ -75,8 +75,8 @@ result = Monday 1983-04-18 01:00:00 CEST
wanted = Monday 00:00:00 wanted = Monday 00:00:00
Asia/Yerevan Asia/Yerevan
ts = Monday 2037-10-19 17:17:17 AMT ts = Monday 2037-10-19 17:17:17 +04
result = Monday 2037-10-26 00:00:00 AMT result = Monday 2037-10-26 00:00:00 +04
wanted = Monday 00:00:00 wanted = Monday 00:00:00
America/Curacao America/Curacao
@ -115,8 +115,8 @@ result = Monday 1971-04-05 00:00:00 AST
wanted = Monday 00:00:00 wanted = Monday 00:00:00
Asia/Baku Asia/Baku
ts = Friday 1971-01-01 17:17:17 BAKT ts = Friday 1971-01-01 17:17:17 +04
result = Monday 1971-01-04 00:00:00 BAKT result = Monday 1971-01-04 00:00:00 +04
wanted = Monday 00:00:00 wanted = Monday 00:00:00
Europe/Sarajevo Europe/Sarajevo
@ -165,6 +165,6 @@ result = Monday 1980-04-07 00:00:00 CEST
wanted = Monday 00:00:00 wanted = Monday 00:00:00
Asia/Baku Asia/Baku
ts = Monday 1995-12-25 17:17:17 AZT ts = Monday 1995-12-25 17:17:17 +04
result = Monday 1996-01-01 00:00:00 AZT result = Monday 1996-01-01 00:00:00 +04
wanted = Monday 00:00:00 wanted = Monday 00:00:00

4
ext/date/tests/bug33414-1.phpt
View file

@ -226,8 +226,8 @@ result=Thursday 1980-04-10 00:00:00 CEST 1
wanted=Thursday 00:00:00 wanted=Thursday 00:00:00
TZ=Asia/Baku - wrong day. TZ=Asia/Baku - wrong day.
tStamp=Sunday 1992-09-20 17:17:17 AZST 1 tStamp=Sunday 1992-09-20 17:17:17 +04 1
result=Monday 1992-09-28 00:00:00 AZT 0 result=Monday 1992-09-28 00:00:00 +04 0
wanted=Monday 00:00:00 wanted=Monday 00:00:00
TZ=America/Noronha - wrong day. TZ=America/Noronha - wrong day.

4
ext/date/tests/bug33415-1.phpt
View file

@ -28,6 +28,6 @@ result=Monday 1990-10-22 00:00:00 WART 0
wanted=Monday 00:00:00 wanted=Monday 00:00:00
TZ=Asia/Tbilisi - Is it OK for this to be 2 AM? TZ=Asia/Tbilisi - Is it OK for this to be 2 AM?
tStamp=Sunday 2005-03-20 17:17:17 GET 0 tStamp=Sunday 2005-03-20 17:17:17 +03 0
result=Sunday 2005-03-27 00:00:00 GET 0 result=Sunday 2005-03-27 00:00:00 +03 0
wanted=Sunday 00:00:00 wanted=Sunday 00:00:00