Setting the timezone when including the file has undesired side effects when running...

diff --git a/framework/Date/test/Horde/Date/DateTest.php b/framework/Date/test/Horde/Date/DateTest.php
index 626d696..6b40c94 100644 (file)
--- a/framework/Date/test/Horde/Date/DateTest.php
+++ b/framework/Date/test/Horde/Date/DateTest.php
@@ -8,7 +8,7 @@
 require_once dirname(__FILE__) . '/../../../lib/Horde/Date.php';
 require_once dirname(__FILE__) . '/../../../lib/Horde/Date/Utils.php';
 require_once dirname(__FILE__) . '/../../../lib/Horde/Date/Span.php';
-date_default_timezone_set('Europe/Berlin');
+
 
 /**
  * @category   Horde
@@ -17,6 +17,17 @@ date_default_timezone_set('Europe/Berlin');
  */
 class Horde_Date_DateTest extends PHPUnit_Framework_TestCase
 {
+    public function setUp()
+    {
+        $this->_oldTimezone = date_default_timezone_get();
+        date_default_timezone_set('Europe/Berlin');
+    }
+
+    public function tearDown()
+    {
+        date_default_timezone_set($this->_oldTimezone);
+    }
+
     public function testConstructor()
     {
         $date = new stdClass();

diff --git a/framework/Date/test/Horde/Date/RecurrenceTest.php b/framework/Date/test/Horde/Date/RecurrenceTest.php
index f3c82be..93ce16e 100644 (file)
--- a/framework/Date/test/Horde/Date/RecurrenceTest.php
+++ b/framework/Date/test/Horde/Date/RecurrenceTest.php
@@ -11,7 +11,6 @@ require_once 'Horde/iCalendar.php';
 require_once dirname(__FILE__) . '/../../../lib/Horde/Date.php';
 require_once dirname(__FILE__) . '/../../../lib/Horde/Date/Recurrence.php';
 require_once dirname(__FILE__) . '/../../../lib/Horde/Date/Utils.php';
-date_default_timezone_set('Europe/Berlin');
 
 /**
  * @category   Horde
@@ -24,6 +23,13 @@ class Horde_Date_RecurrenceTest extends PHPUnit_Framework_TestCase
     {
         Horde_String::setDefaultCharset('UTF-8');
         $this->ical = new Horde_iCalendar();
+        $this->_oldTimezone = date_default_timezone_get();
+        date_default_timezone_set('Europe/Berlin');
+    }
+
+    public function tearDown()
+    {
+        date_default_timezone_set($this->_oldTimezone);
     }
 
     private function _getRecurrences($r)