Merge branch 'master' of git://git.zendframework.com/zf

zendframework · Sep 20, 2011 · 04f5596 · 04f5596
13 parents ceecda2 + 84a7972 + f6501d5 + 74b0454 + ea99bf1 + e2703e7 + 90db7ae + b2f5380 + d6ee2dd + 2dae9df + 15a2e1f + 00d7ef1 + 88e29ab
commit 04f5596
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/test/MailTest.php b/test/MailTest.php
@@ -38,8 +38,15 @@
  */
 class MailTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * Stores the original set timezone
+     * @var string
+     */
+    private $_originaltimezone;
+
     public function setUp()
     {
+        $this->_originaltimezone = date_default_timezone_get();
         // Set timezone to avoid "date(): It is not safe to rely on the system's timezone settings."
         // message.
         date_default_timezone_set('GMT');
@@ -49,6 +56,7 @@ public function tearDown()
     {
         Mail\Mail::clearDefaultFrom();
         Mail\Mail::clearDefaultReplyTo();
+        date_default_timezone_set($this->_originaltimezone);
     }
 
     /**
@@ -908,7 +916,7 @@ public function testSendmailTransportThrowsExceptionWithInvalidParams()
             $mail->send($transport);
             $this->fail('Exception should have been thrown, but wasn\'t');
         } catch(Transport\Exception $e) {
-        	// do nothing
+            // do nothing
         }
     }