bug #18049 [Validator] Fix the locale validator so it treats a locale alias as a valid locale (jakzal)

fabpot · fabpot · commit 35666f05f7ed · 2016-03-08T09:19:01.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Validator] Fix the locale validator so it treats a locale alias as a valid locale | Q | A | ------------- | --- | Branch | 2.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #12583 | License | MIT | Doc PR | - Commits ------- fbb12d8 [Validator] Fix the locale validator so it treats a locale alias as a valid locale
diff --git a/src/Symfony/Component/Validator/Constraints/LocaleValidator.php b/src/Symfony/Component/Validator/Constraints/LocaleValidator.php
@@ -38,8 +38,9 @@ public function validate($value, Constraint $constraint)
 
         $value = (string) $value;
         $locales = Intl::getLocaleBundle()->getLocaleNames();
+        $aliases = Intl::getLocaleBundle()->getAliases();
 
-        if (!isset($locales[$value])) {
+        if (!isset($locales[$value]) && !in_array($value, $aliases)) {
             $this->context->addViolation($constraint->message, array(
                 '{{ value }}' => $this->formatValue($value),
             ));
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php
@@ -61,6 +61,7 @@ public function getValidLocales()
             array('pt'),
             array('pt_PT'),
             array('zh_Hans'),
+            array('fil_PH'),
         );
     }
 
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
@@ -22,7 +22,7 @@
     "require-dev": {
         "doctrine/common": "~2.3",
         "symfony/http-foundation": "~2.1",
-        "symfony/intl": "~2.3",
+        "symfony/intl": "^2.3.21",
         "symfony/yaml": "~2.0,>=2.0.5",
         "symfony/config": "~2.2"
     },

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ public function getValidLocales()`
`61`	`61`	`array('pt'),`
`62`	`62`	`array('pt_PT'),`
`63`	`63`	`array('zh_Hans'),`
	`64`	`+ array('fil_PH'),`
`64`	`65`	`);`
`65`	`66`	`}`
`66`	`67`