diff options
| author | Derick Rethans <github@derickrethans.nl> | 2016-09-30 20:50:00 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2016-09-30 20:50:00 +0100 |
| commit | e63443d8251227df26d9ca114f1bc8e7c0f1651f (patch) | |
| tree | 86fc5264d86c51904f4e8153e059bcf245971645 | |
| parent | 99b58896dced86e0ecc73517a1f2ea2aae9bc483 (diff) | |
| parent | 6ad288ee23de5636f90ba84937f41ddebf177535 (diff) | |
| download | php-git-e63443d8251227df26d9ca114f1bc8e7c0f1651f.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | ext/date/tests/bug20382-2.phpt | 12 | ||||
| -rw-r--r-- | ext/date/tests/bug33414-1.phpt | 4 | ||||
| -rw-r--r-- | ext/date/tests/bug33415-1.phpt | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/ext/date/tests/bug20382-2.phpt b/ext/date/tests/bug20382-2.phpt index cc2d967895..39778ae284 100644 --- a/ext/date/tests/bug20382-2.phpt +++ b/ext/date/tests/bug20382-2.phpt @@ -75,8 +75,8 @@ result = Monday 1983-04-18 01:00:00 CEST wanted = Monday 00:00:00 Asia/Yerevan -ts = Monday 2037-10-19 17:17:17 AMT -result = Monday 2037-10-26 00:00:00 AMT +ts = Monday 2037-10-19 17:17:17 +04 +result = Monday 2037-10-26 00:00:00 +04 wanted = Monday 00:00:00 America/Curacao @@ -115,8 +115,8 @@ result = Monday 1971-04-05 00:00:00 AST wanted = Monday 00:00:00 Asia/Baku -ts = Friday 1971-01-01 17:17:17 BAKT -result = Monday 1971-01-04 00:00:00 BAKT +ts = Friday 1971-01-01 17:17:17 +04 +result = Monday 1971-01-04 00:00:00 +04 wanted = Monday 00:00:00 Europe/Sarajevo @@ -165,6 +165,6 @@ result = Monday 1980-04-07 00:00:00 CEST wanted = Monday 00:00:00 Asia/Baku -ts = Monday 1995-12-25 17:17:17 AZT -result = Monday 1996-01-01 00:00:00 AZT +ts = Monday 1995-12-25 17:17:17 +04 +result = Monday 1996-01-01 00:00:00 +04 wanted = Monday 00:00:00 diff --git a/ext/date/tests/bug33414-1.phpt b/ext/date/tests/bug33414-1.phpt index bd6e4c39ac..86b3183395 100644 --- a/ext/date/tests/bug33414-1.phpt +++ b/ext/date/tests/bug33414-1.phpt @@ -226,8 +226,8 @@ result=Thursday 1980-04-10 00:00:00 CEST 1 wanted=Thursday 00:00:00 TZ=Asia/Baku - wrong day. -tStamp=Sunday 1992-09-20 17:17:17 AZST 1 -result=Monday 1992-09-28 00:00:00 AZT 0 +tStamp=Sunday 1992-09-20 17:17:17 +04 1 +result=Monday 1992-09-28 00:00:00 +04 0 wanted=Monday 00:00:00 TZ=America/Noronha - wrong day. diff --git a/ext/date/tests/bug33415-1.phpt b/ext/date/tests/bug33415-1.phpt index 698252a032..414515b47f 100644 --- a/ext/date/tests/bug33415-1.phpt +++ b/ext/date/tests/bug33415-1.phpt @@ -28,6 +28,6 @@ result=Monday 1990-10-22 00:00:00 WART 0 wanted=Monday 00:00:00 TZ=Asia/Tbilisi - Is it OK for this to be 2 AM? -tStamp=Sunday 2005-03-20 17:17:17 GET 0 -result=Sunday 2005-03-27 00:00:00 GET 0 +tStamp=Sunday 2005-03-20 17:17:17 +03 0 +result=Sunday 2005-03-27 00:00:00 +03 0 wanted=Sunday 00:00:00 |