Merge branch '3.4' into 4.3

* 3.4:
  Improve some URLs
  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 <bschussek@gmail.com>

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/IntlDateFormatter.php

@@ -126,7 +126,7 @@ class IntlDateFormatter
      *                                                          supported value is IntlDateFormatter::GREGORIAN (or null using the default calendar, i.e. "GREGORIAN")
      * @param string|null                             $pattern  Optional pattern to use when formatting
      *
-     * @see http://www.php.net/manual/en/intldateformatter.create.php
+     * @see https://php.net/intldateformatter.create
      * @see http://userguide.icu-project.org/formatparse/datetime
      *
      * @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed
@@ -162,7 +162,7 @@ public function __construct(?string $locale, ?int $datetype, ?int $timetype, $ti
      *
      * @return self
      *
-     * @see http://www.php.net/manual/en/intldateformatter.create.php
+     * @see https://php.net/intldateformatter.create
      * @see http://userguide.icu-project.org/formatparse/datetime
      *
      * @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed
@@ -180,7 +180,7 @@ public static function create($locale, $datetype, $timetype, $timezone = null, $
      *
      * @return string|bool The formatted value or false if formatting failed
      *
-     * @see http://www.php.net/manual/en/intldateformatter.format.php
+     * @see https://php.net/intldateformatter.format
      *
      * @throws MethodArgumentValueNotImplementedException If one of the formatting characters is not implemented
      */
@@ -231,7 +231,7 @@ public function format($timestamp)
      *
      * @return string The formatted value
      *
-     * @see http://www.php.net/manual/en/intldateformatter.formatobject.php
+     * @see https://php.net/intldateformatter.formatobject
      *
      * @throws MethodNotImplementedException
      */
@@ -246,7 +246,7 @@ public function formatObject($object, $format = null, $locale = null)
      * @return int The calendar being used by the formatter. Currently always returns
      *             IntlDateFormatter::GREGORIAN.
      *
-     * @see http://www.php.net/manual/en/intldateformatter.getcalendar.php
+     * @see https://php.net/intldateformatter.getcalendar
      */
     public function getCalendar()
     {
@@ -258,7 +258,7 @@ public function getCalendar()
      *
      * @return object The calendar's object being used by the formatter
      *
-     * @see http://www.php.net/manual/en/intldateformatter.getcalendarobject.php
+     * @see https://php.net/intldateformatter.getcalendarobject
      *
      * @throws MethodNotImplementedException
      */
@@ -272,7 +272,7 @@ public function getCalendarObject()
      *
      * @return int The current value of the formatter
      *
-     * @see http://www.php.net/manual/en/intldateformatter.getdatetype.php
+     * @see https://php.net/intldateformatter.getdatetype
      */
     public function getDateType()
     {
@@ -284,7 +284,7 @@ public function getDateType()
      *
      * @return int The error code from last formatter call
      *
-     * @see http://www.php.net/manual/en/intldateformatter.geterrorcode.php
+     * @see https://php.net/intldateformatter.geterrorcode
      */
     public function getErrorCode()
     {
@@ -296,7 +296,7 @@ public function getErrorCode()
      *
      * @return string The error message from last formatter call
      *
-     * @see http://www.php.net/manual/en/intldateformatter.geterrormessage.php
+     * @see https://php.net/intldateformatter.geterrormessage
      */
     public function getErrorMessage()
     {
@@ -311,7 +311,7 @@ public function getErrorMessage()
      * @return string The locale used to create the formatter. Currently always
      *                returns "en".
      *
-     * @see http://www.php.net/manual/en/intldateformatter.getlocale.php
+     * @see https://php.net/intldateformatter.getlocale
      */
     public function getLocale($type = Locale::ACTUAL_LOCALE)
     {
@@ -323,7 +323,7 @@ public function getLocale($type = Locale::ACTUAL_LOCALE)
      *
      * @return string The pattern string used by the formatter
      *
-     * @see http://www.php.net/manual/en/intldateformatter.getpattern.php
+     * @see https://php.net/intldateformatter.getpattern
      */
     public function getPattern()
     {
@@ -335,7 +335,7 @@ public function getPattern()
      *
      * @return int The time type used by the formatter
      *
-     * @see http://www.php.net/manual/en/intldateformatter.gettimetype.php
+     * @see https://php.net/intldateformatter.gettimetype
      */
     public function getTimeType()
     {
@@ -347,7 +347,7 @@ public function getTimeType()
      *
      * @return string The timezone identifier used by the formatter
      *
-     * @see http://www.php.net/manual/en/intldateformatter.gettimezoneid.php
+     * @see https://php.net/intldateformatter.gettimezoneid
      */
     public function getTimeZoneId()
     {
@@ -363,7 +363,7 @@ public function getTimeZoneId()
      *
      * @return mixed The timezone used by the formatter
      *
-     * @see http://www.php.net/manual/en/intldateformatter.gettimezone.php
+     * @see https://php.net/intldateformatter.gettimezone
      *
      * @throws MethodNotImplementedException
      */
@@ -377,7 +377,7 @@ public function getTimeZone()
      *
      * @return bool Currently always returns false
      *
-     * @see http://www.php.net/manual/en/intldateformatter.islenient.php
+     * @see https://php.net/intldateformatter.islenient
      *
      * @throws MethodNotImplementedException
      */
@@ -397,7 +397,7 @@ public function isLenient()
      *
      * @return string Localtime compatible array of integers: contains 24 hour clock value in tm_hour field
      *
-     * @see http://www.php.net/manual/en/intldateformatter.localtime.php
+     * @see https://php.net/intldateformatter.localtime
      *
      * @throws MethodNotImplementedException
      */
@@ -417,7 +417,7 @@ public function localtime($value, &$position = 0)
      *
      * @return int Parsed value as a timestamp
      *
-     * @see http://www.php.net/manual/en/intldateformatter.parse.php
+     * @see https://php.net/intldateformatter.parse
      *
      * @throws MethodArgumentNotImplementedException When $position different than null, behavior not implemented
      */
@@ -447,7 +447,7 @@ public function parse($value, &$position = null)
      *
      * @return bool true on success or false on failure
      *
-     * @see http://www.php.net/manual/en/intldateformatter.setcalendar.php
+     * @see https://php.net/intldateformatter.setcalendar
      *
      * @throws MethodNotImplementedException
      */
@@ -469,7 +469,7 @@ public function setCalendar($calendar)
      *
      * @return bool true on success or false on failure
      *
-     * @see http://www.php.net/manual/en/intldateformatter.setlenient.php
+     * @see https://php.net/intldateformatter.setlenient
      *
      * @throws MethodArgumentValueNotImplementedException When $lenient is true
      */
@@ -489,7 +489,7 @@ public function setLenient($lenient)
      *
      * @return bool true on success or false on failure
      *
-     * @see http://www.php.net/manual/en/intldateformatter.setpattern.php
+     * @see https://php.net/intldateformatter.setpattern
      * @see http://userguide.icu-project.org/formatparse/datetime
      */
     public function setPattern($pattern)
@@ -512,7 +512,7 @@ public function setPattern($pattern)
      *
      * @return bool true on success or false on failure
      *
-     * @see http://www.php.net/manual/en/intldateformatter.settimezoneid.php
+     * @see https://php.net/intldateformatter.settimezoneid
      */
     public function setTimeZoneId($timeZoneId)
     {
@@ -556,7 +556,7 @@ public function setTimeZoneId($timeZoneId)
      *
      * @return bool true on success or false on failure
      *
-     * @see http://www.php.net/manual/en/intldateformatter.settimezone.php
+     * @see https://php.net/intldateformatter.settimezone
      */
     public function setTimeZone($timeZone)
     {