diff --git a/lib/Cake/Test/Case/Utility/CakeTimeTest.php b/lib/Cake/Test/Case/Utility/CakeTimeTest.php
index d7152b5b5..87d05c33f 100644
--- a/lib/Cake/Test/Case/Utility/CakeTimeTest.php
+++ b/lib/Cake/Test/Case/Utility/CakeTimeTest.php
@@ -345,7 +345,7 @@ class CakeTimeTest extends CakeTestCase {
 		date_default_timezone_set('UTC');
 		$result = $this->Time->nice(null, 'America/New_York');
 		$expected = $this->Time->nice(time(), 'America/New_York');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->_restoreSystemTimezone();
 	}
@@ -367,12 +367,12 @@ class CakeTimeTest extends CakeTestCase {
 
 		date_default_timezone_set('Europe/London');
 		$result = $this->Time->niceShort('2005-01-15 10:00:00', new DateTimeZone('Europe/Brussels'));
-		$this->assertEqual('Jan 15th 2005, 11:00', $result);
+		$this->assertEquals('Jan 15th 2005, 11:00', $result);
 
 		date_default_timezone_set('UTC');
 		$result = $this->Time->niceShort(null, 'America/New_York');
 		$expected = $this->Time->niceShort(time(), 'America/New_York');
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
 
 		$this->_restoreSystemTimezone();
 	}
