bug #60888 [Intl] Fix locale validator when canonicalize is true (rdavaillaud)

nicolas-grekas · nicolas-grekas · commit c6f3da1038bd · 2025-06-26T09:25:51.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [Intl] Fix locale validator when canonicalize is true | Q | A | ------------- | --- | Branch? | 6.4,7.x | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT When canonicalize is set to true, and the value passed to the validator is not a valid locale, ext-intl Locale::canonicalize should return null. This is not the case with ICU <76, and this method returns an empty string. But with the latest ICU lib, this method really returns null. The problem is with `Locales::exists()` which only accept non null string. This commit handles the returned null value in the validator. Commits ------- fd5b24b [Intl] Fix locale validator when canonicalize is true
diff --git a/src/Symfony/Component/Validator/Constraints/LocaleValidator.php b/src/Symfony/Component/Validator/Constraints/LocaleValidator.php
@@ -47,7 +47,7 @@ public function validate(mixed $value, Constraint $constraint)
             $value = \Locale::canonicalize($value);
         }
 
-        if (!Locales::exists($value)) {
+        if (null === $value || !Locales::exists($value)) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($inputValue))
                 ->setCode(Locale::NO_SUCH_LOCALE_ERROR)
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php
@@ -91,6 +91,21 @@ public static function getInvalidLocales()
         ];
     }
 
+    public function testTooLongLocale()
+    {
+        $constraint = new Locale([
+            'message' => 'myMessage',
+        ]);
+
+        $locale = str_repeat('a', (\defined('INTL_MAX_LOCALE_LEN') ? \INTL_MAX_LOCALE_LEN : 85) + 1);
+        $this->validator->validate($locale, $constraint);
+
+        $this->buildViolation('myMessage')
+            ->setParameter('{{ value }}', '"' . $locale . '"')
+            ->setCode(Locale::NO_SUCH_LOCALE_ERROR)
+            ->assertRaised();
+    }
+
     /**
      * @dataProvider getUncanonicalizedLocales
      */

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function validate(mixed $value, Constraint $constraint)`
`47`	`47`	`$value = \Locale::canonicalize($value);`
`48`	`48`	`}`
`49`	`49`
`50`		`- if (!Locales::exists($value)) {`
	`50`	`+ if (null === $value \|\| !Locales::exists($value)) {`
`51`	`51`	`$this->context->buildViolation($constraint->message)`
`52`	`52`	`->setParameter('{{ value }}', $this->formatValue($inputValue))`
`53`	`53`	`->setCode(Locale::NO_SUCH_LOCALE_ERROR)`