Merge branch 'hotfix/ZF-9197' of https://github.com/thomasweidner/zf2 …

…into hotfix/zf-9197 Conflicts: library/Zend/Filter/InputFilter.php tests/Zend/Filter/InputTest.php
zendframework · Aug 25, 2011 · 18ecd64 · 18ecd64
18 parents df8046a + f00b78e + 18be569 + af6e96a + a62b890 + 369a5ce + 2f4d803 + 045137d + 2fdcee4 + 147c99e + d95685a + 9fceeb6 + 4682ed8 + 58e6c7d + f9a818b + b470c79 + ce259b2 + 13b068c
commit 18ecd64
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -40,8 +40,17 @@
  */
 class FactoryTest 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 "It is not safe to rely on the system's timezone settings."
         // message if timezone is not set within php.ini
         date_default_timezone_set('GMT');
@@ -53,6 +62,7 @@ public function tearDown()
         Barcode\Barcode::setPluginLoader($loader, Barcode\Barcode::OBJECT);
         $loader = new PrefixPathLoader(array('Zend\Barcode\Renderer' => 'Zend/Barcode/Renderer'));
         Barcode\Barcode::setPluginLoader($loader, Barcode\Barcode::RENDERER);
+        date_default_timezone_set($this->_originaltimezone);
     }
 
     public function testMinimalFactory()

diff --git a/test/Renderer/TestCommon.php b/test/Renderer/TestCommon.php
@@ -44,10 +44,18 @@ abstract class TestCommon extends \PHPUnit_Framework_TestCase
      */
     protected $_renderer = null;
 
+    /**
+     * Stores the original set timezone
+     * @var string
+     */
+    private $_originaltimezone;
+
     abstract protected function _getRendererObject($options = null);
 
     public function setUp()
     {
+        $this->_originaltimezone = date_default_timezone_get();
+
         // Set timezone to avoid "It is not safe to rely on the system's timezone settings."
         // message if timezone is not set within php.ini
         date_default_timezone_set('GMT');
@@ -59,6 +67,7 @@ public function setUp()
     public function tearDown()
     {
         Barcode\Barcode::setBarcodeFont(null);
+        date_default_timezone_set($this->_originaltimezone);
     }
 
     public function testSetBarcodeObject()