- fix test on win, putenv is not supported for TZ and ext/date

diff --git a/ext/date/tests/bug33415-2.phpt b/ext/date/tests/bug33415-2.phpt
index 9ea537a9f85639a3e382aacad5bdc1d7e815b45a..50fface88b26825bdbda21b9119b1042990ce681 100644 (file)
--- a/ext/date/tests/bug33415-2.phpt
+++ b/ext/date/tests/bug33415-2.phpt
@@ -5,7 +5,11 @@ Bug #33415 [2] (Possibly invalid non-one-hour DST or timezone shifts)
 
 print "TZ=Africa/Bujumbura - *Note*: Unexpected, as does not appear to
 have a DST or timezone transition.\n";
-putenv("TZ=Africa/Bujumbura");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Africa/Bujumbura');
+} else {
+       putenv("TZ=Africa/Bujumbura");
+}
 $tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Wednesday", $tStamp);
@@ -13,7 +17,11 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Wednesday            00:00:00\n\n";
 
 print "TZ=Asia/Thimbu - Is it OK for this to be 0:30 AM? yes\n";
-putenv("TZ=Asia/Thimbu");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Asia/Thimbu');
+} else {
+       putenv("TZ=Asia/Thimbu");
+}
 $tStamp = mktime (17, 17, 17, 1, 6476, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Thursday", $tStamp);
@@ -22,7 +30,11 @@ print "wanted=Thursday            00:30:00\n\n";
 
 print "TZ=Indian/Cocos - Is it OK for this to be 6:30 AM? Note: does not
 appear to have a DST or timezone transition.\n";
-putenv("TZ=Indian/Cocos");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Indian/Cocos');
+} else {
+       putenv("TZ=Indian/Cocos");
+}
 $tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Thursday", $tStamp);
@@ -31,7 +43,11 @@ print "wanted=Thursday            00:00:00\n\n";
 
 print "TZ=Africa/Lubumbashi - Is it OK for this to be 2 AM? Note: does
 not appear to have a DST or timezone transition.\n";
-putenv("TZ=Africa/Lubumbashi");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Africa/Lubumbashi');
+} else {
+       putenv("TZ=Africa/Lubumbashi");
+}
 $tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Saturday", $tStamp);
@@ -39,7 +55,11 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Saturday            00:00:00\n\n";
 
 print "TZ=Asia/Kashgar - Is it OK for this to be 3 AM? yes\n";
-putenv("TZ=Asia/Kashgar");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Asia/Kashgar');
+} else {
+       putenv("TZ=Asia/Kashgar");
+}
 $tStamp = mktime (17, 17, 17, 1, 3767, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Thursday", $tStamp);
@@ -48,7 +68,11 @@ print "wanted=Thursday            03:00:00\n\n";
 
 print "TZ=Indian/Christmas - Is it OK for this to be 7 AM?  Note: does
 not appear to have a DST or timezone transition.\n";
-putenv("TZ=Indian/Christmas");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Indian/Christmas');
+} else {
+       putenv("TZ=Indian/Christmas");
+}
 $tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Sunday", $tStamp);
@@ -56,7 +80,11 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Sunday            00:00:00\n\n";
 
 print "TZ=America/Santo_Domingo - Is it OK for this to be 0:30 AM? yes\n";
-putenv("TZ=America/Santo_Domingo");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('America/Santo_Domingo');
+} else {
+       putenv("TZ=America/Santo_Domingo");
+}
 $tStamp = mktime (17, 17, 17, 1, 291, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Sunday", $tStamp);
@@ -65,7 +93,11 @@ print "wanted=Sunday            00:30:00\n\n";
 
 print "TZ=Pacific/Truk - Is it OK for this to be 10 AM?  Note: does not
 appear to have a DST or timezone transition.\n";
-putenv("TZ=Pacific/Truk");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Pacific/Truk');
+} else {
+       putenv("TZ=Pacific/Truk");
+}
 $tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Tuesday", $tStamp);
@@ -74,7 +106,11 @@ print "wanted=Tuesday            00:00:00\n\n";
 
 print "TZ=Pacific/Ponape - Is it OK for this to be 11 AM?  Note: does
 not appear to have a DST or timezone transition.\n";
-putenv("TZ=Pacific/Ponape");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Pacific/Ponape');
+} else {
+       putenv("TZ=Pacific/Ponape");
+}
 $tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Monday", $tStamp);
@@ -82,7 +118,11 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Monday            00:00:00\n\n";
 
 print "TZ=America/Scoresbysund - Is it OK for this to be 2 AM? yes\n";
-putenv("TZ=America/Scoresbysund");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('America/Scoresbysund');
+} else {
+       putenv("TZ=America/Scoresbysund");
+}
 $tStamp = mktime (17, 17, 17, 1, 4099, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Sunday", $tStamp);
@@ -90,7 +130,11 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Sunday            02:00:00\n\n";
 
 print "TZ=America/Guyana - Is it OK for this to be 0:45 AM? yes\n";
-putenv("TZ=America/Guyana");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('America/Guyana');
+} else {
+       putenv("TZ=America/Guyana");
+}
 $tStamp = mktime (17, 17, 17, 1, 2031, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Thursday", $tStamp);
@@ -98,7 +142,11 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Thursday            00:45:00\n\n";
 
 print "TZ=Asia/Tehran - Is it OK for this to be 0:30 AM? yes\n";
-putenv("TZ=Asia/Tehran");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Asia/Tehran');
+} else {
+       putenv("TZ=Asia/Tehran");
+}
 $tStamp = mktime (17, 17, 17, 1, 2855, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Tuesday", $tStamp);
@@ -107,7 +155,11 @@ print "wanted=Tuesday            00:30:00\n\n";
 
 print "TZ=Pacific/Tarawa - Is it OK for this to be Midday? Note: does
 not appear to have a DST or timezone transition.\n";     
-putenv("TZ=Pacific/Tarawa");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Pacific/Tarawa');
+} else {
+       putenv("TZ=Pacific/Tarawa");
+}
 $tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Monday", $tStamp);
