[Intl][Validator] Handle alias locales/timezones

Author: ro0NL

Locales.php

@@ -44,7 +44,7 @@ public static function exists(string $locale): bool
 
             return true;
         } catch (MissingResourceException $e) {
-            return false;
+            return \in_array($locale, self::getAliases(), true);
         }
     }
 
@@ -53,7 +53,15 @@ public static function exists(string $locale): bool
      */
     public static function getName(string $locale, string $displayLocale = null): string
     {
-        return self::readEntry(['Names', $locale], $displayLocale);
+        try {
+            return self::readEntry(['Names', $locale], $displayLocale);
+        } catch (MissingResourceException $e) {
+            if (false === $aliased = array_search($locale, self::getAliases(), true)) {
+                throw $e;
+            }
+
+            return self::readEntry(['Names', $aliased], $displayLocale);
+        }
     }
 
     /**

Tests/LocalesTest.php

@@ -93,9 +93,16 @@ public function testGetNameWithInvalidLocale()
         Locales::getName('foo');
     }
 
+    public function testGetNameWithAliasLocale()
+    {
+        $this->assertSame(Locales::getName('tl_PH'), Locales::getName('fil_PH'));
+    }
+
     public function testExists()
     {
         $this->assertTrue(Locales::exists('nl_NL'));
+        $this->assertTrue(Locales::exists('tl_PH'));
+        $this->assertTrue(Locales::exists('fil_PH')); // alias for "tl_PH"
         $this->assertFalse(Locales::exists('zxx_ZZ'));
     }
 }

Tests/TimezonesTest.php

@@ -530,14 +530,23 @@ public function testGetNameDefaultLocale()
     /**
      * @expectedException \Symfony\Component\Intl\Exception\MissingResourceException
      */
-    public function testGetNameWithInvalidTimezoneId()
+    public function testGetNameWithInvalidTimezone()
     {
         Timezones::getName('foo');
     }
 
+    /**
+     * @expectedException \Symfony\Component\Intl\Exception\MissingResourceException
+     */
+    public function testGetNameWithAliasTimezone()
+    {
+        Timezones::getName('US/Pacific'); // alias in icu (not compiled), name unavailable in php
+    }
+
     public function testExists()
     {
         $this->assertTrue(Timezones::exists('Europe/Amsterdam'));
+        $this->assertTrue(Timezones::exists('US/Pacific')); // alias in icu (not compiled), identifier available in php
         $this->assertFalse(Timezones::exists('Etc/Unknown'));
     }
 
@@ -547,6 +556,9 @@ public function testGetRawOffset()
         $this->assertSame(0, Timezones::getRawOffset('Etc/UTC'));
         $this->assertSame(-10800, Timezones::getRawOffset('America/Buenos_Aires'));
         $this->assertSame(20700, Timezones::getRawOffset('Asia/Katmandu'));
+
+        // ensure we support identifiers available in php (not compiled from icu)
+        Timezones::getRawOffset('US/Pacific');
     }
 
     /**

Timezones.php

@@ -36,12 +36,18 @@ public static function exists(string $timezone): bool
 
             return true;
         } catch (MissingResourceException $e) {
-            return false;
+            try {
+                new \DateTimeZone($timezone);
+
+                return true;
+            } catch (\Exception $e) {
+                return false;
+            }
         }
     }
 
     /**
-     * @throws MissingResourceException if the timezone identifier does not exists
+     * @throws MissingResourceException if the timezone identifier does not exist or is an alias
      */
     public static function getName(string $timezone, string $displayLocale = null): string
     {
@@ -57,7 +63,7 @@ public static function getNames(string $displayLocale = null): array
     }
 
     /**
-     * @throws \Exception       if the timezone identifier does not exists
+     * @throws \Exception       if the timezone identifier does not exist
      * @throws RuntimeException if there's no timezone DST transition information available
      */
     public static function getRawOffset(string $timezone, int $timestamp = null): int
@@ -92,7 +98,7 @@ public static function getCountryCode(string $timezone): string
     }
 
     /**
-     * @throws MissingResourceException if the country code does not exists
+     * @throws MissingResourceException if the country code does not exist
      */
     public static function forCountryCode(string $country): array
     {