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

zendframework · Sep 20, 2011 · 97b778e · 97b778e
commit 97b778e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/test/MessageTest.php b/test/MessageTest.php
@@ -62,13 +62,13 @@ public function testGetMime()
     {
         $msg = new Mime\Message();  // No Parts
         $m = $msg->getMime();
-        $this->assertType('\Zend\Mime\Mime', $m);
+        $this->assertInstanceOf('Zend\\Mime\\Mime', $m);
 
         $msg = new Mime\Message();  // No Parts
         $mime = new Mime\Mime('1234');
         $msg->setMime($mime);
         $m2 = $msg->getMime();
-        $this->assertType('\Zend\Mime\Mime', $m2);
+        $this->assertInstanceOf('Zend\\Mime\\Mime', $m2);
         $this->assertEquals('1234', $m2->boundary());
     }
 

diff --git a/test/MimeTest.php b/test/MimeTest.php
@@ -37,6 +37,28 @@
  */
 class MimeTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * Stores the original set timezone
+     * @var string
+     */
+    private $_originaltimezone;
+
+    /**
+     * Setup environment
+     */
+    public function setUp()
+    {
+        $this->_originaltimezone = date_default_timezone_get();
+    }
+
+    /**
+     * Teardown environment
+     */
+    public function tearDown()
+    {
+        date_default_timezone_set($this->_originaltimezone);
+    }
+
     public function testBoundary()
     {
         // check boundary for uniqueness