Skip to content

Commit 202d35d

Browse files
Merge branch '5.4' into 6.0
* 5.4: (21 commits) Backport type fixes [Messenger] Added StopWorkerException [Workflown] Add support for getting updated context after a transition Fix CS fix annot Backport type fixes Fix CS Avoid triggering the autoloader in Deprecation::isLegacy() fix markdown markup Backport type fixes [TwigBundle] Improve comment on error silencing [SecurityBundle] Fix wrongly inverted condition [Notifier] Add MessageMedia Bridge uzb translation [DependencyInjection] Fix doc blocks [DependencyInjection] Turn $defaultDeprecationTemplate into a constant [SecurityBundle] Hide Security item if no firewall matched [GHA] restore phpunit-bridge job rethrow caught exception [Form] better form doc types to support static analysis ...
2 parents ac9bf1a + 23cbd3a commit 202d35d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Languages.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public static function getAlpha3Name(string $language, string $displayLocale = n
159159
*
160160
* @return string[]
161161
*/
162-
public static function getAlpha3Names(?string $displayLocale = null): array
162+
public static function getAlpha3Names(string $displayLocale = null): array
163163
{
164164
$alpha2Names = self::getNames($displayLocale);
165165
$alpha3Names = [];

Locales.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static function getName(string $locale, string $displayLocale = null): st
6767
/**
6868
* @return string[]
6969
*/
70-
public static function getNames(?string $displayLocale = null): array
70+
public static function getNames(string $displayLocale = null): array
7171
{
7272
return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
7373
}

Scripts.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static function getName(string $script, string $displayLocale = null): st
5151
/**
5252
* @return string[]
5353
*/
54-
public static function getNames(?string $displayLocale = null): array
54+
public static function getNames(string $displayLocale = null): array
5555
{
5656
return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
5757
}

0 commit comments

Comments
 (0)