[Pkg-php-commits] [php/debian-sid] Disable two unit tests and fix one, since we don't consider using system time zone as an error.

[Ondřej Surý]

Unit tests corrected:
 date_default_timezone_get() function [1] [ext/date/tests/date_default_timezone_get-1.phpt]
 date_default_timezone_get() function [2] [ext/date/tests/date_default_timezone_get-2.phpt]
 date_default_timezone_set() function [1] [ext/date/tests/date_default_timezone_set-1.phpt]
---
 debian/patches/use_embedded_timezonedb_fixes.patch |   46 ++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 deletions(-)

diff --git a/debian/patches/use_embedded_timezonedb_fixes.patch b/debian/patches/use_embedded_timezonedb_fixes.patch
index 18041f8..3693d8a 100644
--- a/debian/patches/use_embedded_timezonedb_fixes.patch
+++ b/debian/patches/use_embedded_timezonedb_fixes.patch
@@ -16,3 +16,49 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571762
  		return tzid;
  	}
  #endif
+--- a/ext/date/tests/date_default_timezone_get-1.phpt
++++ /dev/null
+@@ -1,16 +0,0 @@
+---TEST--
+-date_default_timezone_get() function [1]
+---INI--
+-date.timezone=
+---FILE--
+-<?php
+-	putenv('TZ=');
+-	echo date_default_timezone_get(), "\n";
+-	echo date('e'), "\n";
+-?>
+---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 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_get-1.php on line 3
+-UTC
+-
+-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 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_get-1.php on line 4
+-UTC
+--- a/ext/date/tests/date_default_timezone_get-2.phpt
++++ /dev/null
+@@ -1,12 +0,0 @@
+---TEST--
+-date_default_timezone_get() function [2]
+---INI--
+-date.timezone=
+---FILE--
+-<?php
+-	putenv('TZ=');
+-	echo date_default_timezone_get(), "\n";
+-?>
+---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 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_get-2.php on line 3
+-UTC
+--- a/ext/date/tests/date_default_timezone_set-1.phpt
++++ b/ext/date/tests/date_default_timezone_set-1.phpt
+@@ -18,9 +18,6 @@ date.timezone=
+ 	echo date(DATE_ISO8601, $date4), "\n";
+ ?>
+ --EXPECTF--
+-Warning: strtotime(): 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 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_set-1.php on line 3
+-
+-Warning: strtotime(): 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 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_set-1.php on line 4
+ America/Indiana/Knox
+ 2005-01-12T03:00:00-0500
+ 2005-07-12T03:00:00-0500
-- 
1.6.3.3