Imported Upstream version 5.4.4~rc1upstream/5.4.4_rc1

4 files changed, 37 insertions, 3 deletions

diff --git a/ext/date/tests/bug52062.phpt b/ext/date/tests/bug52062.phpt
index d7795241a..1d814377c 100644
--- a/ext/date/tests/bug52062.phpt
+++ b/ext/date/tests/bug52062.phpt
@@ -13,6 +13,7 @@ date.timezone=UTC
 $d = new DateTime('@100000000000');
 var_dump($d->format('Y-m-d H:i:s U'));
 var_dump($d->getTimestamp());
+var_dump($d->format('U'));
 
 $d->setTimestamp(100000000000);
 var_dump($d->format('Y-m-d H:i:s U'));
@@ -23,7 +24,8 @@ var_dump($i->format('%s'));
 ?>
 --EXPECT--
 string(32) "5138-11-16 09:46:40 100000000000"
-int(100000000000)
-string(32) "5138-11-16 09:46:40 100000000000"
-int(100000000000)
+bool(false)
 string(12) "100000000000"
+string(30) "2008-07-11 04:56:32 1215752192"
+int(1215752192)
+string(10) "1215752192"
diff --git a/ext/date/tests/date_default_timezone_get-1-win32.phpt b/ext/date/tests/date_default_timezone_get-1-win32.phpt
new file mode 100644
index 000000000..ed9ac1a47
--- /dev/null
+++ b/ext/date/tests/date_default_timezone_get-1-win32.phpt
@@ -0,0 +1,24 @@
+--TEST--
+date_default_timezone_get() function [1]
+--SKIPIF--
+<?php
+       if(substr(PHP_OS, 0, 3) != 'WIN') die("skip skip on non windows");
+?>
+--INI--
+date.timezone=
+--FILE--
+<?php
+       putenv('TZ=');
+       echo date_default_timezone_get(), "\n";
+       echo date('e'), "\n";
+       /* The behaviour on windows is to select an arbitrary timezone name from the current system settings.
+          This gives no chance to hardcode the timezone name, for instance for UTC+1 it could choose
+          from the multiple names like Europe/Berlin or Europe/Paris . For this reason the test is
+          parametrized so there is no hardcoded timezone data.*/
+?>
+--EXPECTF--
+Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone '%s' for now, but please set date.timezone to select your timezone. in %s on line %d
+%s
+
+Warning: date(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone '%s' for now, but please set date.timezone to select your timezone. in %s on line %d
+%s
diff --git a/ext/date/tests/date_default_timezone_get-1.phpt b/ext/date/tests/date_default_timezone_get-1.phpt
index 5fa4192c1..4bff31a78 100644
--- a/ext/date/tests/date_default_timezone_get-1.phpt
+++ b/ext/date/tests/date_default_timezone_get-1.phpt
@@ -1,5 +1,9 @@
 --TEST--
 date_default_timezone_get() function [1]
+--SKIPIF--
+<?php
+	if(substr(PHP_OS, 0, 3) == 'WIN') die("skip on windows");
+?>
 --INI--
 date.timezone=
 --FILE--
diff --git a/ext/date/tests/date_default_timezone_get-2.phpt b/ext/date/tests/date_default_timezone_get-2.phpt
index abf283575..f58938d35 100644
--- a/ext/date/tests/date_default_timezone_get-2.phpt
+++ b/ext/date/tests/date_default_timezone_get-2.phpt
@@ -1,5 +1,9 @@
 --TEST--
 date_default_timezone_get() function [2]
+--SKIPIF--
+<?php
+	if(substr(PHP_OS, 0, 3) == 'WIN') die("skip on windows");
+?>
 --INI--
 date.timezone=
 --FILE--