From 9a86c92895c6f0e629291b103bc04891f58851ce Mon Sep 17 00:00:00 2001
From: andy wharmby <wharmby@php.net>
Date: Tue, 13 Jan 2009 23:10:52 +0000
Subject: [PATCH] Fix new date tests. Tested on Windows, Linux and Linux 64 bit

---
 ext/date/tests/date_default_timezone_get_error.phpt | 4 ++--
 ext/date/tests/date_default_timezone_set_error.phpt | 2 --
 ext/date/tests/date_sun_info_error.phpt             | 2 --
 ext/date/tests/date_sun_info_variation1.phpt        | 3 +--
 ext/date/tests/date_sun_info_variation2.phpt        | 5 +++--
 ext/date/tests/date_sun_info_variation3.phpt        | 5 +++--
 ext/date/tests/date_sunrise_and_sunset_basic.phpt   | 4 ++--
 7 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/ext/date/tests/date_default_timezone_get_error.phpt b/ext/date/tests/date_default_timezone_get_error.phpt
index 3a18a761d5..bf8bc8ef6e 100644
--- a/ext/date/tests/date_default_timezone_get_error.phpt
+++ b/ext/date/tests/date_default_timezone_get_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test date_default_timezone_get() function : error conditions
---INI--
-date.timezone=UTC
 --FILE--
 <?php
 /* Prototype  : string date_default_timezone_get ( void )
@@ -9,6 +7,8 @@ date.timezone=UTC
  * Source code: ext/standard/data/php_date.c
  */
 
+date_default_timezone_set("UTC");
+
 echo "*** Testing date_default_timezone_get() : error conditions ***\n";
 
 echo "\n-- Testing date_create() function with more than expected no. of arguments --\n";
diff --git a/ext/date/tests/date_default_timezone_set_error.phpt b/ext/date/tests/date_default_timezone_set_error.phpt
index 870afe4ff4..15c6aa6fed 100644
--- a/ext/date/tests/date_default_timezone_set_error.phpt
+++ b/ext/date/tests/date_default_timezone_set_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test date_default_timezone_set() function : error variations
---INI--
-date.timezone=UTC
 --FILE--
 <?php
 /* Prototype  : bool date_default_timezone_set ( string $timezone_identifier )
diff --git a/ext/date/tests/date_sun_info_error.phpt b/ext/date/tests/date_sun_info_error.phpt
index f5665ee58c..8d572479f3 100644
--- a/ext/date/tests/date_sun_info_error.phpt
+++ b/ext/date/tests/date_sun_info_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test date_sun_info() function : error variations
---INI--
-date.timezone=UTC
 --FILE--
 <?php
 /* Prototype  : array date_sun_info ( int $time , float $latitude , float $longitude   )
diff --git a/ext/date/tests/date_sun_info_variation1.phpt b/ext/date/tests/date_sun_info_variation1.phpt
index ddcaf8955b..4df94c8b87 100644
--- a/ext/date/tests/date_sun_info_variation1.phpt
+++ b/ext/date/tests/date_sun_info_variation1.phpt
@@ -1,13 +1,12 @@
 --TEST--
 Test date_sun_info() function : error variations - Pass unexpected values for time argument
---INI--
-date.timezone=UTC
 --FILE--
 <?php
 /* Prototype  : array date_sun_info ( int $time , float $latitude , float $longitude )
  * Description:  Returns an array with information about sunset/sunrise and twilight begin/end.
  * Source code: ext/standard/data/php_date.c
  */
+date_default_timezone_set("UTC");
 
 echo "*** Testing date_sun_info() : usage variations ***\n";
 
diff --git a/ext/date/tests/date_sun_info_variation2.phpt b/ext/date/tests/date_sun_info_variation2.phpt
index 16ad83ea03..55a782a78c 100644
--- a/ext/date/tests/date_sun_info_variation2.phpt
+++ b/ext/date/tests/date_sun_info_variation2.phpt
@@ -1,13 +1,14 @@
 --TEST--
 Test date_sun_info() function : error variations - PAss unexepcted valuesfor latitude argument
---INI--
-date.timezone=UTC
 --FILE--
 <?php
 /* Prototype  : array date_sun_info ( int $time , float $latitude , float $longitude )
  * Description:  Returns an array with information about sunset/sunrise and twilight begin/end.
  * Source code: ext/standard/data/php_date.c
  */
+ 
+// supress date() function strict msgs 
+error_reporting(E_ALL & ~E_STRICT);
 
 echo "*** Testing date_sun_info() : usage variations ***\n";
 
diff --git a/ext/date/tests/date_sun_info_variation3.phpt b/ext/date/tests/date_sun_info_variation3.phpt
index 4f9d3b26a0..6a1dd77236 100644
--- a/ext/date/tests/date_sun_info_variation3.phpt
+++ b/ext/date/tests/date_sun_info_variation3.phpt
@@ -1,13 +1,14 @@
 --TEST--
 Test date_sun_info() function : usage variations - Pass unexpected values for longitude argument
---INI--
-date.timezone=UTC
 --FILE--
 <?php
 /* Prototype  : array date_sun_info ( int $time , float $latitude , float $longitude )
  * Description:  Returns an array with information about sunset/sunrise and twilight begin/end.
  * Source code: ext/standard/data/php_date.c
  */
+ 
+// supress date() function strict msgs 
+error_reporting(E_ALL & ~E_STRICT);
 
 echo "*** Testing date_sun_info() : usage variations ***\n";
 
diff --git a/ext/date/tests/date_sunrise_and_sunset_basic.phpt b/ext/date/tests/date_sunrise_and_sunset_basic.phpt
index 37255217d4..9f294b7511 100644
--- a/ext/date/tests/date_sunrise_and_sunset_basic.phpt
+++ b/ext/date/tests/date_sunrise_and_sunset_basic.phpt
@@ -12,8 +12,8 @@ offset: +1 GMT
 
 echo "Basic test for date_sunrise() and date_sunset()\n";
 
-// supress date() function warning msgs 
-error_reporting(E_ALL & ~E_WARNING);
+// supress date() function strict msgs 
+error_reporting(E_ALL & ~E_STRICT);
 
 echo date("D M d Y") . ', sunrise time : ' . date_sunrise(time(), SUNFUNCS_RET_STRING, 38.4, -9, 90, 1) . "\n";
 echo date("D M d Y") . ', sunset time : ' . date_sunset(time(), SUNFUNCS_RET_STRING, 38.4, -9, 90, 1) . "\n";
-- 
2.50.1