File tree Expand file tree Collapse file tree 2 files changed +14
-0
lines changed
src/Symfony/Component/Intl Expand file tree Collapse file tree 2 files changed +14
-0
lines changed Original file line number Diff line number Diff line change @@ -69,6 +69,11 @@ public static function getFallback(string $locale): ?string
69
69
{
70
70
if (\function_exists ('locale_parse ' )) {
71
71
$ localeSubTags = locale_parse ($ locale );
72
+
73
+ if (null === $ localeSubTags ) {
74
+ return null ;
75
+ }
76
+
72
77
if (1 === \count ($ localeSubTags )) {
73
78
if ('root ' !== self ::$ defaultFallback && self ::$ defaultFallback === $ localeSubTags ['language ' ]) {
74
79
return 'root ' ;
Original file line number Diff line number Diff line change @@ -70,4 +70,13 @@ public function testDefaultRootFallback()
70
70
71
71
Locale::setDefaultFallback ($ prev );
72
72
}
73
+
74
+ public function testGetFallbackLongLocale ()
75
+ {
76
+ $ longLocale = 'LC_TYPE=fr_FR.UTF-8;LC_NUMERIC=C;LC_TIME=fr_FR.UTF-8;LC_COLLATE=fr_FR.UTF-8; '
77
+ . 'LC_MONETARY=fr_FR.UTF-8;LC_MESSAGES=fr_FR.UTF-8;LC_PAPER=fr_FR.UTF-8;LC_NAME=fr_FR.UTF-8; '
78
+ . 'LC_ADDRESS=fr_FR.UTF-8;LC_TELEPHONE=fr_FR.UTF-8;LC_MEASUREMENT=fr_FR.UTF-8;LC_IDENTIFICATION=fr_FR.UTF-8 ' ;
79
+
80
+ $ this ->assertNull (Locale::getFallback ($ longLocale ));
81
+ }
73
82
}
You can’t perform that action at this time.
0 commit comments