@@ -115,7 +167,11 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Monday            00:00:00\n\n";
 
 print "TZ=Africa/Monrovia - Is it OK for this to be 00:44:30 AM? yes\n";
-putenv("TZ=Africa/Monrovia");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Africa/Monrovia');
+} else {
+       putenv("TZ=Africa/Monrovia");
+}
 $tStamp = mktime (17, 17, 17, 1, 845, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Monday", $tStamp);
@@ -123,7 +179,11 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Monday            00:44:30\n\n";
 
 print "TZ=Asia/Katmandu - Is it OK for this to 0:15 AM?. yes\n";
-putenv("TZ=Asia/Katmandu");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Asia/Katmandu');
+} else {
+       putenv("TZ=Asia/Katmandu");
+}
 $tStamp = mktime (17, 17, 17, 1, 5838, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Wednesday", $tStamp);
@@ -131,7 +191,11 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Wednesday            00:15:00\n\n";         
 
 print "TZ=Pacific/Nauru - Is it OK for this to be 0:30? yes\n";
-putenv("TZ=Pacific/Nauru");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Pacific/Nauru');
+} else {
+       putenv("TZ=Pacific/Nauru");
+}
 $tStamp = mktime (17, 17, 17, 1, 3401, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Tuesday", $tStamp);
@@ -139,7 +203,11 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Tuesday            00:30:00\n\n";
 
 print "TZ=Pacific/Niue - Is it OK for this to be 0:30 AM? yes\n";
-putenv("TZ=Pacific/Niue");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Pacific/Niue');
+} else {
+       putenv("TZ=Pacific/Niue");
+}
 $tStamp = mktime (17, 17, 17, 1, 3189, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Sunday", $tStamp);
@@ -148,7 +216,11 @@ print "wanted=Sunday            00:30:00\n\n";
 
 print "TZ=Pacific/Port_Moresby - Is it OK for this to be 10 AM? No DST
 or timezone transition.\n";
-putenv("TZ=Pacific/Port_Moresby");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Pacific/Port_Moresby');
+} else {
+       putenv("TZ=Pacific/Port_Moresby");
+}
 $tStamp = mktime (17, 17, 17, 1, 1, 1970);   
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Thursday", $tStamp); 
@@ -156,7 +228,11 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Thursday            00:00:00\n\n";          
 
 print "TZ=America/Miquelon - Is it OK for this to be 1 AM ? yes\n";
-putenv("TZ=America/Miquelon");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('America/Miquelon');
+} else {
+       putenv("TZ=America/Miquelon");
+}
 $tStamp = mktime (17, 17, 17, 1, 3767, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Thursday", $tStamp);
@@ -165,7 +241,11 @@ print "wanted=Thursday            01:00:00\n\n";
 
 print "TZ=Pacific/Palau - Is it OK for this to be 9 AM? No DST or
 timezone transition.\n";
-putenv("TZ=Pacific/Palau");   
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Pacific/Palau');
+} else {
+       putenv("TZ=Pacific/Palau");
+} 
 $tStamp = mktime (17, 17, 17, 1, 1, 1970);   
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Saturday", $tStamp);
@@ -174,7 +254,11 @@ print "wanted=Saturday            00:00:00\n\n";
 
 print "TZ=Pacific/Funafuti - Is it OK for this to be midday?  Note: does
 not appear to have a DST or timezone transition.\n";
-putenv("TZ=Pacific/Funafuti");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Pacific/Funafuti');
+} else {
+       putenv("TZ=Pacific/Funafuti");
+} 
 $tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Wednesday", $tStamp);
@@ -183,7 +267,11 @@ print "wanted=Wednesday            00:00:00\n\n";
 
 print "TZ=Pacific/Wake - Is it OK for this to be midday?  Note: does not
 appear to have a DST or timezone transition.\n";
-putenv("TZ=Pacific/Wake");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Pacific/Wake');
+} else {
+       putenv("TZ=Pacific/Wake");
+} 
 $tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Tuesday", $tStamp);
@@ -192,7 +280,11 @@ print "wanted=Tuesday            00:00:00\n\n";
 
 print "TZ=Pacific/Wallis - Is it OK for this to be midday?  Note: does
 not appear to have a DST or timezone transition.\n";
-putenv("TZ=Pacific/Wallis");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('Pacific/Wallis');
+} else {
+       putenv("TZ=Pacific/Wallis");
+} 
 $tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Tuesday", $tStamp);
@@ -200,7 +292,11 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Tuesday            00:00:00\n\n";
 
 print "TZ=America/Paramaribo - Is it OK for this to be 0:30 AM? yes\n";
-putenv("TZ=America/Paramaribo");
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+       date_default_timezone_set('America/Paramaribo');
+} else {
+       putenv("TZ=America/Paramaribo");
+} 
 $tStamp = mktime (17, 17, 17, 1, 5381, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Monday", $tStamp);