Merge pull request #2335 from dlondero/issue-2335

Pass offset instead of timeZoneName to IntlDateFormatter
cargomedia · Sep 16, 2016 · 2ffeda2 · 2ffeda2
2 parents dd6b79a + cbe7150
commit 2ffeda2
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/library/CM/Frontend/Render.php b/library/CM/Frontend/Render.php
@@ -393,6 +393,7 @@ public function clearTemplates() {
      * @param string|null       $pattern
      * @param DateTimeZone|null $timeZone
      * @return IntlDateFormatter
+     * @throws CM_Exception
      */
     public function getFormatterDate($dateType, $timeType, $pattern = null, DateTimeZone $timeZone = null) {
         if (null === $timeZone) {
@@ -402,7 +403,18 @@ public function getFormatterDate($dateType, $timeType, $pattern = null, DateTime
         if (in_array(substr($timeZoneName, 0, 1), ['+', '-'])) {
             $timeZoneName = 'GMT' . $timeZoneName;
         }
-        return new IntlDateFormatter($this->getLocale(), $dateType, $timeType, $timeZoneName, null, $pattern);
+
+        $formatter = new IntlDateFormatter($this->getLocale(), $dateType, $timeType, $timeZoneName, null, $pattern);
+        if (null === $formatter) {
+            throw new CM_Exception('Cannot create date formatter', null, [
+                'locale'       => $this->getLocale(),
+                'dateType'     => $dateType,
+                'timeType'     => $timeType,
+                'timeZoneName' => $timeZoneName,
+                'pattern'      => $pattern,
+            ]);
+        }
+        return $formatter;
     }
 
     /**

diff --git a/library/CM/Model/Location.php b/library/CM/Model/Location.php
@@ -124,7 +124,10 @@ public function getTimeZone() {
         if (null === $pointCurrent) {
             return null;
         }
-        $timezoneNameList = DateTimeZone::listIdentifiers();
+        $timezoneNameList = \Functional\reject(DateTimeZone::listIdentifiers(), function ($timeZoneName) {
+            return null === IntlTimeZone::fromDateTimeZone(new DateTimeZone($timeZoneName));
+        });
+
         $distanceList = Functional\map($timezoneNameList, function ($timezoneName) use ($pointCurrent) {
             $timezoneLocation = (new DateTimeZone($timezoneName))->getLocation();
             $pointTimeZone = new CM_Geo_Point($timezoneLocation['latitude'], $timezoneLocation['longitude']);

diff --git a/tests/library/CM/Frontend/RenderTest.php b/tests/library/CM/Frontend/RenderTest.php
@@ -276,6 +276,24 @@ public function testGetFormatterDateNumericalOverrideTimeZone() {
         }
     }
 
+    public function testGetFormatterDateException() {
+        $timezoneNameList = \Functional\reject(DateTimeZone::listIdentifiers(), function ($timeZoneName) {
+            return IntlTimeZone::fromDateTimeZone(new DateTimeZone($timeZoneName));
+        });
+        if (empty($timezoneNameList)) {
+            $this->markTestSkipped('No unsupported timezones');
+        }
+
+        try {
+            $timeZoneName = \Functional\first($timezoneNameList);
+            $render = new CM_Frontend_Render();
+            $render->getFormatterDate(IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, null, new DateTimeZone($timeZoneName));
+            $this->fail('Date formatter created with unsupported timezone');
+        } catch (CM_Exception $ex) {
+            $this->assertSame('Cannot create date formatter', $ex->getMessage());
+        }
+    }
+
     public function testGetLayoutPath() {
         $render = new CM_Frontend_Render();
         $this->assertSame(