Merge branch '4.4'

* 4.4:
  Improve some URLs
  cleanup remaining param  and internal Intl FulLTransformer
  [HttpClient] fix data loss when streaming as a PHP resource
  Fix test compatibility with 4.x components
  [Cache] cs fix

Author: nicolas-grekas

Collator/Collator.php

@@ -130,7 +130,7 @@ public function asort(&$array, $sortFlag = self::SORT_REGULAR)
      *                  0 if $str1 is equal than $str2
      *                  -1 if $str1 is less than $str2
      *
-     * @see http://www.php.net/manual/en/collator.compare.php
+     * @see https://php.net/collator.compare
      *
      * @throws MethodNotImplementedException
      */
@@ -146,7 +146,7 @@ public function compare($str1, $str2)
      *
      * @return bool|int The attribute value on success or false on error
      *
-     * @see http://www.php.net/manual/en/collator.getattribute.php
+     * @see https://php.net/collator.getattribute
      *
      * @throws MethodNotImplementedException
      */
@@ -195,7 +195,7 @@ public function getLocale($type = Locale::ACTUAL_LOCALE)
      *
      * @return string The collation key for $string
      *
-     * @see http://www.php.net/manual/en/collator.getsortkey.php
+     * @see https://php.net/collator.getsortkey
      *
      * @throws MethodNotImplementedException
      */
@@ -209,7 +209,7 @@ public function getSortKey($string)
      *
      * @return bool|int The current collator's strength or false on failure
      *
-     * @see http://www.php.net/manual/en/collator.getstrength.php
+     * @see https://php.net/collator.getstrength
      *
      * @throws MethodNotImplementedException
      */
@@ -226,7 +226,7 @@ public function getStrength()
      *
      * @return bool True on success or false on failure
      *
-     * @see http://www.php.net/manual/en/collator.setattribute.php
+     * @see https://php.net/collator.setattribute
      *
      * @throws MethodNotImplementedException
      */
@@ -248,7 +248,7 @@ public function setAttribute($attr, $val)
      *
      * @return bool True on success or false on failure
      *
-     * @see http://www.php.net/manual/en/collator.setstrength.php
+     * @see https://php.net/collator.setstrength
      *
      * @throws MethodNotImplementedException
      */
@@ -264,7 +264,7 @@ public function setStrength($strength)
      *
      * @return bool True on success or false on failure
      *
-     * @see http://www.php.net/manual/en/collator.sortwithsortkeys.php
+     * @see https://php.net/collator.sortwithsortkeys
      *
      * @throws MethodNotImplementedException
      */
@@ -284,7 +284,7 @@ public function sortWithSortKeys(&$arr)
      *
      * @return bool True on success or false on failure
      *
-     * @see http://www.php.net/manual/en/collator.sort.php
+     * @see https://php.net/collator.sort
      *
      * @throws MethodNotImplementedException
      */

Data/Generator/LanguageDataGenerator.php

