CakeTime functions can now use timezone string or DateTimeZone object…

… for user offsets. (Passing numeric offsets has been kept for BC)
cakephp · Apr 21, 2012 · d34f0c2 · d34f0c2
1 parent 287c657
commit d34f0c2
Show file tree

Hide file tree

Showing 3 changed files with 156 additions and 123 deletions.
diff --git a/lib/Cake/Test/Case/Utility/CakeTimeTest.php b/lib/Cake/Test/Case/Utility/CakeTimeTest.php
@@ -418,6 +418,7 @@ public function testToRss() {
 				$yourTime = new DateTime('now', $yourTimezone);
 				$userOffset = $yourTimezone->getOffset($yourTime) / HOUR;
 				$this->assertEquals($yourTime->format('r'), $this->Time->toRss(time(), $userOffset));
+				$this->assertEquals($yourTime->format('r'), $this->Time->toRss(time(), $timezone));
 			}
 		}
 	}
@@ -623,6 +624,12 @@ public function testUserOffset() {
 		$expected = time();
 		$result = $this->Time->fromString(time(), $yourTimezone);
 		$this->assertEquals($expected, $result);
+
+		$result = $this->Time->fromString(time(), $timezoneServer->getName());
+		$this->assertEquals($expected, $result);
+
+		$result = $this->Time->fromString(time(), $timezoneServer);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -645,6 +652,11 @@ public function testFromString() {
 		$result = $this->Time->fromString('+1 hour', $timezone);
 		$expected = $this->Time->convert(strtotime('+1 hour'), $timezone);
 		$this->assertEquals($expected, $result);
+
+		$timezone = date_default_timezone_get();
+		$result = $this->Time->fromString('+1 hour', $timezone);
+		$expected = $this->Time->convert(strtotime('+1 hour'), $timezone);
+		$this->assertEquals($expected, $result);
 	}
 
 /**