Merge branch '5.4' into 6.0

* 5.4:
  [Validator] Update MIR card scheme
  [Notifier][FakeSms] Do not use switch
  [Mailer][Sendgrid] Add previous exception
  Remove internal from ConstraintViolationAssertion
  Improve phpdoc

Author: derrabus

Countries.php

@@ -107,9 +107,9 @@ public static function getAlpha3Name(string $alpha3Code, string $displayLocale =
     /**
      * Gets the list of country names indexed with alpha2 codes as keys.
      *
-     * @return string[]
+     * @return array<string, string>
      */
-    public static function getNames(?string $displayLocale = null): array
+    public static function getNames(string $displayLocale = null): array
     {
         return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
     }
@@ -119,9 +119,9 @@ public static function getNames(?string $displayLocale = null): array
      *
      * Same as method getNames, but with alpha3 codes instead of alpha2 codes as keys.
      *
-     * @return string[]
+     * @return array<string, string>
      */
-    public static function getAlpha3Names(?string $displayLocale = null): array
+    public static function getAlpha3Names(string $displayLocale = null): array
     {
         $alpha2Names = self::getNames($displayLocale);
         $alpha3Names = [];

Languages.php

@@ -76,7 +76,7 @@ public static function getName(string $language, string $displayLocale = null):
     /**
      * Gets the list of language names indexed with alpha2 codes as keys.
      *
-     * @return string[]
+     * @return array<string, string>
      */
     public static function getNames(string $displayLocale = null): array
     {
@@ -157,7 +157,7 @@ public static function getAlpha3Name(string $language, string $displayLocale = n
      *
      * Same as method getNames, but with ISO 639-2 three-letter codes instead of ISO 639-1 codes as keys.
      *
-     * @return string[]
+     * @return array<string, string>
      */
     public static function getAlpha3Names(string $displayLocale = null): array
     {