Merge branch '5.4' into 6.0

* 5.4:
  [Serializer] cs fix
  Cleanup more `@return` annotations
  [Form] Fix phpdoc on FormBuilderInterface

Author: nicolas-grekas

Countries.php

@@ -31,7 +31,7 @@ final class Countries extends ResourceBundle
      *
      * This list only contains "officially assigned ISO 3166-1 alpha-2" country codes.
      *
-     * @return string[] an array of canonical ISO 3166 alpha-2 country codes
+     * @return string[]
      */
     public static function getCountryCodes(): array
     {
@@ -45,7 +45,7 @@ public static function getCountryCodes(): array
      *
      * This list only contains "officially assigned ISO 3166-1 alpha-3" country codes.
      *
-     * @return string[] an array of canonical ISO 3166 alpha-3 country codes
+     * @return string[]
      */
     public static function getAlpha3Codes(): array
     {

Data/Generator/GeneratorConfig.php

@@ -57,8 +57,6 @@ public function getBundleWriters(): array
     /**
      * Returns the directory where the source versions of the resource bundles
      * are stored.
-     *
-     * @return string An absolute path to a directory
      */
     public function getSourceDir(): string
     {
@@ -67,8 +65,6 @@ public function getSourceDir(): string
 
     /**
      * Returns the ICU version of the bundles being converted.
-     *
-     * @return string The ICU version string
      */
     public function getIcuVersion(): string
     {

Intl.php

@@ -66,8 +66,6 @@ final class Intl
 
     /**
      * Returns whether the intl extension is installed.
-     *
-     * @return bool Returns true if the intl extension is installed, false otherwise
      */
     public static function isExtensionLoaded(): bool
     {
@@ -76,8 +74,6 @@ public static function isExtensionLoaded(): bool
 
     /**
      * Returns the version of the installed ICU library.
-     *
-     * @return string|null The ICU version or NULL if it could not be determined
      */
     public static function getIcuVersion(): ?string
     {
@@ -106,8 +102,6 @@ public static function getIcuVersion(): ?string
 
     /**
      * Returns the version of the installed ICU data.
-     *
-     * @return string The version of the installed ICU data
      */
     public static function getIcuDataVersion(): string
     {
@@ -120,8 +114,6 @@ public static function getIcuDataVersion(): string
 
     /**
      * Returns the ICU version that the stub classes mimic.
-     *
-     * @return string The ICU version of the stub classes
      */
     public static function getIcuStubVersion(): string
     {
@@ -130,8 +122,6 @@ public static function getIcuStubVersion(): string
 
     /**
      * Returns the absolute path to the data directory.
-     *
-     * @return string The absolute path to the data directory
      */
     public static function getDataDirectory(): string
     {

Locale.php

@@ -43,8 +43,6 @@ public static function setDefaultFallback(?string $locale)
     /**
      * Returns the default fallback locale.
      *
-     * @return string|null The default fallback locale
-     *
      * @see setDefaultFallback()
      * @see getFallback()
      */

Util/IcuVersion.php

@@ -46,8 +46,6 @@ class IcuVersion
      * @param int|null $precision The number of components to compare. Pass
      *                            NULL to compare the versions unchanged.
      *
-     * @return bool Whether the comparison succeeded
-     *
      * @see normalize()
      */
     public static function compare(string $version1, string $version2, string $operator, int $precision = null): bool
@@ -79,9 +77,6 @@ public static function compare(string $version1, string $version2, string $opera
      *
      * @param int|null $precision The number of components to include. Pass
      *                            NULL to return the version unchanged.
-     *
-     * @return string|null the normalized ICU version or NULL if it couldn't be
-     *                     normalized
      */
     public static function normalize(string $version, ?int $precision): ?string
     {

Util/Version.php

@@ -36,8 +36,6 @@ class Version
      * @param int|null $precision The number of components to compare. Pass
      *                            NULL to compare the versions unchanged.
      *
-     * @return bool Whether the comparison succeeded
-     *
      * @see normalize()
      */
     public static function compare(string $version1, string $version2, string $operator, int $precision = null): bool
@@ -62,9 +60,6 @@ public static function compare(string $version1, string $version2, string $opera
      *
      * @param int|null $precision The number of components to include. Pass
      *                            NULL to return the version unchanged.
-     *
-     * @return string|null the normalized version or NULL if it couldn't be
-     *                     normalized
      */
     public static function normalize(string $version, ?int $precision): ?string
     {