Merge branch 'master' into hotfix/ZF-3821

Conflicts: tests/Zend/InfoCard/XmlParsingTest.php
zendframework · Aug 26, 2011 · aff3f5c · aff3f5c
16 parents 012f3f7 + e1d7b9a + d0c5d5b + ebf227a + 78cdefd + 033ab4d + 5013d43 + c0d814f + 1845030 + a714cd1 + f1de588 + 90636d5 + 6352730 + 933cf1f + b9e6fb9 + 7e6dded
commit aff3f5c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/test/CoreTest.php b/test/CoreTest.php
@@ -115,7 +115,7 @@ public function testSetBackendCorrectCall2()
         $this->_instance->setBackend($backend);
         $log = $backend->getLastLog();
         $this->assertEquals('setDirectives', $log['methodName']);
-        $this->assertType('array', $log['args'][0]);
+        $this->assertInternalType('array', $log['args'][0]);
     }
 
     public function testSetOptionCorrectCall()

diff --git a/test/TestCommonBackend.php b/test/TestCommonBackend.php
@@ -34,21 +34,33 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Cache
  */
-abstract class TestCommonBackend extends \PHPUnit_Framework_TestCase 
+abstract class TestCommonBackend extends \PHPUnit_Framework_TestCase
 {
 
     protected $_instance;
     protected $_className;
     protected $_root;
 
+    /**
+     * Stores the original set timezone
+     * @var string
+     */
+    private $_originaltimezone;
+
     public function __construct($name = null, array $data = array(), $dataName = '')
     {
         $this->_className = $name;
         $this->_root = __DIR__;
+        $this->_originaltimezone = date_default_timezone_get();
         date_default_timezone_set('UTC');
         parent::__construct($name, $data, $dataName);
     }
 
+    public function __destruct()
+    {
+        date_default_timezone_set($this->_originaltimezone);
+    }
+
     public function setUp($notag = false)
     {
         $this->mkdir();