Merge branch '4.4'

* 4.4:
  [Debug] Improve UPGRADE files
  remove wrongly added legacy group from test
  consistently throw NotSupportException
  [HttpKernel] Clarify error handler restoring process again
  [HttpClient] Remove CURLOPT_CONNECTTIMEOUT_MS curl opt
  add missing conflict rule
  [Intl] fix nullable phpdocs and useless method visibility of internal class
  remove some more useless phpdocs
  Resilience against file_get_contents() race conditions.
  Turned return type annotations of private methods into php return types.

Author: nicolas-grekas

Collator/Collator.php

@@ -70,7 +70,7 @@ class Collator
     const SORT_STRING = 1;
 
     /**
-     * @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
+     * @param string|null $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
      *
      * @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed
      */
@@ -84,7 +84,7 @@ public function __construct(?string $locale)
     /**
      * Static constructor.
      *
-     * @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
+     * @param string|null $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
      *
      * @return self
      *

Data/Bundle/Writer/TextBundleWriter.php

@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Intl\Data\Bundle\Writer;
 
-use Symfony\Component\Intl\Exception\UnexpectedTypeException;
-
 /**
  * Writes .txt resource bundles.
  *
@@ -183,16 +181,9 @@ private function writeArray($file, array $value, int $indentation)
      * Writes a "table" node.
      *
      * @param resource $file The file handle to write to
-     *
-     * @throws UnexpectedTypeException when $value is not an array and not a
-     *                                 \Traversable instance
      */
     private function writeTable($file, iterable $value, int $indentation, bool $fallback = true)
     {
-        if (!\is_array($value) && !$value instanceof \Traversable) {
-            throw new UnexpectedTypeException($value, 'array or \Traversable');
-        }
-
         if (!$fallback) {
             fwrite($file, ':table(nofallback)');
         }

Data/Generator/CurrencyDataGenerator.php

@@ -130,10 +130,7 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, $temp
         return $data;
     }
 
