Added from()

ICanBoogie · Sep 3, 2013 · dd66267 · dd66267
1 parent 70aa3c5
commit dd66267
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 1 deletion.
diff --git a/lib/timezone.php b/lib/timezone.php
@@ -87,7 +87,7 @@ public function __get($property)
 
 				if (!$this->location)
 				{
-					$this->location = new TimeZoneLocation($this->getLocation());
+					$this->location = TimeZoneLocation::from($this);
 				}
 
 				return $this->location;

diff --git a/lib/timezonelocation.php b/lib/timezonelocation.php
@@ -37,6 +37,27 @@
  */
 class TimeZoneLocation
 {
+	static private $cache;
+
+	/**
+	 * Creates an instance from a {@link \DateTimeZone} instance.
+	 *
+	 * @param \DateTimeZone $zone
+	 *
+	 * @return \ICanBoogie\TimeZoneLocation
+	 */
+	static public function from(\DateTimeZone $zone)
+	{
+		$hash = spl_object_hash($zone);
+
+		if (empty(self::$cache[$hash]))
+		{
+			self::$cache[$hash] = new static($zone->getLocation());
+		}
+
+		return self::$cache[$hash];
+	}
+
 	private $location;
 
 	/**

diff --git a/tests/TimeZoneLocationTest.php b/tests/TimeZoneLocationTest.php
@@ -15,6 +15,23 @@
 
 class TimeZoneLocationTest extends \PHPUnit_Framework_TestCase
 {
+	public function test_from()
+	{
+		$zone = new \DateTimeZone('Europe/Paris');
+		$location = TimeZoneLocation::from($zone);
+
+		$this->assertInstanceOf('ICanBoogie\TimeZoneLocation', $location);
+	}
+
+	public function test_from_cache()
+	{
+		$zone = new \DateTimeZone('Europe/Paris');
+		$location = TimeZoneLocation::from($zone);
+		$cached = TimeZoneLocation::from($zone);
+
+		$this->assertEquals(spl_object_hash($location), spl_object_hash($cached));
+	}
+
 	public function test_location()
 	{
 		$zone = new \DateTimeZone('Europe/Paris');