[Intl][Validator] Handle alias locales/timezones

Author: ro0NL

Constraints/LocaleValidator.php

@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-use Symfony\Component\Intl\Intl;
 use Symfony\Component\Intl\Locales;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\LogicException;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
@@ -42,13 +42,17 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedValueException($value, 'string');
         }
 
+        if (!class_exists(Locales::class)) {
+            throw new LogicException('The "symfony/intl" component is required to use the Locale constraint.');
+        }
+
         $inputValue = (string) $value;
         $value = $inputValue;
         if ($constraint->canonicalize) {
             $value = \Locale::canonicalize($value);
         }
 
-        if (!Locales::exists($value) && !\in_array($value, Locales::getAliases(), true)) {
+        if (!Locales::exists($value)) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($inputValue))
                 ->setCode(Locale::NO_SUCH_LOCALE_ERROR)

Constraints/TimezoneValidator.php

@@ -54,19 +54,10 @@ public function validate($value, Constraint $constraint)
             return;
         }
 
-        if ($constraint->countryCode) {
-            $phpTimezoneIds = @\DateTimeZone::listIdentifiers($constraint->zone, $constraint->countryCode) ?: [];
-            try {
-                $intlTimezoneIds = Timezones::forCountryCode($constraint->countryCode);
-            } catch (MissingResourceException $e) {
-                $intlTimezoneIds = [];
-            }
-        } else {
-            $phpTimezoneIds = \DateTimeZone::listIdentifiers($constraint->zone);
-            $intlTimezoneIds = self::getIntlTimezones($constraint->zone);
-        }
-
-        if (\in_array($value, $phpTimezoneIds, true) || \in_array($value, $intlTimezoneIds, true)) {
+        if (
+            \in_array($value, self::getPhpTimezones($constraint->zone, $constraint->countryCode), true) ||
+            \in_array($value, self::getIntlTimezones($constraint->zone, $constraint->countryCode), true)
+        ) {
             return;
         }
 
@@ -106,8 +97,29 @@ protected function formatValue($value, $format = 0)
         return array_search($value, (new \ReflectionClass(\DateTimeZone::class))->getConstants(), true) ?: $value;
     }
 
-    private static function getIntlTimezones(int $zone): array
+    private static function getPhpTimezones(int $zone, string $countryCode = null): array
     {
+        if (null !== $countryCode) {
+            return @\DateTimeZone::listIdentifiers($zone, $countryCode) ?: [];
+        }
+
+        return \DateTimeZone::listIdentifiers($zone);
+    }
+
+    private static function getIntlTimezones(int $zone, string $countryCode = null): array
+    {
+        if (!class_exists(Timezones::class)) {
+            return [];
+        }
+
+        if (null !== $countryCode) {
+            try {
+                return Timezones::forCountryCode($countryCode);
+            } catch (MissingResourceException $e) {
+                return [];
+            }
+        }
+
         $timezones = Timezones::getIds();
 
         if (\DateTimeZone::ALL === (\DateTimeZone::ALL & $zone)) {

Tests/Constraints/LocaleValidatorTest.php

@@ -111,7 +111,8 @@ public function getValidLocales()
             ['pt', ['canonicalize' => true]],
             ['pt_PT', ['canonicalize' => true]],
             ['zh_Hans', ['canonicalize' => true]],
-            ['fil_PH', ['canonicalize' => true]],
+            ['tl_PH', ['canonicalize' => true]],
+            ['fil_PH', ['canonicalize' => true]], // alias for "tl_PH"
         ];
     }