浏览代码

Remove exerimental code.

dereuromark 8 年之前
父节点
当前提交
b79eccd072
共有 2 个文件被更改,包括 0 次插入94 次删除
  1. 0 35
      src/Utility/Time.php
  2. 0 59
      tests/TestCase/Utility/TimeTest.php

+ 0 - 35
src/Utility/Time.php

@@ -66,24 +66,6 @@ class Time extends CakeTime {
 	}
 
 	/**
-	 * Calculate the current GMT offset from a timezone string (respecting DST)
-	 *
-	 * @param string|\DateTimeZone|null $timezone User's timezone string or DateTimeZone object
-	 * @return int Offset in hours
-	 */
-	public function getGmtOffset($timezone = null) {
-		if ($timezone) {
-			$timezone = $this->safeCreateDateTimeZone($timezone);
-		} else {
-			$timezone = $this->getTimezone();
-		}
-
-		$offset = $timezone->getOffset(new CakeTime('@' . time()));
-		$offset = $offset / HOUR;
-		return $offset;
-	}
-
-	/**
 	 * Gets the timezone that is closest to the given coordinates
 	 *
 	 * @param float $lat
@@ -1395,8 +1377,6 @@ class Time extends CakeTime {
 	}
 
 	/**
-	 * TimeLib::pad()
-	 *
 	 * @param string $value
 	 * @param int $length
 	 * @param string $string
@@ -1406,19 +1386,4 @@ class Time extends CakeTime {
 		return str_pad((int)$value, $length, $string, STR_PAD_LEFT);
 	}
 
-	/**
-	 * EXPERIMENTAL!!!
-	 *
-	 * @param int $gmtoffset Offset in seconds
-	 * @param bool $isDst If DST
-	 * @return int offset Calculated offset
-	 */
-	public static function tzOffset($gmtoffset, $isDst) {
-		extract(getdate());
-		$serveroffset = gmmktime(0, 0, 0, $mon, $mday, $year) - mktime(0, 0, 0, $mon, $mday, $year);
-		$offset = $gmtoffset - $serveroffset;
-
-		return $offset + ($isDst ? 3600 : 0);
-	}
-
 }

+ 0 - 59
tests/TestCase/Utility/TimeTest.php

@@ -1148,63 +1148,4 @@ class TimeTest extends TestCase {
 		$this->assertEquals($name, $phpTimezone);
 	}
 
-	/**
-	 * TimeTest::testGetGmtOffset()
-	 *
-	 * @return void
-	 */
-	public function testGetGmtOffset() {
-		$timezone = Configure::read('Config.timezone');
-		$phpTimezone = date_default_timezone_get();
-		Configure::write('Config.timezone', 'UTC');
-		date_default_timezone_set('UTC');
-
-		$this->Time = new Time();
-
-		$result = $this->Time->getGmtOffset();
-		$this->assertEquals(0, $result);
-
-		$result = $this->Time->getGmtOffset('Europe/Berlin');
-		$this->assertTrue($result > 0, $result);
-
-		$result = $this->Time->getGmtOffset('America/Los_Angeles');
-		$this->assertTrue($result < 0, $result);
-
-		Configure::write('Config.timezone', $timezone);
-		date_default_timezone_set($phpTimezone);
-	}
-
-	/**
-	 * DatetimeHelperTest::testTzOffset()
-	 *
-	 * @return void
-	 */
-	public function testTzOffset() {
-		$timezone = Configure::read('Config.timezone');
-		$phpTimezone = date_default_timezone_get();
-
-		Configure::write('Config.timezone', 'UTC');
-		date_default_timezone_set('UTC');
-
-		$this->Time = new Time('2016-08-04');
-
-		$result = $this->Time->tzOffset(0, false);
-		$this->assertEquals(0, $result);
-
-		Configure::write('Config.timezone', 'Europe/Berlin');
-		date_default_timezone_set('Europe/Berlin');
-
-		$factor = date('I', $this->Time->getTimestamp());
-		$result = $this->Time->tzOffset($factor * HOUR, false);
-		$this->assertEquals(0, $result);
-
-		$this->Time = new Time('2016-02-04');
-		$factor = date('I', $this->Time->getTimestamp());
-		$result = $this->Time->tzOffset($factor * HOUR, false);
-		$this->assertEquals(-3600, $result);
-
-		Configure::write('Config.timezone', $timezone);
-		date_default_timezone_set($phpTimezone);
-	}
-
 }