@@ -27,7 +27,7 @@
 class LanguageDataGenerator extends AbstractDataGenerator
 {
     /**
-     * Source: http://www-01.sil.org/iso639-3/codes.asp.
+     * Source: https://iso639-3.sil.org/code_tables/639/data
      */
     private static $preferredAlpha2ToAlpha3Mapping = [
         'ak' => 'aka',

Data/Util/ArrayAccessibleResourceBundle.php

@@ -16,7 +16,7 @@
 /**
  * Work-around for a bug in PHP's \ResourceBundle implementation.
  *
- * More information can be found on https://bugs.php.net/bug.php?id=64356.
+ * More information can be found on https://bugs.php.net/64356.
  * This class can be removed once that bug is fixed.
  *
  * @author Bernhard Schussek <[email protected]>

DateFormatter/DateFormat/FullTransformer.php

@@ -69,21 +69,9 @@ public function __construct(string $pattern, string $timezone)
         ];
     }
 
-    /**
-     * Return the array of Transformer objects.
-     *
-     * @return Transformer[] Associative array of Transformer objects (format char => Transformer)
-     */
-    public function getTransformers()
-    {
-        return $this->transformers;
-    }
-
     /**
      * Format a DateTime using ICU dateformat pattern.
      *
-     * @param \DateTime $dateTime A DateTime object to be used to generate the formatted value
-     *
      * @return string The formatted value
      */
     public function format(\DateTime $dateTime)
@@ -98,14 +86,9 @@ public function format(\DateTime $dateTime)
     /**
      * Return the formatted ICU value for the matched date characters.
      *
-     * @param string    $dateChars The date characters to be replaced with a formatted ICU value
-     * @param \DateTime $dateTime  A DateTime object to be used to generate the formatted value
-     *
-     * @return string The formatted value
-     *
      * @throws NotImplementedException When it encounters a not implemented date character
      */
-    public function formatReplace($dateChars, $dateTime)
+    private function formatReplace(string $dateChars, \DateTime $dateTime): string
     {
         $length = \strlen($dateChars);
 
@@ -167,12 +150,10 @@ public function parse(\DateTime $dateTime, $value)
     /**
      * Retrieve a regular expression to match with a formatted value.
      *
-     * @param string $pattern The pattern to create the reverse matching regular expression
-     *
      * @return string The reverse matching regular expression with named captures being formed by the
      *                transformer index in the $transformer array
      */
-    public function getReverseMatchingRegExp($pattern)
+    private function getReverseMatchingRegExp(string $pattern): string
     {
         $escapedPattern = preg_quote($pattern, '/');
 
@@ -189,9 +170,8 @@ public function getReverseMatchingRegExp($pattern)
                 return $this->replaceQuoteMatch($dateChars);
             }
 
-            $transformers = $this->getTransformers();
-            if (isset($transformers[$transformerIndex])) {
-                $transformer = $transformers[$transformerIndex];
+            if (isset($this->transformers[$transformerIndex])) {
+                $transformer = $this->transformers[$transformerIndex];
                 $captureName = str_repeat($transformerIndex, $length);
 
                 return "(?P<$captureName>".$transformer->getReverseMatchingRegExp($length).')';
@@ -203,24 +183,16 @@ public function getReverseMatchingRegExp($pattern)
 
     /**
      * Check if the first char of a string is a single quote.
-     *
-     * @param string $quoteMatch The string to check
-     *
-     * @return bool true if matches, false otherwise
      */
-    public function isQuoteMatch($quoteMatch)
+    private function isQuoteMatch(string $quoteMatch): bool
     {
         return "'" === $quoteMatch[0];
     }
 
     /**
      * Replaces single quotes at the start or end of a string with two single quotes.
-     *
-     * @param string $quoteMatch The string to replace the quotes
-     *
-     * @return string A string with the single quotes replaced
      */
-    public function replaceQuoteMatch($quoteMatch)
+    private function replaceQuoteMatch(string $quoteMatch): string
     {
         if (preg_match("/^'+$/", $quoteMatch)) {
             return str_replace("''", "'", $quoteMatch);
@@ -231,12 +203,8 @@ public function replaceQuoteMatch($quoteMatch)
 
     /**
      * Builds a chars match regular expression.
-     *
-     * @param string $specialChars A string of chars to build the regular expression
-     *
-     * @return string The chars match regular expression
      */
-    protected function buildCharsMatch($specialChars)
+    private function buildCharsMatch(string $specialChars): string
     {
         $specialCharsArray = str_split($specialChars);
 
@@ -250,10 +218,8 @@ protected function buildCharsMatch($specialChars)
     /**
      * Normalize a preg_replace match array, removing the numeric keys and returning an associative array
      * with the value and pattern values for the matched Transformer.
-     *
-     * @return array
      */
-    protected function normalizeArray(array $data)
+    private function normalizeArray(array $data): array
     {
         $ret = [];
 
@@ -275,12 +241,9 @@ protected function normalizeArray(array $data)
      * Calculates the Unix timestamp based on the matched values by the reverse matching regular
      * expression of parse().
      *
-     * @param \DateTime $dateTime The DateTime object to be used to calculate the timestamp
-     * @param array     $options  An array with the matched values to be used to calculate the timestamp
-     *
      * @return bool|int The calculated timestamp or false if matched date is invalid
      */
-    protected function calculateUnixTimestamp(\DateTime $dateTime, array $options)
+    private function calculateUnixTimestamp(\DateTime $dateTime, array $options)
     {
         $options = $this->getDefaultValueForOptions($options);
 

DateFormatter/DateFormat/TimezoneTransformer.php

@@ -92,8 +92,7 @@ public function extractDateOptions(string $matched, int $length): array
      *
      * @return string A timezone identifier
      *
-     * @see http://php.net/manual/en/timezones.others.php
-     * @see http://www.twinsun.com/tz/tz-link.htm
+     * @see https://php.net/timezones.others
      *
      * @throws NotImplementedException   When the GMT time zone have minutes offset different than zero
      * @throws \InvalidArgumentException When the value can not be matched with pattern

DateFormatter/DateFormat/Transformer.php

@@ -23,7 +23,6 @@ abstract class Transformer
     /**
      * Format a value using a configured DateTime as date/time source.
      *
-     *
      * @param \DateTime $dateTime A DateTime object to be used to generate the formatted value
      * @param int       $length   The formatted value string length
      *