Merge branch '5.2' into 5.3

* 5.2:
  Backport type fixes
  Fix CS
  Avoid triggering the autoloader in Deprecation::isLegacy()
  fix markdown markup
  Backport type fixes
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [Form] better form doc types to support static analysis

Author: nicolas-grekas

Countries.php

@@ -109,7 +109,7 @@ public static function getAlpha3Name(string $alpha3Code, string $displayLocale =
      *
      * @return string[]
      */
-    public static function getNames($displayLocale = null): array
+    public static function getNames(?string $displayLocale = null): array
     {
         return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
     }
@@ -121,7 +121,7 @@ public static function getNames($displayLocale = null): array
      *
      * @return string[]
      */
-    public static function getAlpha3Names($displayLocale = null): array
+    public static function getAlpha3Names(?string $displayLocale = null): array
     {
         $alpha2Names = self::getNames($displayLocale);
         $alpha3Names = [];

Languages.php

@@ -159,7 +159,7 @@ public static function getAlpha3Name(string $language, string $displayLocale = n
      *
      * @return string[]
      */
-    public static function getAlpha3Names($displayLocale = null): array
+    public static function getAlpha3Names(string $displayLocale = null): array
     {
         $alpha2Names = self::getNames($displayLocale);
         $alpha3Names = [];

Locales.php

@@ -67,7 +67,7 @@ public static function getName(string $locale, string $displayLocale = null): st
     /**
      * @return string[]
      */
-    public static function getNames($displayLocale = null): array
+    public static function getNames(string $displayLocale = null): array
     {
         return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
     }

Resources/bin/common.php

@@ -13,35 +13,35 @@
 
 define('LINE', str_repeat('-', LINE_WIDTH)."\n");
 
-function bailout($message)
+function bailout(string $message)
 {
     echo wordwrap($message, LINE_WIDTH)." Aborting.\n";
 
     exit(1);
 }
 
-function strip_minor_versions($version)
+function strip_minor_versions(string $version)
 {
     preg_match('/^(?P<version>[0-9]\.[0-9]|[0-9]{2,})/', $version, $matches);
 
     return $matches['version'];
 }
 
-function centered($text)
+function centered(string $text)
 {
     $padding = (int) ((LINE_WIDTH - strlen($text)) / 2);
 
     return str_repeat(' ', $padding).$text;
 }
 
-function cd($dir)
+function cd(string $dir)
 {
     if (false === chdir($dir)) {
         bailout("Could not switch to directory $dir.");
     }
 }
 
-function run($command)
+function run(string $command)
 {
     exec($command, $output, $status);
 
@@ -53,7 +53,7 @@ function run($command)
     }
 }
 
-function get_icu_version_from_genrb($genrb)
+function get_icu_version_from_genrb(string $genrb)
 {
     exec($genrb.' --version - 2>&1', $output, $status);
 
@@ -70,7 +70,7 @@ function get_icu_version_from_genrb($genrb)
 
 error_reporting(\E_ALL);
 
-set_error_handler(function ($type, $msg, $file, $line) {
+set_error_handler(function (int $type, string $msg, string $file, int $line) {
     throw new \ErrorException($msg, 0, $type, $file, $line);
 });
 

Scripts.php

@@ -51,7 +51,7 @@ public static function getName(string $script, string $displayLocale = null): st
     /**
      * @return string[]
      */
-    public static function getNames($displayLocale = null): array
+    public static function getNames(string $displayLocale = null): array
     {
         return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
     }

Util/IntlTestHelper.php

@@ -30,7 +30,7 @@ class IntlTestHelper
     /**
      * Should be called before tests that work fine with the stub implementation.
      */
-    public static function requireIntl(TestCase $testCase, $minimumIcuVersion = null)
+    public static function requireIntl(TestCase $testCase, string $minimumIcuVersion = null)
     {
         if (null === $minimumIcuVersion) {
             $minimumIcuVersion = Intl::getIcuStubVersion();
@@ -64,7 +64,7 @@ public static function requireIntl(TestCase $testCase, $minimumIcuVersion = null
      * Should be called before tests that require a feature-complete intl
      * implementation.
      */
-    public static function requireFullIntl(TestCase $testCase, $minimumIcuVersion = null)
+    public static function requireFullIntl(TestCase $testCase, string $minimumIcuVersion = null)
     {
         // We only run tests if the intl extension is loaded...
         if (!Intl::isExtensionLoaded()) {