From db657046392b6840fc7d357fb0d2978649f4379a Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Sat, 31 Mar 2012 20:08:25 +1300 Subject: [PATCH] MINOR Removed PHP 5.2 check in DateTest --- tests/model/DateTest.php | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/tests/model/DateTest.php b/tests/model/DateTest.php index 00a344a1f..93aa4616f 100644 --- a/tests/model/DateTest.php +++ b/tests/model/DateTest.php @@ -6,31 +6,19 @@ class DateTest extends SapphireTest { protected $originalTZ; - + function setUp() { // Set timezone to support timestamp->date conversion. - // We can't use date_default_timezone_set() as its not supported prior to PHP 5.2 - - if (version_compare(PHP_VERSION, '5.2.0', '<')) { - $this->originalTZ = ini_get('date.timezone'); - ini_set('date.timezone', 'Pacific/Auckland'); - } else { - $this->originalTZ = date_default_timezone_get(); - date_default_timezone_set('Pacific/Auckland'); - } + $this->originalTZ = date_default_timezone_get(); + date_default_timezone_set('Pacific/Auckland'); parent::setUp(); } - + function tearDown() { - if(version_compare(PHP_VERSION, '5.2.0', '<') ){ - ini_set('date.timezone',$this->originalTZ); - } else { - date_default_timezone_set($this->originalTZ); - } - + date_default_timezone_set($this->originalTZ); parent::tearDown(); } - + function testNiceDate() { $this->assertEquals('31/03/2008', DBField::create('Date', 1206968400)->Nice(), "Date->Nice() works with timestamp integers"