Cleanup more @return annotations

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

@@ -58,7 +58,7 @@ 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
+     * @return string
      */
     public function getSourceDir(): string
     {
@@ -68,7 +68,7 @@ public function getSourceDir(): string
     /**
      * Returns the ICU version of the bundles being converted.
      *
-     * @return string The ICU version string
+     * @return string
      */
     public function getIcuVersion(): string
     {

Intl.php

@@ -67,7 +67,7 @@ final class Intl
     /**
      * Returns whether the intl extension is installed.
      *
-     * @return bool Returns true if the intl extension is installed, false otherwise
+     * @return bool
      */
     public static function isExtensionLoaded(): bool
     {
@@ -77,7 +77,7 @@ 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
+     * @return string|null
      */
     public static function getIcuVersion(): ?string
     {
@@ -107,7 +107,7 @@ public static function getIcuVersion(): ?string
     /**
      * Returns the version of the installed ICU data.
      *
-     * @return string The version of the installed ICU data
+     * @return string
      */
     public static function getIcuDataVersion(): string
     {
@@ -121,7 +121,7 @@ public static function getIcuDataVersion(): string
     /**
      * Returns the ICU version that the stub classes mimic.
      *
-     * @return string The ICU version of the stub classes
+     * @return string
      */
     public static function getIcuStubVersion(): string
     {
@@ -131,7 +131,7 @@ public static function getIcuStubVersion(): string
     /**
      * Returns the absolute path to the data directory.
      *
-     * @return string The absolute path to the data directory
+     * @return string
      */
     public static function getDataDirectory(): string
     {

Locale.php

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

Locale/Locale.php

@@ -48,7 +48,7 @@ abstract class Locale
      *
      * @param string $header The string containing the "Accept-Language" header value
      *
-     * @return string The corresponding locale code
+     * @return string
      *
      * @see https://php.net/locale.acceptfromhttp
      *
@@ -93,7 +93,7 @@ public static function canonicalize(string $locale)
      *
      * @param array $subtags A keyed array where the keys identify the particular locale code subtag
      *
-     * @return string The corresponding locale code
+     * @return string
      *
      * @see https://php.net/locale.composelocale
      *
@@ -110,7 +110,7 @@ public static function composeLocale(array $subtags)
      * @param string $langtag The language tag to check
      * @param string $locale  The language range to check against
      *
-     * @return string The corresponding locale code
+     * @return string
      *
      * @see https://php.net/locale.filtermatches
      *
@@ -126,7 +126,7 @@ public static function filterMatches(string $langtag, string $locale, bool $cano
      *
      * @param string $locale The locale to extract the variants from
      *
-     * @return array The locale variants
+     * @return array
      *
      * @see https://php.net/locale.getallvariants
      *
@@ -138,9 +138,9 @@ public static function getAllVariants(string $locale)
     }
 
     /**
-     * Returns the default locale.
+     * Returns the default locale, which is always "en".
      *
-     * @return string The default locale code. Always returns 'en'
+     * @return string
      *
      * @see https://php.net/locale.getdefault
      */
@@ -155,7 +155,7 @@ public static function getDefault()
      * @param string $locale   The locale code to return the display language from
      * @param string $inLocale Optional format locale code to use to display the language name
      *
-     * @return string The localized language display name
+     * @return string
      *
      * @see https://php.net/locale.getdisplaylanguage
      *
@@ -172,7 +172,7 @@ public static function getDisplayLanguage(string $locale, string $inLocale = nul
      * @param string $locale   The locale code to return the display locale name from
      * @param string $inLocale Optional format locale code to use to display the locale name
      *
-     * @return string The localized locale display name
+     * @return string
      *
      * @see https://php.net/locale.getdisplayname
      *
@@ -189,7 +189,7 @@ public static function getDisplayName(string $locale, string $inLocale = null)
      * @param string $locale   The locale code to return the display region from
      * @param string $inLocale Optional format locale code to use to display the region name
      *
-     * @return string The localized region display name
+     * @return string
      *
      * @see https://php.net/locale.getdisplayregion
      *
@@ -206,7 +206,7 @@ public static function getDisplayRegion(string $locale, string $inLocale = null)
      * @param string $locale   The locale code to return the display script from
      * @param string $inLocale Optional format locale code to use to display the script name
      *
-     * @return string The localized script display name
+     * @return string
      *
      * @see https://php.net/locale.getdisplayscript
      *
@@ -223,7 +223,7 @@ public static function getDisplayScript(string $locale, string $inLocale = null)
      * @param string $locale   The locale code to return the display variant from
      * @param string $inLocale Optional format locale code to use to display the variant name
      *
-     * @return string The localized variant display name
+     * @return string
      *
      * @see https://php.net/locale.getdisplayvariant
      *
@@ -239,7 +239,7 @@ public static function getDisplayVariant(string $locale, string $inLocale = null
      *
      * @param string $locale The locale code to extract the keywords from
      *
-     * @return array Associative array with the extracted variants
+     * @return array
      *
      * @see https://php.net/locale.getkeywords
      *
@@ -255,7 +255,7 @@ public static function getKeywords(string $locale)
      *
      * @param string $locale The locale code to extract the language code from
      *
-     * @return string|null The extracted language code or null in case of error
+     * @return string|null
      *
      * @see https://php.net/locale.getprimarylanguage
      *
@@ -271,7 +271,7 @@ public static function getPrimaryLanguage(string $locale)
      *
      * @param string $locale The locale code to extract the region code from
      *
-     * @return string|null The extracted region code or null if not present
+     * @return string|null
      *
      * @see https://php.net/locale.getregion
      *
@@ -287,7 +287,7 @@ public static function getRegion(string $locale)
      *
      * @param string $locale The locale code to extract the script code from
      *
-     * @return string|null The extracted script code or null if not present
+     * @return string|null
      *
      * @see https://php.net/locale.getscript
      *
@@ -320,7 +320,7 @@ public static function lookup(array $langtag, string $locale, bool $canonicalize
      *
      * @param string $locale The locale code to extract the subtag array from
      *
-     * @return array Associative array with the extracted subtags
+     * @return array
      *
      * @see https://php.net/locale.parselocale
      *
@@ -334,7 +334,7 @@ public static function parseLocale(string $locale)
     /**
      * Not supported. Sets the default runtime locale.
      *
-     * @return bool true on success or false on failure
+     * @return bool
      *
      * @see https://php.net/locale.setdefault
      *

NumberFormatter/NumberFormatter.php

@@ -308,7 +308,7 @@ public static function create(?string $locale = 'en', int $style = null, string
      *
      * @param string $currency The 3-letter ISO 4217 currency code indicating the currency to use
      *
-     * @return string The formatted currency value
+     * @return string
      *
      * @see https://php.net/numberformatter.formatcurrency
      * @see https://en.wikipedia.org/wiki/ISO_4217#Active_codes
@@ -345,7 +345,7 @@ public function formatCurrency(float $value, string $currency)
      * @param int       $type  Type of the formatting, one of the format type constants.
      *                         Only type NumberFormatter::TYPE_DEFAULT is currently supported.
      *
-     * @return bool|string The formatted value or false on error
+     * @return bool|string
      *
      * @see https://php.net/numberformatter.format
      *

Util/IcuVersion.php

@@ -46,7 +46,7 @@ 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
+     * @return bool
      *
      * @see normalize()
      */
@@ -80,8 +80,7 @@ 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
+     * @return string|null
      */
     public static function normalize(string $version, ?int $precision)
     {

Util/Version.php

@@ -36,7 +36,7 @@ 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
+     * @return bool
      *
      * @see normalize()
      */
@@ -63,8 +63,7 @@ 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
+     * @return string|null
      */
     public static function normalize(string $version, ?int $precision)
     {