-    /**
-     * @return array
-     */
-    private function generateSymbolNamePairs(ArrayAccessibleResourceBundle $rootBundle)
+    private function generateSymbolNamePairs(ArrayAccessibleResourceBundle $rootBundle): array
     {
         $symbolNamePairs = iterator_to_array($rootBundle['Currencies']);
 
@@ -143,14 +140,14 @@ private function generateSymbolNamePairs(ArrayAccessibleResourceBundle $rootBund
         return $symbolNamePairs;
     }
 
-    private function generateCurrencyMeta(ArrayAccessibleResourceBundle $supplementalDataBundle)
+    private function generateCurrencyMeta(ArrayAccessibleResourceBundle $supplementalDataBundle): array
     {
         // The metadata is already de-duplicated. It contains one key "DEFAULT"
         // which is used for currencies that don't have dedicated entries.
         return iterator_to_array($supplementalDataBundle['CurrencyMeta']);
     }
 
-    private function generateAlpha3ToNumericMapping(ArrayAccessibleResourceBundle $numericCodesBundle, array $currencyCodes)
+    private function generateAlpha3ToNumericMapping(ArrayAccessibleResourceBundle $numericCodesBundle, array $currencyCodes): array
     {
         $alpha3ToNumericMapping = iterator_to_array($numericCodesBundle['codeMap']);
 
@@ -162,7 +159,7 @@ private function generateAlpha3ToNumericMapping(ArrayAccessibleResourceBundle $n
         return $alpha3ToNumericMapping;
     }
 
-    private function generateNumericToAlpha3Mapping(array $alpha3ToNumericMapping)
+    private function generateNumericToAlpha3Mapping(array $alpha3ToNumericMapping): array
     {
         $numericToAlpha3Mapping = [];
 

Data/Generator/LocaleDataGenerator.php

@@ -148,10 +148,7 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, $temp
         ];
     }
 
-    /**
-     * @return string
-     */
-    private function generateLocaleName(BundleEntryReaderInterface $reader, string $tempDir, string $locale, string $displayLocale, string $pattern, string $separator)
+    private function generateLocaleName(BundleEntryReaderInterface $reader, string $tempDir, string $locale, string $displayLocale, string $pattern, string $separator): string
     {
         // Apply generic notation using square brackets as described per http://cldr.unicode.org/translation/language-names
         $name = str_replace(['(', ')'], ['[', ']'], $reader->readEntry($tempDir.'/lang', $displayLocale, ['Languages', \Locale::getPrimaryLanguage($locale)]));

DateFormatter/DateFormat/FullTransformer.php

@@ -327,10 +327,8 @@ protected function calculateUnixTimestamp(\DateTime $dateTime, array $options)
     /**
      * Add sensible default values for missing items in the extracted date/time options array. The values
      * are base in the beginning of the Unix era.
-     *
-     * @return array
      */
-    private function getDefaultValueForOptions(array $options)
+    private function getDefaultValueForOptions(array $options): array
     {
         return [
             'year' => isset($options['year']) ? $options['year'] : 1970,

DateFormatter/IntlDateFormatter.php

@@ -118,7 +118,7 @@ class IntlDateFormatter
     private $timeZoneId;
 
     /**
-     * @param string                                  $locale   The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
+     * @param string|null                             $locale   The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
      * @param int|null                                $datetype Type of date formatting, one of the format type constants
      * @param int|null                                $timetype Type of time formatting, one of the format type constants
      * @param \IntlTimeZone|\DateTimeZone|string|null $timezone Timezone identifier
@@ -152,7 +152,7 @@ public function __construct(?string $locale, ?int $datetype, ?int $timetype, $ti
     /**
      * Static constructor.
      *
-     * @param string                                  $locale   The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
+     * @param string|null                             $locale   The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
      * @param int|null                                $datetype Type of date formatting, one of the format type constants
      * @param int|null                                $timetype Type of time formatting, one of the format type constants
      * @param \IntlTimeZone|\DateTimeZone|string|null $timezone Timezone identifier

NumberFormatter/NumberFormatter.php

@@ -241,13 +241,13 @@ class NumberFormatter
     ];
 
     /**
-     * @param string $locale  The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
-     * @param int    $style   Style of the formatting, one of the format style constants.
-     *                        The only supported styles are NumberFormatter::DECIMAL
-     *                        and NumberFormatter::CURRENCY.
-     * @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or
-     *                        NumberFormat::PATTERN_RULEBASED. It must conform to  the syntax
-     *                        described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
+     * @param string|null $locale  The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
+     * @param int         $style   Style of the formatting, one of the format style constants.
+     *                             The only supported styles are NumberFormatter::DECIMAL
+     *                             and NumberFormatter::CURRENCY.
+     * @param string      $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or
+     *                             NumberFormat::PATTERN_RULEBASED. It must conform to  the syntax
+     *                             described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
      *
      * @see http://www.php.net/manual/en/numberformatter.create.php
      * @see http://www.icu-project.org/apiref/icu4c/classDecimalFormat.html#_details
@@ -672,12 +672,10 @@ protected function resetError()
      *
      * The only actual rounding data as of this writing, is CHF.
      *
-     * @return float The rounded numeric currency value
-     *
      * @see http://en.wikipedia.org/wiki/Swedish_rounding
      * @see http://www.docjar.com/html/api/com/ibm/icu/util/Currency.java.html#1007
      */
-    private function roundCurrency(float $value, string $currency)
+    private function roundCurrency(float $value, string $currency): float
     {
         $fractionDigits = Currencies::getFractionDigits($currency);
         $roundingIncrement = Currencies::getRoundingIncrement($currency);
@@ -738,10 +736,8 @@ private function round($value, int $precision)
      * Formats a number.
      *
      * @param int|float $value The numeric value to format
-     *
-     * @return string The formatted number
      */
-    private function formatNumber($value, int $precision)
+    private function formatNumber($value, int $precision): string
     {
         $precision = $this->getUninitializedPrecision($value, $precision);
 
@@ -752,10 +748,8 @@ private function formatNumber($value, int $precision)
      * Returns the precision value if the DECIMAL style is being used and the FRACTION_DIGITS attribute is uninitialized.
      *
      * @param int|float $value The value to get the precision from if the FRACTION_DIGITS attribute is uninitialized
-     *
-     * @return int The precision value
      */
-    private function getUninitializedPrecision($value, int $precision)
+    private function getUninitializedPrecision($value, int $precision): int
     {
         if (self::CURRENCY == $this->style) {
             return $precision;
@@ -773,10 +767,8 @@ private function getUninitializedPrecision($value, int $precision)
 
     /**
      * Check if the attribute is initialized (value set by client code).
-     *
-     * @return bool true if the value was set by client, false otherwise
      */
-    private function isInitializedAttribute(string $attr)
+    private function isInitializedAttribute(string $attr): bool
     {
         return isset($this->initializedAttributes[$attr]);
     }
@@ -835,10 +827,8 @@ private function getInt64Value($value)
 
     /**
      * Check if the rounding mode is invalid.
-     *
-     * @return bool true if the rounding mode is invalid, false otherwise
      */
-    private function isInvalidRoundingMode(int $value)
+    private function isInvalidRoundingMode(int $value): bool
     {
         if (\in_array($value, self::$roundingModes, true)) {
             return false;
@@ -850,20 +840,16 @@ private function isInvalidRoundingMode(int $value)
     /**
      * Returns the normalized value for the GROUPING_USED attribute. Any value that can be converted to int will be
      * cast to Boolean and then to int again. This way, negative values are converted to 1 and string values to 0.
-     *
-     * @return int The normalized value for the attribute (0 or 1)
      */
-    private function normalizeGroupingUsedValue($value)
+    private function normalizeGroupingUsedValue($value): int
     {
         return (int) (bool) (int) $value;
     }
 
     /**
      * Returns the normalized value for the FRACTION_DIGITS attribute.
-     *
-     * @return int The normalized value for the attribute
      */
-    private function normalizeFractionDigitsValue($value)
+    private function normalizeFractionDigitsValue($value): int
     {
         return (int) $value;
     }

Tests/DateFormatter/IntlDateFormatterTest.php

@@ -207,10 +207,8 @@ protected function isIntlFailure($errorCode)
      * Also in intl, format like 'ss E' for '10 2' (2nd day of year
      * + 10 seconds) are added, then we have 86,400 seconds (24h * 60min * 60s)
      * + 10 seconds
-     *
-     * @return array
      */
-    private function notImplemented(array $dataSets)
+    private function notImplemented(array $dataSets): array
     {
         return array_map(function (array $row) {
             return [$row[0], $row[1], 0];