@@ -422,6 +422,54 @@ class CakeTimeTest extends CakeTestCase {
  * @return void
  */
 	public function testToServer() {
+		date_default_timezone_set('Europe/Paris');
+
+		$time = time();
+		$this->assertEquals(date('Y-m-d H:i:s', $time), $this->Time->toServer($time));
+
+		date_default_timezone_set('America/New_York');
+		$time = time();
+		date_default_timezone_set('Europe/Paris');
+		$result = $this->Time->toServer($time, 'America/New_York');
+		$this->assertEquals(date('Y-m-d H:i:s', $time), $result);
+
+		date_default_timezone_set('Europe/Paris');
+		$time = '2005-10-25 10:00:00';
+		$result = $this->Time->toServer($time);
+		$date = new DateTime($time, new DateTimeZone('UTC'));
+		$date->setTimezone(new DateTimeZone(date_default_timezone_get()));
+		$expected = $date->format('Y-m-d H:i:s');
+		$this->assertEquals($expected, $result);
+
+		$time = '2002-01-01 05:15:30';
+		$result = $this->Time->toServer($time, 'America/New_York');
+		$date = new DateTime($time, new DateTimeZone('America/New_York'));
+		$date->setTimezone(new DateTimeZone(date_default_timezone_get()));
+		$expected = $date->format('Y-m-d H:i:s');
+		$this->assertEquals($expected, $result);
+
+		$time = '2010-01-28T15:00:00+10:00';
+		$result = $this->Time->toServer($time, 'America/New_York');
+		$date = new DateTime($time);
+		$date->setTimezone(new DateTimeZone(date_default_timezone_get()));
+		$expected = $date->format('Y-m-d H:i:s');
+		$this->assertEquals($expected, $result);
+
+		$date = new DateTime(null, new DateTimeZone('America/New_York'));
+		$result = $this->Time->toServer($date, 'Pacific/Tahiti');
+		$date->setTimezone(new DateTimeZone(date_default_timezone_get()));
+		$expected = $date->format('Y-m-d H:i:s');
+		$this->assertEquals($expected, $result);
+
+		$this->_restoreSystemTimezone();
+
+		$time = time();
+		$result = $this->Time->toServer($time, null, 'l jS \of F Y h:i:s A');
+		$expected = date('l jS \of F Y h:i:s A', $time);
+		$this->assertEquals($expected, $result);
+
+		$this->assertFalse($this->Time->toServer(time(), new Object()));
+
 		date_default_timezone_set('UTC');
 
 		$serverTime = new DateTime('now');
@@ -433,6 +481,14 @@ class CakeTimeTest extends CakeTestCase {
 			$this->assertEquals($serverTime->format('U'), $result + $tz->getOffset($serverTime));
 		}
 
+		date_default_timezone_set('UTC');
+		$date = new DateTime('now', new DateTimeZone('America/New_York'));
+
+		$result = $this->Time->toServer($date, null, 'Y-m-d H:i:s');
+		$date->setTimezone($this->Time->timezone());
+		$expected = $date->format('Y-m-d H:i:s');
+		$this->assertEquals($expected, $result);
+
 		$this->_restoreSystemTimezone();
 	}
 
@@ -756,6 +812,32 @@ class CakeTimeTest extends CakeTestCase {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * test fromString() with a DateTime object as the dateString
+ *
+ * @return void
+ */
+	public function testFromStringWithDateTime() {
+		date_default_timezone_set('UTC');
+
+		$date = new DateTime('+1 hour', new DateTimeZone('America/New_York'));
+		$result = $this->Time->fromString($date, 'UTC');
+		$date->setTimezone(new DateTimeZone('UTC'));
+		$expected = $date->format('U') + $date->getOffset();
+
+		$this->assertEquals($expected, $result);
+
+		date_default_timezone_set('Australia/Melbourne');
+
+		$date = new DateTime('+1 hour', new DateTimeZone('America/New_York'));
+		$result = $this->Time->fromString($date, 'Asia/Kuwait');
+		$date->setTimezone(new DateTimeZone('Asia/Kuwait'));
+		$expected = $date->format('U') + $date->getOffset();
+		$this->assertEquals($expected, $result);
+
+		$this->_restoreSystemTimezone();
+	}
+
 /**
  * test converting time specifiers using a time definition localfe file
  *
diff --git a/lib/Cake/Utility/CakeTime.php b/lib/Cake/Utility/CakeTime.php
index 2c78505bc..912507705 100644
--- a/lib/Cake/Utility/CakeTime.php
+++ b/lib/Cake/Utility/CakeTime.php
@@ -238,7 +238,7 @@ class CakeTime {
  * Converts given time (in server's time zone) to user's local time, given his/her timezone.
  *
  * @param string $serverTime UNIX timestamp
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return integer UNIX timestamp
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -262,7 +262,7 @@ class CakeTime {
 /**
  * Returns a timezone object from a string or the user's timezone object
  *
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * 	If null it tries to get timezone from 'Config.timezone' config var
  * @return DateTimeZone Timezone object
  */
@@ -302,8 +302,8 @@ class CakeTime {
 /**
  * Returns a UNIX timestamp, given either a UNIX timestamp or a valid strtotime() date string.
  *
- * @param string $dateString Datetime string
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Parsed timestamp
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -314,6 +314,9 @@ class CakeTime {
 
 		if (is_integer($dateString) || is_numeric($dateString)) {
 			$date = intval($dateString);
+		} elseif (is_object($dateString) && $dateString instanceof DateTime) {
+			$dateString->setTimezone(new DateTimeZone(date_default_timezone_get()));
+			$date = (int)$dateString->format('U') + $dateString->getOffset();
 		} else {
 			$date = strtotime($dateString);
 		}
@@ -337,8 +340,8 @@ class CakeTime {
  * See http://php.net/manual/en/function.strftime.php for information on formatting
  * using locale strings.
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @param string $format The format to use. If null, `TimeHelper::$niceFormat` is used
  * @return string Formatted date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
@@ -366,8 +369,8 @@ class CakeTime {
  * If $dateString's year is the current year, the returned string does not
  * include mention of the year.
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Described, relative date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -410,10 +413,10 @@ class CakeTime {
 /**
  * Returns a partial SQL string to search for all records between two dates.
  *
- * @param string $begin Datetime string or Unix timestamp
- * @param string $end Datetime string or Unix timestamp
+ * @param int|string|DateTime $begin UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $end UNIX timestamp, strtotime() valid string or DateTime object
  * @param string $fieldName Name of database field to compare with
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Partial SQL string.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -430,9 +433,9 @@ class CakeTime {
  * Returns a partial SQL string to search for all records between two times
  * occurring on the same day.
  *
- * @param string $dateString Datetime string or Unix timestamp
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string $fieldName Name of database field to compare with
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Partial SQL string.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -443,8 +446,8 @@ class CakeTime {
 /**
  * Returns true if given datetime string is today.
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return boolean True if datetime string is today
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
@@ -456,8 +459,8 @@ class CakeTime {
 /**
  * Returns true if given datetime string is within this week.
  *
- * @param string $dateString
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return boolean True if datetime string is within current week
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
@@ -468,8 +471,8 @@ class CakeTime {
 
 /**
  * Returns true if given datetime string is within this month
- * @param string $dateString
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return boolean True if datetime string is within current month
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
@@ -481,8 +484,8 @@ class CakeTime {
 /**
  * Returns true if given datetime string is within current year.
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return boolean True if datetime string is within current year
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
@@ -494,8 +497,8 @@ class CakeTime {
 /**
  * Returns true if given datetime string was yesterday.
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return boolean True if datetime string was yesterday
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  *
@@ -508,8 +511,8 @@ class CakeTime {
 /**
  * Returns true if given datetime string is tomorrow.
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return boolean True if datetime string was yesterday
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
@@ -521,7 +524,7 @@ class CakeTime {
 /**
  * Returns the quarter
  *
- * @param string $dateString
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param boolean $range if true returns a range in Y-m-d format
  * @return mixed 1, 2, 3, or 4 quarter of year or array if $range true
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
@@ -557,9 +560,9 @@ class CakeTime {
 
 /**
  * Returns a UNIX timestamp from a textual datetime description. Wrapper for PHP function strtotime().
- *
- * @param string $dateString Datetime string to be represented as a Unix timestamp
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * 
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return integer Unix timestamp
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -570,26 +573,46 @@ class CakeTime {
 /**
  * Returns a formatted date in server's timezone.
  *
- * @param string $dateString Datetime string
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * If a DateTime object is given or the dateString has a timezone
+ * segment, the timezone parameter will be ignored.
+ *
+ * If no timezone parameter is given and no DateTime object, the passed $dateString will be
+ * considered to be in the UTC timezone.
+ *
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @param string $format date format string
  * @return mixed Formatted date
  */
 	public static function toServer($dateString, $timezone = null, $format = 'Y-m-d H:i:s') {
-		$timezone = self::timezone($timezone);
-		$time = new DateTime($dateString, $timezone);
-		$serverTimezone = date_default_timezone_get();
-		if ($serverTimezone !== $timezone->getName()) {
-			$time->setTimezone(new DateTimeZone($serverTimezone));
+		if ($timezone === null) {
+			$timezone = new DateTimeZone('UTC');
+		} elseif (is_string($timezone)) {
+			$timezone = new DateTimeZone($timezone);
+		} elseif (!($timezone instanceof DateTimeZone)) {
+			return false;
 		}
-		return $time->format($format);
+
+		if ($dateString instanceof DateTime) {
+			$date = $dateString;
+		} elseif (is_integer($dateString) || is_numeric($dateString)) {
+			$dateString = (int)$dateString;
+
+			$date = new DateTime('@' . $dateString);
+			$date->setTimezone($timezone);
+		} else {
+			$date = new DateTime($dateString, $timezone);
+		}
+
+		$date->setTimezone(new DateTimeZone(date_default_timezone_get()));
+		return $date->format($format);
 	}
 
 /**
  * Returns a date formatted for Atom RSS feeds.
  *
  * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Formatted date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -601,8 +624,8 @@ class CakeTime {
 /**
  * Formats date for RSS feeds
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Formatted date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -664,7 +687,7 @@ class CakeTime {
  *
  * NOTE: If the difference is one week or more, the lowest level of accuracy is day
  *
- * @param string $dateTime Datetime string or Unix timestamp
+ * @param int|string|DateTime $dateTime Datetime UNIX timestamp, strtotime() valid string or DateTime object
  * @param array $options Default format if timestamp is used in $dateString
  * @return string Relative time string.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
@@ -833,8 +856,8 @@ class CakeTime {
  *
  * @param mixed $timeInterval the numeric value with space then time type.
  *    Example of valid types: 6 hours, 2 days, 1 minute.
- * @param mixed $dateString the datestring or unix timestamp to compare
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return boolean
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
@@ -858,8 +881,8 @@ class CakeTime {
  *
  * @param mixed $timeInterval the numeric value with space then time type.
  *    Example of valid types: 6 hours, 2 days, 1 minute.
- * @param mixed $dateString the datestring or unix timestamp to compare
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return boolean
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
@@ -881,22 +904,22 @@ class CakeTime {
 /**
  * Returns gmt as a UNIX timestamp.
  *
- * @param string $string UNIX timestamp or a valid strtotime() date string
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @return integer UNIX timestamp
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
-	public static function gmt($string = null) {
-		if ($string != null) {
-			$string = self::fromString($string);
+	public static function gmt($dateString = null) {
+		if ($dateString != null) {
+			$time = self::fromString($dateString);
 		} else {
-			$string = time();
+			$time = time();
 		}
-		$hour = intval(date("G", $string));
-		$minute = intval(date("i", $string));
-		$second = intval(date("s", $string));
-		$month = intval(date("n", $string));
-		$day = intval(date("j", $string));
-		$year = intval(date("Y", $string));
+		$hour = intval(date("G", $time));
+		$minute = intval(date("i", $time));
+		$second = intval(date("s", $time));
+		$month = intval(date("n", $time));
+		$day = intval(date("j", $time));
+		$year = intval(date("Y", $time));
 		return gmmktime($hour, $minute, $second, $month, $day, $year);
 	}
 
@@ -905,10 +928,10 @@ class CakeTime {
  * This function also accepts a time string and a format string as first and second parameters.
  * In that case this function behaves as a wrapper for TimeHelper::i18nFormat()
  *
- * @param string $format date format string (or a DateTime string)
- * @param string $date Datetime string (or a date format string)
+ * @param int|string|DateTime $format date format string (or UNIX timestamp, strtotime() valid string or DateTime object)
+ * @param int|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object (or a date format string)
  * @param boolean $invalid flag to ignore results of fromString == false
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Formatted date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -930,10 +953,10 @@ class CakeTime {
  * Returns a formatted date string, given either a UNIX timestamp or a valid strtotime() date string.
  * It take in account the default date format for the current language if a LC_TIME file is used.
  *
- * @param string $date Datetime string
+ * @param int|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object
  * @param string $format strftime format string.
  * @param boolean $invalid flag to ignore results of fromString == false
- * @param mixed $timezone Timezone string or DateTimeZone object
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Formatted and translated date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
diff --git a/lib/Cake/View/Helper/TimeHelper.php b/lib/Cake/View/Helper/TimeHelper.php
index 0c4042ee0..4d16a599a 100644
--- a/lib/Cake/View/Helper/TimeHelper.php
+++ b/lib/Cake/View/Helper/TimeHelper.php
@@ -158,8 +158,8 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::fromString()
  *
- * @param string $dateString Datetime string
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Parsed timestamp
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -170,8 +170,8 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::nice()
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @param string $format The format to use. If null, `TimeHelper::$niceFormat` is used
  * @return string Formatted date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
@@ -183,8 +183,8 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::niceShort()
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime objectp
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Described, relative date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -195,10 +195,10 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::daysAsSql()
  *
- * @param string $begin Datetime string or Unix timestamp
- * @param string $end Datetime string or Unix timestamp
+ * @param int|string|DateTime $begin UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $end UNIX timestamp, strtotime() valid string or DateTime object
  * @param string $fieldName Name of database field to compare with
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Partial SQL string.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -209,9 +209,9 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::dayAsSql()
  *
- * @param string $dateString Datetime string or Unix timestamp
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string $fieldName Name of database field to compare with
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Partial SQL string.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -222,8 +222,8 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::isToday()
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return boolean True if datetime string is today
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
@@ -234,8 +234,8 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::isThisWeek()
  *
- * @param string $dateString
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return boolean True if datetime string is within current week
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
@@ -246,8 +246,8 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::isThisMonth()
  *
- * @param string $dateString
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return boolean True if datetime string is within current month
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
@@ -258,8 +258,8 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::isThisYear()
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return boolean True if datetime string is within current year
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
@@ -270,8 +270,8 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::wasYesterday()
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return boolean True if datetime string was yesterday
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  *
@@ -283,8 +283,8 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::isTomorrow()
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return boolean True if datetime string was yesterday
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
@@ -295,7 +295,7 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::toQuarter()
  *
- * @param string $dateString
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param boolean $range if true returns a range in Y-m-d format
  * @return mixed 1, 2, 3, or 4 quarter of year or array if $range true
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
@@ -307,8 +307,8 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::toUnix()
  *
- * @param string $dateString Datetime string to be represented as a Unix timestamp
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return integer Unix timestamp
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -319,8 +319,8 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::toAtom()
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Formatted date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -331,8 +331,8 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::toRSS()
  *
- * @param string $dateString Datetime string or Unix timestamp
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Formatted date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -351,7 +351,7 @@ class TimeHelper extends AppHelper {
  *   - `class` - The classname to use, defaults to `time-ago-in-words`.
  *   - `title` - Defaults to the $dateTime input.
  *
- * @param string $dateTime Datetime string or Unix timestamp
+ * @param int|string|DateTime $dateTime UNIX timestamp, strtotime() valid string or DateTime object
  * @param array $options Default format if timestamp is used in $dateString
  * @return string Relative time string.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
@@ -393,8 +393,8 @@ class TimeHelper extends AppHelper {
  *
  * @param mixed $timeInterval the numeric value with space then time type.
  *    Example of valid types: 6 hours, 2 days, 1 minute.
- * @param mixed $dateString the datestring or unix timestamp to compare
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return boolean
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
@@ -407,8 +407,8 @@ class TimeHelper extends AppHelper {
  *
  * @param mixed $timeInterval the numeric value with space then time type.
  *    Example of valid types: 6 hours, 2 days, 1 minute.
- * @param mixed $dateString the datestring or unix timestamp to compare
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return boolean
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
@@ -419,7 +419,7 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::gmt()
  *
- * @param string $string UNIX timestamp or a valid strtotime() date string
+ * @param int|string|DateTime $string UNIX timestamp, strtotime() valid string or DateTime object
  * @return integer UNIX timestamp
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -430,10 +430,10 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::format()
  *
- * @param string $format date format string (or a DateTime string)
- * @param string $date Datetime string (or a date format string)
+ * @param int|string|DateTime $format date format string (or a UNIX timestamp, strtotime() valid string or DateTime object)
+ * @param int|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object (or a date format string)
  * @param boolean $invalid flag to ignore results of fromString == false
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Formatted date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
@@ -444,10 +444,10 @@ class TimeHelper extends AppHelper {
 /**
  * @see CakeTime::i18nFormat()
  *
- * @param string $date Datetime string
+ * @param int|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object
  * @param string $format strftime format string.
  * @param boolean $invalid flag to ignore results of fromString == false
- * @param mixed $timezone User's timezone string or DateTimeZone object
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Formatted and translated date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */