Skip to content

Bug70840 #1620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Bug70840 #1620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c91feb1
fix the russia city names
marcosptf Nov 5, 2015
5b8600d
fix the russia city names
marcosptf Nov 5, 2015
b9e86cd
fix the russia city names
marcosptf Nov 5, 2015
2e90a90
Update bug52577.phpt
marcosptf Nov 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions ext/date/lib/timezonemap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@
{ "cest", 1, 7200, "Europe/Copenhagen" },
{ "cest", 1, 7200, "Europe/Gibraltar" },
{ "cest", 1, 7200, "Europe/Kaliningrad" },
{ "cest", 1, 7200, "Europe/Kiev" },
{ "cest", 1, 7200, "Europe/Kyiv" },
{ "cest", 1, 7200, "Europe/Lisbon" },
{ "cest", 1, 7200, "Europe/Ljubljana" },
{ "cest", 1, 7200, "Europe/Luxembourg" },
Expand Down Expand Up @@ -442,7 +442,7 @@
{ "cest", 1, 7200, "Europe/Vilnius" },
{ "cest", 1, 7200, "Europe/Warsaw" },
{ "cest", 1, 7200, "Europe/Zagreb" },
{ "cest", 1, 7200, "Europe/Zaporozhye" },
{ "cest", 1, 7200, "Europe/Zaporizhia" },
{ "cest", 1, 7200, "Europe/Zurich" },
{ "cest", 1, 7200, "WET" },
{ "cet", 0, 3600, "Europe/Berlin" },
Expand All @@ -465,7 +465,7 @@
{ "cet", 0, 3600, "Europe/Copenhagen" },
{ "cet", 0, 3600, "Europe/Gibraltar" },
{ "cet", 0, 3600, "Europe/Kaliningrad" },
{ "cet", 0, 3600, "Europe/Kiev" },
{ "cet", 0, 3600, "Europe/Kyiv" },
{ "cet", 0, 3600, "Europe/Lisbon" },
{ "cet", 0, 3600, "Europe/Ljubljana" },
{ "cet", 0, 3600, "Europe/Luxembourg" },
Expand Down Expand Up @@ -495,7 +495,7 @@
{ "cet", 0, 3600, "Europe/Vilnius" },
{ "cet", 0, 3600, "Europe/Warsaw" },
{ "cet", 0, 3600, "Europe/Zagreb" },
{ "cet", 0, 3600, "Europe/Zaporozhye" },
{ "cet", 0, 3600, "Europe/Zaporizhia" },
{ "cet", 0, 3600, "Europe/Zurich" },
{ "cet", 0, 3600, "WET" },
{ "cet", 0, 7200, "Europe/Kaliningrad" },
Expand Down Expand Up @@ -656,7 +656,7 @@
{ "cst", 1, 37800, "Australia/North" },
{ "cst", 1, 37800, "Australia/South" },
{ "cst", 1, 37800, "Australia/Yancowinna" },
{ "cut", 0, 8400, "Europe/Zaporozhye" },
{ "cut", 0, 8400, "Europe/Zaporizhia" },
{ "cvst", 1, -3600, "Atlantic/Cape_Verde" },
{ "cvt", 0, -3600, "Atlantic/Cape_Verde" },
{ "cvt", 0, -7200, "Atlantic/Cape_Verde" },
Expand Down Expand Up @@ -764,7 +764,7 @@
{ "eest", 1, 10800, "Europe/Chisinau" },
{ "eest", 1, 10800, "Europe/Istanbul" },
{ "eest", 1, 10800, "Europe/Kaliningrad" },
{ "eest", 1, 10800, "Europe/Kiev" },
{ "eest", 1, 10800, "Europe/Kyiv" },
{ "eest", 1, 10800, "Europe/Mariehamn" },
{ "eest", 1, 10800, "Europe/Minsk" },
{ "eest", 1, 10800, "Europe/Moscow" },
Expand All @@ -777,7 +777,7 @@
{ "eest", 1, 10800, "Europe/Uzhgorod" },
{ "eest", 1, 10800, "Europe/Vilnius" },
{ "eest", 1, 10800, "Europe/Warsaw" },
{ "eest", 1, 10800, "Europe/Zaporozhye" },
{ "eest", 1, 10800, "Europe/Zaporizhia" },
{ "eet", 0, 7200, "Europe/Helsinki" },
{ "eet", 1, 10800, "Asia/Gaza" },
{ "eet", 0, 7200, "Africa/Cairo" },
Expand All @@ -794,7 +794,7 @@
{ "eet", 0, 7200, "Europe/Chisinau" },
{ "eet", 0, 7200, "Europe/Istanbul" },
{ "eet", 0, 7200, "Europe/Kaliningrad" },
{ "eet", 0, 7200, "Europe/Kiev" },
{ "eet", 0, 7200, "Europe/Kyiv" },
{ "eet", 0, 7200, "Europe/Mariehamn" },
{ "eet", 0, 7200, "Europe/Minsk" },
{ "eet", 0, 7200, "Europe/Moscow" },
Expand All @@ -807,7 +807,7 @@
{ "eet", 0, 7200, "Europe/Uzhgorod" },
{ "eet", 0, 7200, "Europe/Vilnius" },
{ "eet", 0, 7200, "Europe/Warsaw" },
{ "eet", 0, 7200, "Europe/Zaporozhye" },
{ "eet", 0, 7200, "Europe/Zaporizhia" },
{ "egst", 1, 0, "America/Scoresbysund" },
{ "egt", 0, -3600, "America/Scoresbysund" },
{ "ehdt", 1, -16200, "America/Santo_Domingo" },
Expand Down Expand Up @@ -1090,7 +1090,7 @@
{ "kmt", 0, -18432, "America/Cayman" },
{ "kmt", 0, -18432, "America/Grand_Turk" },
{ "kmt", 0, -18432, "America/Jamaica" },
{ "kmt", 0, 7324, "Europe/Kiev" },
{ "kmt", 0, 7324, "Europe/Kyiv" },
{ "kost", 0, 39600, "Pacific/Kosrae" },
{ "kost", 0, 43200, "Pacific/Kosrae" },
{ "krast", 1, 25200, "Asia/Krasnoyarsk" },
Expand Down Expand Up @@ -1423,27 +1423,27 @@
{ "msd", 1, 18000, "Europe/Moscow" },
{ "msd", 1, 14400, "Europe/Chisinau" },
{ "msd", 1, 14400, "Europe/Kaliningrad" },
{ "msd", 1, 14400, "Europe/Kiev" },
{ "msd", 1, 14400, "Europe/Kyiv" },
{ "msd", 1, 14400, "Europe/Minsk" },
{ "msd", 1, 14400, "Europe/Riga" },
{ "msd", 1, 14400, "Europe/Simferopol" },
{ "msd", 1, 14400, "Europe/Tallinn" },
{ "msd", 1, 14400, "Europe/Tiraspol" },
{ "msd", 1, 14400, "Europe/Uzhgorod" },
{ "msd", 1, 14400, "Europe/Vilnius" },
{ "msd", 1, 14400, "Europe/Zaporozhye" },
{ "msd", 1, 14400, "Europe/Zaporizhia" },
{ "msk", 0, 10800, "Europe/Moscow" },
{ "msk", 0, 10800, "Europe/Chisinau" },
{ "msk", 0, 10800, "Europe/Kaliningrad" },
{ "msk", 0, 10800, "Europe/Kiev" },
{ "msk", 0, 10800, "Europe/Kyiv" },
{ "msk", 0, 10800, "Europe/Minsk" },
{ "msk", 0, 10800, "Europe/Riga" },
{ "msk", 0, 10800, "Europe/Simferopol" },
{ "msk", 0, 10800, "Europe/Tallinn" },
{ "msk", 0, 10800, "Europe/Tiraspol" },
{ "msk", 0, 10800, "Europe/Uzhgorod" },
{ "msk", 0, 10800, "Europe/Vilnius" },
{ "msk", 0, 10800, "Europe/Zaporozhye" },
{ "msk", 0, 10800, "Europe/Zaporizhia" },
{ "mst", 0, -25200, "America/Denver" },
{ "mst", 0, -25200, "America/Bahia_Banderas" },
{ "mst", 0, -25200, "America/Boise" },
Expand Down
4 changes: 3 additions & 1 deletion ext/date/tests/bug52577.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
--TEST--
Bug #52577 (Incorrect date returning)
--CREDITS--
marcosptf - <marcosptf@yahoo.com.br>
--FILE--
<?php
date_default_timezone_set('Europe/Kiev');
date_default_timezone_set('Europe/Kyiv');
$date = '7.8.2010';
echo "String: ".$date."\n";
$date_format = DATE_RFC2822;
Expand Down
21 changes: 21 additions & 0 deletions ext/date/tests/bug70840.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--TEST--
Bug #52577 (Incorrect date returning)
--CREDITS--
marcosptf - <marcosptf@yahoo.com.br>
--FILE--
<?php
date_default_timezone_set('Europe/Zaporizhia');
$date = '05.11.2015';
echo "String: ".$date."\n";
$date_format = DATE_RFC2822;
$unixtime = strtotime($date);
echo "Unixtime: ".$unixtime."\n";
echo "Date(PHP): ".date($date_format,$unixtime)."\n";
$date = new DateTime('@'.$unixtime);
echo "DateTime(PHP Class): ".$date->format($date_format);
?>
--EXPECT--
String: 05.11.2015
Unixtime: 1446674400
Date(PHP): Thu, 05 Nov 2015 00:00:00 +0200
DateTime(PHP Class): Wed, 04 Nov 2015 22:00:00 +0000