Improve parameter names in ext/intl

Closes GH-6309
author: Máté Kocsis <kocsismate@woohoolabs.com> 2020-10-09 13:14:41 +0200
committer: Máté Kocsis <kocsismate@woohoolabs.com> 2020-10-12 18:06:45 +0200
commit: 186612e4d79b82c6a1ae610293b7816078dd611c (patch)
tree: a46431907f11d489f998b6b03ebae33f45039f28
parent: eef994d6211ae96b108caccd77669336f4ec46e8 (diff)
download: php-git-186612e4d79b82c6a1ae610293b7816078dd611c.tar.gz
54 files changed, 526 insertions, 512 deletions
diff --git a/ext/date/php_date.stub.php b/ext/date/php_date.stub.php
index 8a1e86a3a0..c92ea0b4ff 100644
--- a/ext/date/php_date.stub.php
+++ b/ext/date/php_date.stub.php
@@ -98,7 +98,7 @@ function date_interval_create_from_date_string(string $datetime): DateInterval|f
 
 function date_interval_format(DateInterval $object, string $format): string {}
 
-function date_default_timezone_set(string $timezoneID): bool {}
+function date_default_timezone_set(string $timezoneId): bool {}
 
 function date_default_timezone_get(): string {}
 
diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h
index 19ee60f5c1..b716ff1da8 100644
--- a/ext/date/php_date_arginfo.h
+++ b/ext/date/php_date_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: cb1532309655d85eb2644cdcfbf23063dfa1ddaf */
+ * Stub hash: 561c6ad41ccedfc8b778d3b64323c7154dffcdb5 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0)
@@ -203,7 +203,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_date_interval_format, 0, 2, IS_S
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_date_default_timezone_set, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO(0, timezoneID, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_date_default_timezone_get arginfo_timezone_version_get
diff --git a/ext/intl/breakiterator/breakiterator.stub.php b/ext/intl/breakiterator/breakiterator.stub.php
index fda35217df..35a57e44b9 100644
--- a/ext/intl/breakiterator/breakiterator.stub.php
+++ b/ext/intl/breakiterator/breakiterator.stub.php
@@ -40,10 +40,10 @@ class IntlBreakIterator implements IteratorAggregate
     public function getErrorMessage() {}
 
     /** @return string */
-    public function getLocale(int $locale_type) {}
+    public function getLocale(int $type) {}
 
     /** @return IntlPartsIterator */
-    public function getPartsIterator(string $key_type = IntlPartsIterator::KEY_SEQUENTIAL) {}
+    public function getPartsIterator(string $type = IntlPartsIterator::KEY_SEQUENTIAL) {}
 
     /** @return string|null */
     public function getText() {}
@@ -71,7 +71,7 @@ class IntlBreakIterator implements IteratorAggregate
 
 class IntlRuleBasedBreakIterator extends IntlBreakIterator
 {
-    public function __construct(string $rules, bool $areCompiled = false) {}
+    public function __construct(string $rules, bool $compiled = false) {}
 
     /** @return string|false */
     public function getBinaryRules() {}
diff --git a/ext/intl/breakiterator/breakiterator_arginfo.h b/ext/intl/breakiterator/breakiterator_arginfo.h
index ee0d3fc27d..ec8c0c3ce7 100644
--- a/ext/intl/breakiterator/breakiterator_arginfo.h
+++ b/ext/intl/breakiterator/breakiterator_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 5eeedbbb7d07b0063d7bc19842b863a2c6d6898b */
+ * Stub hash: 6a121ed9817667820f05677a772781d6b788796b */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlBreakIterator_createCharacterInstance, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
@@ -31,11 +31,11 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_IntlBreakIterator_getErrorMessage arginfo_class_IntlBreakIterator_createCodePointInstance
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlBreakIterator_getLocale, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, locale_type, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlBreakIterator_getPartsIterator, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, key_type, IS_STRING, 0, "IntlPartsIterator::KEY_SEQUENTIAL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_STRING, 0, "IntlPartsIterator::KEY_SEQUENTIAL")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlBreakIterator_getText arginfo_class_IntlBreakIterator_createCodePointInstance
@@ -61,7 +61,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlRuleBasedBreakIterator___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, rules, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, areCompiled, _IS_BOOL, 0, "false")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, compiled, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlRuleBasedBreakIterator_getBinaryRules arginfo_class_IntlBreakIterator_createCodePointInstance
diff --git a/ext/intl/calendar/calendar.stub.php b/ext/intl/calendar/calendar.stub.php
index 5c89535497..8140737e13 100644
--- a/ext/intl/calendar/calendar.stub.php
+++ b/ext/intl/calendar/calendar.stub.php
@@ -7,41 +7,41 @@ class IntlCalendar
     private function __construct() {}
 
     /**
-     * @param IntlTimeZone|DateTimeZone|string|null $timeZone
+     * @param IntlTimeZone|DateTimeZone|string|null $timezone
      * @return IntlCalendar|IntlGregorianCalendar|null
      * @alias intlcal_create_instance
      */
-    public static function createInstance($timeZone = null, ?string $locale = null) {}
+    public static function createInstance($timezone = null, ?string $locale = null) {}
 
     /**
      * @return bool
      * @alias intlcal_equals
      */
-    public function equals(IntlCalendar $calendar) {}
+    public function equals(IntlCalendar $other) {}
 
     /**
      * @return int
      * @alias intlcal_field_difference
      */
-    public function fieldDifference(float $when, int $field) {}
+    public function fieldDifference(float $timestamp, int $field) {}
 
     /**
      * @return bool
      * @alias intlcal_add
      */
-    public function add(int $field, int $amount) {}
+    public function add(int $field, int $value) {}
 
     /**
      * @return bool
      * @alias intlcal_after
      */
-    public function after(IntlCalendar $calendar) {}
+    public function after(IntlCalendar $other) {}
 
     /**
      * @return bool
      * @alias intlcal_before
      */
-    public function before(IntlCalendar $calendar) {}
+    public function before(IntlCalendar $other) {}
 
     /**
      * @return bool
@@ -53,7 +53,7 @@ class IntlCalendar
      * @return IntlCalendar|null
      * @alias intlcal_from_date_time
      */
-    public static function fromDateTime(DateTime|string $dateTime, ?string $locale = null) {}
+    public static function fromDateTime(DateTime|string $datetime, ?string $locale = null) {}
 
     /**
      * @return int
@@ -113,7 +113,7 @@ class IntlCalendar
      * @return IntlIterator|false
      * @alias intlcal_get_keyword_values_for_locale
      */
-    public static function getKeywordValuesForLocale(string $key, string $locale, bool $commonlyUsed) {}
+    public static function getKeywordValuesForLocale(string $keyword, string $locale, bool $onlyCommon) {}
 
     /**
      * @return int
@@ -125,7 +125,7 @@ class IntlCalendar
      * @return string
      * @alias intlcal_get_locale
      */
-    public function getLocale(int $localeType) {}
+    public function getLocale(int $type) {}
 
     /**
      * @return int
@@ -143,7 +143,7 @@ class IntlCalendar
      * @return bool
      * @alias intlcal_set_minimal_days_in_first_week
      */
-    public function setMinimalDaysInFirstWeek(int $numberOfDays) {}
+    public function setMinimalDaysInFirstWeek(int $days) {}
 
     /**
      * @return int
@@ -203,7 +203,7 @@ class IntlCalendar
      * @return bool
      * @alias intlcal_is_equivalent_to
      */
-    public function isEquivalentTo(IntlCalendar $calendar) {}
+    public function isEquivalentTo(IntlCalendar $other) {}
 
     /**
      * @return bool
@@ -215,7 +215,7 @@ class IntlCalendar
      * @return bool
      * @alias intlcal_is_weekend
      */
-    public function isWeekend(?float $date = null) {}
+    public function isWeekend(?float $timestamp = null) {}
 
     /**
      * @param int|bool $amountOrUpOrDown
@@ -246,32 +246,32 @@ class IntlCalendar
      * @return bool
      * @alias intlcal_set_lenient
      */
-    public function setLenient(bool $isLenient) {}
+    public function setLenient(bool $lenient) {}
 
     /**
      * @return bool
      * @alias intlcal_set_repeated_wall_time_option
      */
-    public function setRepeatedWallTimeOption(int $wallTimeOption) {}
+    public function setRepeatedWallTimeOption(int $option) {}
 
     /**
      * @return bool
      * @alias intlcal_set_skipped_wall_time_option
      */
-    public function setSkippedWallTimeOption(int $wallTimeOption) {}
+    public function setSkippedWallTimeOption(int $option) {}
 
     /**
      * @return bool
      * @alias intlcal_set_time
      */
-    public function setTime(float $date) {}
+    public function setTime(float $timestamp) {}
 
     /**
-     * @param IntlTimeZone|DateTimeZone|string|null $timeZone
+     * @param IntlTimeZone|DateTimeZone|string|null $timezone
      * @return bool
      * @alias intlcal_set_time_zone
      */
-    public function setTimeZone($timeZone) {}
+    public function setTimeZone($timezone) {}
 
     /**
      * @return DateTime|false
@@ -283,20 +283,20 @@ class IntlCalendar
 class IntlGregorianCalendar extends IntlCalendar
 {
     /**
-     * @param DateTimeZone|IntlTimeZone|string|int|null $timeZoneOrYear
+     * @param DateTimeZone|IntlTimeZone|string|int|null $timezoneOrYear
      * @param string|int|null $localeOrMonth
-     * @param int $dayOfMonth
+     * @param int $day
      * @param int $hour
      * @param int $minute
      * @param int $second
      */
-    public function __construct($timeZoneOrYear = UNKNOWN, $localeOrMonth = UNKNOWN, $dayOfMonth = UNKNOWN, $hour = UNKNOWN, $minute = UNKNOWN, $second = UNKNOWN) {}
+    public function __construct($timezoneOrYear = UNKNOWN, $localeOrMonth = UNKNOWN, $day = UNKNOWN, $hour = UNKNOWN, $minute = UNKNOWN, $second = UNKNOWN) {}
 
     /**
      * @return bool
      * @alias intlgregcal_set_gregorian_change
      */
-    public function setGregorianChange(float $change) {}
+    public function setGregorianChange(float $timestamp) {}
 
     /**
      * @return float
diff --git a/ext/intl/calendar/calendar_arginfo.h b/ext/intl/calendar/calendar_arginfo.h
index f84bf76140..a4818f6e14 100644
--- a/ext/intl/calendar/calendar_arginfo.h
+++ b/ext/intl/calendar/calendar_arginfo.h
@@ -1,26 +1,26 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 0ac7a1d4e011518fc956fb05624b45b061fa9710 */
+ * Stub hash: cac6d4040481ab7de4775315079b1d28a44cbcac */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_createInstance, 0, 0, 0)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timeZone, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_equals, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
+	ZEND_ARG_OBJ_INFO(0, other, IntlCalendar, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_fieldDifference, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, when, IS_DOUBLE, 0)
+	ZEND_ARG_TYPE_INFO(0, timestamp, IS_DOUBLE, 0)
 	ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_add, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO(0, amount, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlCalendar_after arginfo_class_IntlCalendar_equals
@@ -32,7 +32,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_clear, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_fromDateTime, 0, 0, 1)
-	ZEND_ARG_OBJ_TYPE_MASK(0, dateTime, DateTime, MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, datetime, DateTime, MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
@@ -59,15 +59,15 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_IntlCalendar_getGreatestMinimum arginfo_class_IntlCalendar_get
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_getKeywordValuesForLocale, 0, 0, 3)
-	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, keyword, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, commonlyUsed, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, onlyCommon, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlCalendar_getLeastMaximum arginfo_class_IntlCalendar_get
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_getLocale, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, localeType, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlCalendar_getMaximum arginfo_class_IntlCalendar_get
@@ -75,7 +75,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_IntlCalendar_getMinimalDaysInFirstWeek arginfo_class_IntlCalendar___construct
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_setMinimalDaysInFirstWeek, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, numberOfDays, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, days, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlCalendar_getMinimum arginfo_class_IntlCalendar_get
@@ -101,7 +101,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_IntlCalendar_isLenient arginfo_class_IntlCalendar___construct
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_isWeekend, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, date, IS_DOUBLE, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timestamp, IS_DOUBLE, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_roll, 0, 0, 2)
@@ -123,37 +123,35 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_IntlCalendar_setFirstDayOfWeek arginfo_class_IntlCalendar_getDayOfWeekType
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_setLenient, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, isLenient, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, lenient, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_setRepeatedWallTimeOption, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, wallTimeOption, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlCalendar_setSkippedWallTimeOption arginfo_class_IntlCalendar_setRepeatedWallTimeOption
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_setTime, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, date, IS_DOUBLE, 0)
+	ZEND_ARG_TYPE_INFO(0, timestamp, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_setTimeZone, 0, 0, 1)
-	ZEND_ARG_INFO(0, timeZone)
+	ZEND_ARG_INFO(0, timezone)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlCalendar_toDateTime arginfo_class_IntlCalendar___construct
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlGregorianCalendar___construct, 0, 0, 0)
-	ZEND_ARG_INFO(0, timeZoneOrYear)
+	ZEND_ARG_INFO(0, timezoneOrYear)
 	ZEND_ARG_INFO(0, localeOrMonth)
-	ZEND_ARG_INFO(0, dayOfMonth)
+	ZEND_ARG_INFO(0, day)
 	ZEND_ARG_INFO(0, hour)
 	ZEND_ARG_INFO(0, minute)
 	ZEND_ARG_INFO(0, second)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlGregorianCalendar_setGregorianChange, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, change, IS_DOUBLE, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_class_IntlGregorianCalendar_setGregorianChange arginfo_class_IntlCalendar_setTime
 
 #define arginfo_class_IntlGregorianCalendar_getGregorianChange arginfo_class_IntlCalendar___construct
 
diff --git a/ext/intl/collator/collator.stub.php b/ext/intl/collator/collator.stub.php
index 68a7da192f..f42d1508cb 100644
--- a/ext/intl/collator/collator.stub.php
+++ b/ext/intl/collator/collator.stub.php
@@ -16,37 +16,37 @@ class Collator
      * @return int|false
      * @alias collator_compare
      */
-    public function compare(string $str1, string $str2) {}
+    public function compare(string $string1, string $string2) {}
 
     /**
      * @return bool
      * @alias collator_sort
      */
-    public function sort(array &$arr, int $sort_flag = Collator::SORT_REGULAR) {}
+    public function sort(array &$array, int $flags = Collator::SORT_REGULAR) {}
 
     /**
      * @return bool
      * @alias collator_sort_with_sort_keys
      */
-    public function sortWithSortKeys(array &$arr) {}
+    public function sortWithSortKeys(array &$array) {}
 
     /**
      * @return bool
      * @alias collator_asort
      */
-    public function asort(array &$arr, int $sort_flag = Collator::SORT_REGULAR) {}
+    public function asort(array &$array, int $flags = Collator::SORT_REGULAR) {}
 
     /**
      * @return int|false
      * @alias collator_get_attribute
      */
-    public function getAttribute(int $attr) {}
+    public function getAttribute(int $attribute) {}
 
     /**
      * @return bool
      * @alias collator_set_attribute
      */
-    public function setAttribute(int $attr, int $val) {}
+    public function setAttribute(int $attribute, int $value) {}
 
     /**
      * @return int
@@ -82,5 +82,5 @@ class Collator
      * @return string|false
      * @alias collator_get_sort_key
      */
-    public function getSortKey(string $str) {}
+    public function getSortKey(string $string) {}
 }
diff --git a/ext/intl/collator/collator_arginfo.h b/ext/intl/collator/collator_arginfo.h
index f0fd448077..1b7dcc408f 100644
--- a/ext/intl/collator/collator_arginfo.h
+++ b/ext/intl/collator/collator_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 4cb1470cf2566c9d947be638c7d14a14a10290dd */
+ * Stub hash: 869c6e60a8f2b153ef79f28a08e165ff3ec2bc14 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
@@ -8,28 +8,28 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_Collator_create arginfo_class_Collator___construct
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_compare, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, str1, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, str2, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string1, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string2, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_sort, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(1, arr, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sort_flag, IS_LONG, 0, "Collator::SORT_REGULAR")
+	ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "Collator::SORT_REGULAR")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_sortWithSortKeys, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(1, arr, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_Collator_asort arginfo_class_Collator_sort
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_getAttribute, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_setAttribute, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO(0, val, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_getStrength, 0, 0, 0)
@@ -48,7 +48,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_Collator_getErrorMessage arginfo_class_Collator_getStrength
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_getSortKey, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 
diff --git a/ext/intl/dateformat/dateformat.stub.php b/ext/intl/dateformat/dateformat.stub.php
index bf2136eb61..032a04c6fa 100644
--- a/ext/intl/dateformat/dateformat.stub.php
+++ b/ext/intl/dateformat/dateformat.stub.php
@@ -8,14 +8,14 @@ class IntlDateFormatter
      * @param IntlTimeZone|DateTimeZone|string|null $timezone
      * @param IntlCalendar|int|null $calendar
      */
-    public function __construct(?string $locale, int $datetype, int $timetype, $timezone = null, $calendar = null, string $pattern = "") {}
+    public function __construct(?string $locale, int $dateType, int $timeType, $timezone = null, $calendar = null, string $pattern = "") {}
 
     /**
      * @param IntlTimeZone|DateTimeZone|string|null $timezone
      * @return IntlDateFormatter|null
      * @alias datefmt_create
      */
-    public static function create(?string $locale, int $datetype, int $timetype, $timezone = null, IntlCalendar|int|null $calendar = null, string $pattern = "") {}
+    public static function create(?string $locale, int $dateType, int $timeType, $timezone = null, IntlCalendar|int|null $calendar = null, string $pattern = "") {}
 
     /**
      * @return int|false
@@ -39,7 +39,7 @@ class IntlDateFormatter
      * @return bool
      * @alias datefmt_set_calendar
      */
-    public function setCalendar(IntlCalendar|int|null $which) {}
+    public function setCalendar(IntlCalendar|int|null $calendar) {}
 
     /**
      * @return string|false
@@ -60,11 +60,11 @@ class IntlDateFormatter
     public function getTimeZone() {}
 
     /**
-     * @param IntlTimeZone|DateTimeZone|string|null $zone
+     * @param IntlTimeZone|DateTimeZone|string|null $timezone
      * @return bool|null
      * @alias datefmt_set_timezone
      */
-    public function setTimeZone($zone) {}
+    public function setTimeZone($timezone) {}
 
     /**
      * @return bool
@@ -82,7 +82,7 @@ class IntlDateFormatter
      * @return string|false
      * @alias datefmt_get_locale
      */
-    public function getLocale(int $which = ULOC_ACTUAL_LOCALE) {}
+    public function getLocale(int $type = ULOC_ACTUAL_LOCALE) {}
 
     /**
      * @return void
@@ -97,33 +97,33 @@ class IntlDateFormatter
     public function isLenient() {}
 
     /**
-     * @param IntlCalendar|DateTimeInterface|array|string|int|float $value
+     * @param IntlCalendar|DateTimeInterface|array|string|int|float $datetime
      * @return string|false
      * @alias datefmt_format
      */
-    public function format($value) {}
+    public function format($datetime) {}
 
     /**
-     * @param IntlCalendar|DateTime $object
+     * @param IntlCalendar|DateTime $datetime
      * @param array|int|string|null $format
      * @return string|false
      * @alias datefmt_format_object
      */
-    public static function formatObject($object, $format = null, ?string $locale = null) {}
+    public static function formatObject($datetime, $format = null, ?string $locale = null) {}
 
     /**
-     * @param int $position
+     * @param int $offset
      * @return int|float|false
      * @alias datefmt_parse
      */
-    public function parse(string $value, &$position = null) {}
+    public function parse(string $string, &$offset = null) {}
 
     /**
-     * @param int $position
+     * @param int $offset
      * @return array|false
      * @alias datefmt_localtime
      */
-    public function localtime(string $value, &$position = null) {}
+    public function localtime(string $string, &$offset = null) {}
 
     /**
      * @return int
diff --git a/ext/intl/dateformat/dateformat_arginfo.h b/ext/intl/dateformat/dateformat_arginfo.h
index 80e71abc09..d406fce6ed 100644
--- a/ext/intl/dateformat/dateformat_arginfo.h
+++ b/ext/intl/dateformat/dateformat_arginfo.h
@@ -1,10 +1,10 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 3a62c7f1ca8cddeb1cde1c0a9a889b5b841bc7cc */
+ * Stub hash: 437726f2d61a93d530e7e3b6df0741ae68c64697 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter___construct, 0, 0, 3)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO(0, datetype, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO(0, timetype, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, dateType, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, timeType, IS_LONG, 0)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, calendar, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 0, "\"\"")
@@ -12,8 +12,8 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_create, 0, 0, 3)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO(0, datetype, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO(0, timetype, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, dateType, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, timeType, IS_LONG, 0)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
 	ZEND_ARG_OBJ_TYPE_MASK(0, calendar, IntlCalendar, MAY_BE_LONG|MAY_BE_NULL, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 0, "\"\"")
@@ -27,7 +27,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_IntlDateFormatter_getCalendar arginfo_class_IntlDateFormatter_getDateType
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_setCalendar, 0, 0, 1)
-	ZEND_ARG_OBJ_TYPE_MASK(0, which, IntlCalendar, MAY_BE_LONG|MAY_BE_NULL, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, calendar, IntlCalendar, MAY_BE_LONG|MAY_BE_NULL, NULL)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlDateFormatter_getTimeZoneId arginfo_class_IntlDateFormatter_getDateType
@@ -37,7 +37,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_IntlDateFormatter_getTimeZone arginfo_class_IntlDateFormatter_getDateType
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_setTimeZone, 0, 0, 1)
-	ZEND_ARG_INFO(0, zone)
+	ZEND_ARG_INFO(0, timezone)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_setPattern, 0, 0, 1)
@@ -47,7 +47,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_IntlDateFormatter_getPattern arginfo_class_IntlDateFormatter_getDateType
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_getLocale, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, which, IS_LONG, 0, "ULOC_ACTUAL_LOCALE")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "ULOC_ACTUAL_LOCALE")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_setLenient, 0, 0, 1)
@@ -57,18 +57,18 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_IntlDateFormatter_isLenient arginfo_class_IntlDateFormatter_getDateType
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_format, 0, 0, 1)
-	ZEND_ARG_INFO(0, value)
+	ZEND_ARG_INFO(0, datetime)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_formatObject, 0, 0, 1)
-	ZEND_ARG_INFO(0, object)
+	ZEND_ARG_INFO(0, datetime)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, format, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_parse, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, position, "null")
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, offset, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlDateFormatter_localtime arginfo_class_IntlDateFormatter_parse
diff --git a/ext/intl/formatter/formatter.stub.php b/ext/intl/formatter/formatter.stub.php
index 8c4694e4ec..045b0640ce 100644
--- a/ext/intl/formatter/formatter.stub.php
+++ b/ext/intl/formatter/formatter.stub.php
@@ -16,64 +16,64 @@ class NumberFormatter
      * @return string|false
      * @alias numfmt_format
      */
-    public function format(int|float $value, int $type = NumberFormatter::TYPE_DEFAULT) {}
+    public function format(int|float $num, int $type = NumberFormatter::TYPE_DEFAULT) {}
 
     /**
-     * @param int $position
+     * @param int $offset
      * @return int|float|false
      * @alias numfmt_parse
      */
-    public function parse(string $value, int $type = NumberFormatter::TYPE_DOUBLE, &$position = null) {}
+    public function parse(string $string, int $type = NumberFormatter::TYPE_DOUBLE, &$offset = null) {}
 
     /**
      * @return string|false
      * @alias numfmt_format_currency
      */
-    public function formatCurrency(float $value, string $currency) {}
+    public function formatCurrency(float $amount, string $currency) {}
 
     /**
      * @param string $currency
-     * @param int $position
+     * @param int $offset
      * @return float|false
      * @alias numfmt_parse_currency
      */
-    public function parseCurrency(string $value, &$currency, &$position = null) {}
+    public function parseCurrency(string $string, &$currency, &$offset = null) {}
 
     /**
      * @return bool
      * @alias numfmt_set_attribute
      */
-    public function setAttribute(int $attr, int|float $value) {}
+    public function setAttribute(int $attribute, int|float $value) {}
 
     /**
      * @return int|float|false
      * @alias numfmt_get_attribute
      */
-    public function getAttribute(int $attr) {}
+    public function getAttribute(int $attribute) {}
 
     /**
      * @return bool
      * @alias numfmt_set_text_attribute
      */
-    public function setTextAttribute(int $attr, string $value) {}
+    public function setTextAttribute(int $attribute, string $value) {}
 
     /**
      * @return string|false
      * @alias numfmt_get_text_attribute
      */
-    public function getTextAttribute(int $attr) {}
+    public function getTextAttribute(int $attribute) {}
 
     /**
      * @return bool
      * @alias numfmt_set_symbol
      */
-    public function setSymbol(int $attr, string $value) {}
+    public function setSymbol(int $symbol, string $value) {}
 
     /**
      * @return string|false
      * @alias numfmt_get_symbol
      */
-    public function getSymbol(int $attr) {}
+    public function getSymbol(int $symbol) {}
 
     /**
      * @return bool
diff --git a/ext/intl/formatter/formatter_arginfo.h b/ext/intl/formatter/formatter_arginfo.h
index e0531bcc20..79f977fb81 100644
--- a/ext/intl/formatter/formatter_arginfo.h
+++ b/ext/intl/formatter/formatter_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 60a05cccb434edadeec01cb7d43f919c276ce24d */
+ * Stub hash: 0f285bbaa6f4f37060eb8325956f41bd86e9dea3 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
@@ -10,46 +10,51 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_NumberFormatter_create arginfo_class_NumberFormatter___construct
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_format, 0, 0, 1)
-	ZEND_ARG_TYPE_MASK(0, value, MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
+	ZEND_ARG_TYPE_MASK(0, num, MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "NumberFormatter::TYPE_DEFAULT")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_parse, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "NumberFormatter::TYPE_DOUBLE")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, position, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, offset, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_formatCurrency, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, value, IS_DOUBLE, 0)
+	ZEND_ARG_TYPE_INFO(0, amount, IS_DOUBLE, 0)
 	ZEND_ARG_TYPE_INFO(0, currency, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_parseCurrency, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_INFO(1, currency)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, position, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, offset, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_setAttribute, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
 	ZEND_ARG_TYPE_MASK(0, value, MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_getAttribute, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_setTextAttribute, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_NumberFormatter_getTextAttribute arginfo_class_NumberFormatter_getAttribute
 
-#define arginfo_class_NumberFormatter_setSymbol arginfo_class_NumberFormatter_setTextAttribute
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_setSymbol, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, symbol, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_NumberFormatter_getSymbol arginfo_class_NumberFormatter_getAttribute
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_getSymbol, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, symbol, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_setPattern, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
diff --git a/ext/intl/locale/locale.stub.php b/ext/intl/locale/locale.stub.php
index 8a23a291b0..e5703293c0 100644
--- a/ext/intl/locale/locale.stub.php
+++ b/ext/intl/locale/locale.stub.php
@@ -44,31 +44,31 @@ class Locale
      * @return string|false
      * @alias locale_get_display_script
      */
-    public static function getDisplayScript(string $locale, ?string $in_locale = null) {}
+    public static function getDisplayScript(string $locale, ?string $displayLocale = null) {}
 
     /**
      * @return string|false
      * @alias locale_get_display_region
      */
-    public static function getDisplayRegion(string $locale, ?string $in_locale = null) {}
+    public static function getDisplayRegion(string $locale, ?string $displayLocale = null) {}
 
     /**
      * @return string|false
      * @alias locale_get_display_name
      */
-    public static function getDisplayName(string $locale, ?string $in_locale = null) {}
+    public static function getDisplayName(string $locale, ?string $displayLocale = null) {}
 
     /**
      * @return string|false
      * @alias locale_get_display_language
      */
-    public static function getDisplayLanguage(string $locale, ?string $in_locale = null) {}
+    public static function getDisplayLanguage(string $locale, ?string $displayLocale = null) {}
 
     /**
      * @return string|false
      * @alias locale_get_display_variant
      */
-    public static function getDisplayVariant(string $locale, ?string $in_locale = null) {}
+    public static function getDisplayVariant(string $locale, ?string $displayLocale = null) {}
 
     /**
      * @return string|false
@@ -92,13 +92,13 @@ class Locale
      * @return bool|null
      * @alias locale_filter_matches
      */
-    public static function filterMatches(string $langtag, string $locale, bool $canonicalize = false) {}
+    public static function filterMatches(string $languageTag, string $locale, bool $canonicalize = false) {}
 
     /**
      * @return string|null
      * @alias locale_lookup
      */
-    public static function lookup(array $langtag, string $locale, bool $canonicalize = false, ?string $def = null) {}
+    public static function lookup(array $languageTag, string $locale, bool $canonicalize = false, ?string $defaultLocale = null) {}
 
     /**
      * @return string|null
diff --git a/ext/intl/locale/locale_arginfo.h b/ext/intl/locale/locale_arginfo.h
index 9a6e27d48d..e952146362 100644
--- a/ext/intl/locale/locale_arginfo.h
+++ b/ext/intl/locale/locale_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 6d010c8797cbf11f12f13ce37eb8b36633bdbafb */
+ * Stub hash: 4135dc9df49d3fe20275d49bad428a2e3e0a8752 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Locale_getDefault, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -18,7 +18,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Locale_getDisplayScript, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, in_locale, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, displayLocale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_Locale_getDisplayRegion arginfo_class_Locale_getDisplayScript
@@ -38,16 +38,16 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_Locale_getAllVariants arginfo_class_Locale_setDefault
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Locale_filterMatches, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, langtag, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, languageTag, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, canonicalize, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Locale_lookup, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, langtag, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(0, languageTag, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, canonicalize, _IS_BOOL, 0, "false")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, def, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, defaultLocale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_Locale_canonicalize arginfo_class_Locale_setDefault
diff --git a/ext/intl/msgformat/msgformat.stub.php b/ext/intl/msgformat/msgformat.stub.php
index a7fdb91a0c..a9a3e3e181 100644
--- a/ext/intl/msgformat/msgformat.stub.php
+++ b/ext/intl/msgformat/msgformat.stub.php
@@ -16,25 +16,25 @@ class MessageFormatter
      * @return string|false
      * @alias msgfmt_format
      */
-    public function format(array $args) {}
+    public function format(array $values) {}
 
     /**
      * @return string|false
      * @alias msgfmt_format_message
      */
-    public static function formatMessage(string $locale, string $pattern, array $args) {}
+    public static function formatMessage(string $locale, string $pattern, array $values) {}
 
     /**
      * @return array|false
      * @alias msgfmt_parse
      */
-    public function parse(string $value) {}
+    public function parse(string $string) {}
 
     /**
      * @return array|false
      * @alias msgfmt_parse_message
      */
-    public static function parseMessage(string $locale, string $pattern, string $source) {}
+    public static function parseMessage(string $locale, string $pattern, string $message) {}
 
     /**
      * @return bool
diff --git a/ext/intl/msgformat/msgformat_arginfo.h b/ext/intl/msgformat/msgformat_arginfo.h
index efbc1e7d69..3bad9aa498 100644
--- a/ext/intl/msgformat/msgformat_arginfo.h
+++ b/ext/intl/msgformat/msgformat_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: ffa9513a18a634b034b0490bc712d097dc8d36e8 */
+ * Stub hash: ece8c5157dc3a62ca2951d058b3c5497bb5cb836 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
@@ -9,23 +9,23 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_MessageFormatter_create arginfo_class_MessageFormatter___construct
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter_format, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, args, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(0, values, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter_formatMessage, 0, 0, 3)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, args, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(0, values, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter_parse, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter_parseMessage, 0, 0, 3)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter_setPattern, 0, 0, 1)
diff --git a/ext/intl/normalizer/normalizer.stub.php b/ext/intl/normalizer/normalizer.stub.php
index 797eb236b7..243ace532d 100644
--- a/ext/intl/normalizer/normalizer.stub.php
+++ b/ext/intl/normalizer/normalizer.stub.php
@@ -8,19 +8,19 @@ class Normalizer
      * @return string|false
      * @alias normalizer_normalize
      */
-    public static function normalize(string $input, int $form = Normalizer::FORM_C) {}
+    public static function normalize(string $string, int $form = Normalizer::FORM_C) {}
 
     /**
      * @return bool
      * @alias normalizer_is_normalized
      */
-    public static function isNormalized(string $input, int $form = Normalizer::FORM_C) {}
+    public static function isNormalized(string $string, int $form = Normalizer::FORM_C) {}
 
 #if U_ICU_VERSION_MAJOR_NUM >= 56
     /**
      * @return string|null
      * @alias normalizer_get_raw_decomposition
      */
-    public static function getRawDecomposition(string $input, int $form = Normalizer::FORM_C) {}
+    public static function getRawDecomposition(string $string, int $form = Normalizer::FORM_C) {}
 #endif
 }
diff --git a/ext/intl/normalizer/normalizer_arginfo.h b/ext/intl/normalizer/normalizer_arginfo.h
index 82006f52ea..cd5a41de60 100644
--- a/ext/intl/normalizer/normalizer_arginfo.h
+++ b/ext/intl/normalizer/normalizer_arginfo.h
@@ -1,8 +1,8 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a1f54793e243d30e75cefd4f9aea17f1509a9c8d */
+ * Stub hash: 3b9ef4888cc32bd009fb87db52859953902454fc */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Normalizer_normalize, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, form, IS_LONG, 0, "Normalizer::FORM_C")
 ZEND_END_ARG_INFO()
 
@@ -10,7 +10,7 @@ ZEND_END_ARG_INFO()
 
 #if U_ICU_VERSION_MAJOR_NUM >= 56
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Normalizer_getRawDecomposition, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, form, IS_LONG, 0, "Normalizer::FORM_C")
 ZEND_END_ARG_INFO()
 #endif
diff --git a/ext/intl/php_intl.stub.php b/ext/intl/php_intl.stub.php
index 08f0a45a28..6127ca05f9 100644
--- a/ext/intl/php_intl.stub.php
+++ b/ext/intl/php_intl.stub.php
@@ -4,10 +4,10 @@
 
 /* calendar */
 
-/** @param IntlTimeZone|DateTimeZone|string|null $timeZone */
-function intlcal_create_instance($timeZone = null, ?string $locale = null): ?IntlCalendar {}
+/** @param IntlTimeZone|DateTimeZone|string|null $timezone */
+function intlcal_create_instance($timezone = null, ?string $locale = null): ?IntlCalendar {}
 
-function intlcal_get_keyword_values_for_locale(string $key, string $locale, bool $commonlyUsed): IntlIterator|false {}
+function intlcal_get_keyword_values_for_locale(string $keyword, string $locale, bool $onlyCommon): IntlIterator|false {}
 
 function intlcal_get_now(): float {}
 
@@ -17,25 +17,25 @@ function intlcal_get(IntlCalendar $calendar, int $field): int {}
 
 function intlcal_get_time(IntlCalendar $calendar): float {}
 
-function intlcal_set_time(IntlCalendar $calendar, float $date): bool {}
+function intlcal_set_time(IntlCalendar $calendar, float $timestamp): bool {}
 
-function intlcal_add(IntlCalendar $calendar, int $field, int $amount): bool {}
+function intlcal_add(IntlCalendar $calendar, int $field, int $value): bool {}
 
-/** @param IntlTimeZone|DateTimeZone|string|null $timeZone */
-function intlcal_set_time_zone(IntlCalendar $calendar, $timeZone): bool {}
+/** @param IntlTimeZone|DateTimeZone|string|null $timezone */
+function intlcal_set_time_zone(IntlCalendar $calendar, $timezone): bool {}
 
-function intlcal_after(IntlCalendar $calendarObject, IntlCalendar $calendar): bool {}
+function intlcal_after(IntlCalendar $calendar, IntlCalendar $other): bool {}
 
-function intlcal_before(IntlCalendar $calendarObject, IntlCalendar $calendar): bool {}
+function intlcal_before(IntlCalendar $calendar, IntlCalendar $other): bool {}
 
 function intlcal_set(IntlCalendar $calendar, int $year, int $month, int $dayOfMonth = UNKNOWN, int $hour = UNKNOWN, int $minute = UNKNOWN, int $second = UNKNOWN): bool {}
 
-/** @param int|bool $amountOrUpOrDown */
-function intlcal_roll(IntlCalendar $calendar, int $field, $amountOrUpOrDown): bool {}
+/** @param int|bool $value */
+function intlcal_roll(IntlCalendar $calendar, int $field, $value): bool {}
 
 function intlcal_clear(IntlCalendar $calendar, ?int $field = null): bool {}
 
-function intlcal_field_difference(IntlCalendar $calendar, float $when, int $field): int {}
+function intlcal_field_difference(IntlCalendar $calendar, float $timestamp, int $field): int {}
 
 function intlcal_get_actual_maximum(IntlCalendar $calendar, int $field): int {}
 
@@ -49,13 +49,13 @@ function intlcal_get_least_maximum(IntlCalendar $calendar, int $field): int {}
 
 function intlcal_get_greatest_minimum(IntlCalendar $calendar, int $field): int {}
 
-function intlcal_get_locale(IntlCalendar $calendar, int $localeType): string {}
+function intlcal_get_locale(IntlCalendar $calendar, int $type): string {}
 
 function intlcal_get_maximum(IntlCalendar $calendar, int $field): int {}
 
 function intlcal_get_minimal_days_in_first_week(IntlCalendar $calendar): int {}
 
-function intlcal_set_minimal_days_in_first_week(IntlCalendar $calendar, int $numberOfDays): bool {}
+function intlcal_set_minimal_days_in_first_week(IntlCalendar $calendar, int $days): bool {}
 
 function intlcal_get_minimum(IntlCalendar $calendar, int $field): int {}
 
@@ -71,23 +71,23 @@ function intlcal_is_lenient(IntlCalendar $calendar): bool {}
 
 function intlcal_is_set(IntlCalendar $calendar, int $field): bool {}
 
-function intlcal_is_equivalent_to(IntlCalendar $calendarObject, IntlCalendar $calendar): bool {}
+function intlcal_is_equivalent_to(IntlCalendar $calendar, IntlCalendar $other): bool {}
 
-function intlcal_is_weekend(IntlCalendar $calendar, ?float $date = null): bool {}
+function intlcal_is_weekend(IntlCalendar $calendar, ?float $timestamp = null): bool {}
 
 function intlcal_set_first_day_of_week(IntlCalendar $calendar, int $dayOfWeek): bool {}
 
-function intlcal_set_lenient(IntlCalendar $calendar, bool $isLenient): bool {}
+function intlcal_set_lenient(IntlCalendar $calendar, bool $lenient): bool {}
 
 function intlcal_get_repeated_wall_time_option(IntlCalendar $calendar): int {}
 
-function intlcal_equals(IntlCalendar $calendarObject, IntlCalendar $calendar): bool {}
+function intlcal_equals(IntlCalendar $calendar, IntlCalendar $other): bool {}
 
 function intlcal_get_skipped_wall_time_option(IntlCalendar $calendar): int {}
 
-function intlcal_set_repeated_wall_time_option(IntlCalendar $calendar, int $wallTimeOption): bool {}
+function intlcal_set_repeated_wall_time_option(IntlCalendar $calendar, int $option): bool {}
 
-function intlcal_set_skipped_wall_time_option(IntlCalendar $calendar, int $wallTimeOption): bool {}
+function intlcal_set_skipped_wall_time_option(IntlCalendar $calendar, int $option): bool {}
 
 function intlcal_from_date_time(DateTime|string $dateTime, ?string $locale = null): ?IntlCalendar {}
 
@@ -98,16 +98,16 @@ function intlcal_get_error_code(IntlCalendar $calendar): int|false {}
 function intlcal_get_error_message(IntlCalendar $calendar): string|false {}
 
 /**
- * @param DateTimeZone|IntlTimeZone|string|int|null $timeZoneOrYear
+ * @param DateTimeZone|IntlTimeZone|string|int|null $timezoneOrYear
  * @param string|int|null $localeOrMonth
- * @param int $dayOfMonth
+ * @param int $day
  * @param int $hour
  * @param int $minute
  * @param int $second
  */
-function intlgregcal_create_instance($timeZoneOrYear = UNKNOWN, $localeOrMonth = UNKNOWN, $dayOfMonth = UNKNOWN, $hour = UNKNOWN, $minute = UNKNOWN, $second = UNKNOWN): ?IntlGregorianCalendar {}
+function intlgregcal_create_instance($timezoneOrYear = UNKNOWN, $localeOrMonth = UNKNOWN, $day = UNKNOWN, $hour = UNKNOWN, $minute = UNKNOWN, $second = UNKNOWN): ?IntlGregorianCalendar {}
 
-function intlgregcal_set_gregorian_change(IntlGregorianCalendar $calendar, float $change): bool {}
+function intlgregcal_set_gregorian_change(IntlGregorianCalendar $calendar, float $timestamp): bool {}
 
 function intlgregcal_get_gregorian_change(IntlGregorianCalendar $calendar): float {}
 
@@ -117,21 +117,21 @@ function intlgregcal_is_leap_year(IntlGregorianCalendar $calendar, int $year): b
 
 function collator_create(string $locale): ?Collator {}
 
-function collator_compare(Collator $object, string $str1, string $str2): int|false {}
+function collator_compare(Collator $object, string $string1, string $string2): int|false {}
 
-function collator_get_attribute(Collator $object, int $attr): int|false {}
+function collator_get_attribute(Collator $object, int $attribute): int|false {}
 
-function collator_set_attribute(Collator $object, int $attr, int $val): bool {}
+function collator_set_attribute(Collator $object, int $attribute, int $value): bool {}
 
 function collator_get_strength(Collator $object): int {}
 
 function collator_set_strength(Collator $object, int $strength): bool {}
 
-function collator_sort(Collator $object, array &$arr, int $sort_flag = Collator::SORT_REGULAR): bool {}
+function collator_sort(Collator $object, array &$array, int $flags = Collator::SORT_REGULAR): bool {}
 
-function collator_sort_with_sort_keys(Collator $object, array &$arr): bool {}
+function collator_sort_with_sort_keys(Collator $object, array &$array): bool {}
 
-function collator_asort(Collator $object, array &$arr, int $sort_flag = Collator::SORT_REGULAR): bool {}
+function collator_asort(Collator $object, array &$arr, int $flags = Collator::SORT_REGULAR): bool {}
 
 function collator_get_locale(Collator $object, int $type): string|false {}
 
@@ -139,7 +139,7 @@ function collator_get_error_code(Collator $object): int|false {}
 
 function collator_get_error_message(Collator $object): string|false {}
 
-function collator_get_sort_key(Collator $object, string $str): string|false {}
+function collator_get_sort_key(Collator $object, string $string): string|false {}
 
 /* common */
 
@@ -147,103 +147,103 @@ function intl_get_error_code(): int {}
 
 function intl_get_error_message(): string {}
 
-function intl_is_failure(int $error_code): bool {}
+function intl_is_failure(int $errorCode): bool {}
 
-function intl_error_name(int $error_code): string {}
+function intl_error_name(int $errorCode): string {}
 
 /* dateformat */
 
 /** @param IntlTimeZone|DateTimeZone|string|null $timezone */
-function datefmt_create(?string $locale, int $datetype, int $timetype, $timezone = null, IntlCalendar|int|null $calendar = null, string $pattern = ""): ?IntlDateFormatter {}
+function datefmt_create(?string $locale, int $dateType, int $timeType, $timezone = null, IntlCalendar|int|null $calendar = null, string $pattern = ""): ?IntlDateFormatter {}
 
-function datefmt_get_datetype(IntlDateFormatter $df): int|false {}
+function datefmt_get_datetype(IntlDateFormatter $formatter): int|false {}
 
-function datefmt_get_timetype(IntlDateFormatter $df): int|false {}
+function datefmt_get_timetype(IntlDateFormatter $formatter): int|false {}
 
-function datefmt_get_calendar(IntlDateFormatter $df): int|false {}
+function datefmt_get_calendar(IntlDateFormatter $formatter): int|false {}
 
-function datefmt_set_calendar(IntlDateFormatter $df, IntlCalendar|int|null $which): bool {}
+function datefmt_set_calendar(IntlDateFormatter $formatter, IntlCalendar|int|null $calendar): bool {}
 
-function datefmt_get_timezone_id(IntlDateFormatter $df): string|false {}
+function datefmt_get_timezone_id(IntlDateFormatter $formatter): string|false {}
 
-function datefmt_get_calendar_object(IntlDateFormatter $df): IntlCalendar|false|null {}
+function datefmt_get_calendar_object(IntlDateFormatter $formatter): IntlCalendar|false|null {}
 
-function datefmt_get_timezone(IntlDateFormatter $df): IntlTimeZone|false {}
+function datefmt_get_timezone(IntlDateFormatter $formatter): IntlTimeZone|false {}
 
-/** @param IntlTimeZone|DateTimeZone|string|null $zone */
-function datefmt_set_timezone(IntlDateFormatter $df, $zone): ?bool {}
+/** @param IntlTimeZone|DateTimeZone|string|null $timezone */
+function datefmt_set_timezone(IntlDateFormatter $formatter, $timezone): ?bool {}
 
-function datefmt_set_pattern(IntlDateFormatter $df, string $pattern): bool {}
+function datefmt_set_pattern(IntlDateFormatter $formatter, string $pattern): bool {}
 
-function datefmt_get_pattern(IntlDateFormatter $df): string|false {}
+function datefmt_get_pattern(IntlDateFormatter $formatter): string|false {}
 
-function datefmt_get_locale(IntlDateFormatter $df, int $which = ULOC_ACTUAL_LOCALE): string|false {}
+function datefmt_get_locale(IntlDateFormatter $formatter, int $type = ULOC_ACTUAL_LOCALE): string|false {}
 
-function datefmt_set_lenient(IntlDateFormatter $df, bool $lenient): void {}
+function datefmt_set_lenient(IntlDateFormatter $formatter, bool $lenient): void {}
 
-function datefmt_is_lenient(IntlDateFormatter $df): bool {}
+function datefmt_is_lenient(IntlDateFormatter $formatter): bool {}
 
-/** @param IntlCalendar|DateTimeInterface|array|string|int|float $value */
-function datefmt_format(IntlDateFormatter $df, $value): string|false {}
+/** @param IntlCalendar|DateTimeInterface|array|string|int|float $datetime */
+function datefmt_format(IntlDateFormatter $formatter, $datetime): string|false {}
 
 /**
- * @param IntlCalendar|DateTimeInterface $object
+ * @param IntlCalendar|DateTimeInterface $datetime
  * @param array|int|string|null $format
  */
-function datefmt_format_object($object, $format = null, ?string $locale = null): string|false {}
+function datefmt_format_object($datetime, $format = null, ?string $locale = null): string|false {}
 
-/** @param int $position */
-function datefmt_parse(IntlDateFormatter $df, string $value, &$position = null): int|float|false {}
+/** @param int $offset */
+function datefmt_parse(IntlDateFormatter $formatter, string $string, &$offset = null): int|float|false {}
 
-/** @param int $position */
-function datefmt_localtime(IntlDateFormatter $df, string $value, &$position = null): array|false {}
+/** @param int $offset */
+function datefmt_localtime(IntlDateFormatter $formatter, string $string, &$offset = null): array|false {}
 
-function datefmt_get_error_code(IntlDateFormatter $df): int {}
+function datefmt_get_error_code(IntlDateFormatter $formatter): int {}
 
-function datefmt_get_error_message(IntlDateFormatter $df): string {}
+function datefmt_get_error_message(IntlDateFormatter $formatter): string {}
 
 /* formatter */
 
 function numfmt_create(string $locale, int $style, string $pattern = ""): ?NumberFormatter {}
 
-function numfmt_format(NumberFormatter $fmt, int|float $value, int $type = NumberFormatter::TYPE_DEFAULT): string|false {}
+function numfmt_format(NumberFormatter $formatter, int|float $num, int $type = NumberFormatter::TYPE_DEFAULT): string|false {}
 
-/** @param int $position */
-function numfmt_parse(NumberFormatter $fmt, string $value, int $type = NumberFormatter::TYPE_DOUBLE, &$position = null): int|float|false {}
+/** @param int $offset */
+function numfmt_parse(NumberFormatter $formatter, string $string, int $type = NumberFormatter::TYPE_DOUBLE, &$offset = null): int|float|false {}
 
-function numfmt_format_currency(NumberFormatter $fmt, float $value, string $currency): string|false {}
+function numfmt_format_currency(NumberFormatter $formatter, float $amount, string $currency): string|false {}
 
 /**
  * @param string $currency
- * @param int $position
+ * @param int $offset
  */
-function numfmt_parse_currency(NumberFormatter $fmt, string $value, &$currency, &$position = null): float|false {}
+function numfmt_parse_currency(NumberFormatter $formatter, string $string, &$currency, &$offset = null): float|false {}
 
-function numfmt_set_attribute(NumberFormatter $fmt, int $attr, int|float $value): bool {}
+function numfmt_set_attribute(NumberFormatter $formatter, int $attribute, int|float $value): bool {}
 
-function numfmt_get_attribute(NumberFormatter $fmt, int $attr): int|float|false {}
+function numfmt_get_attribute(NumberFormatter $formatter, int $attribute): int|float|false {}
 
-function numfmt_set_text_attribute(NumberFormatter $fmt, int $attr, string $value): bool {}
+function numfmt_set_text_attribute(NumberFormatter $formatter, int $attribute, string $value): bool {}
 
-function numfmt_get_text_attribute(NumberFormatter $fmt, int $attr): string|false {}
+function numfmt_get_text_attribute(NumberFormatter $formatter, int $attribute): string|false {}
 
-function numfmt_set_symbol(NumberFormatter $fmt, int $attr, string $value): bool {}
+function numfmt_set_symbol(NumberFormatter $formatter, int $symbol, string $value): bool {}
 
-function numfmt_get_symbol(NumberFormatter $fmt, int $attr): string|false {}
+function numfmt_get_symbol(NumberFormatter $formatter, int $symbol): string|false {}
 
-function numfmt_set_pattern(NumberFormatter $fmt, string $pattern): bool {}
+function numfmt_set_pattern(NumberFormatter $formatter, string $pattern): bool {}
 
-function numfmt_get_pattern(NumberFormatter $fmt): string|false {}
+function numfmt_get_pattern(NumberFormatter $formatter): string|false {}
 
-function numfmt_get_locale(NumberFormatter $fmt, int $type = ULOC_ACTUAL_LOCALE): string|false {}
+function numfmt_get_locale(NumberFormatter $formatter, int $type = ULOC_ACTUAL_LOCALE): string|false {}
 
-function numfmt_get_error_code(NumberFormatter $fmt): int {}
+function numfmt_get_error_code(NumberFormatter $formatter): int {}
 
-function numfmt_get_error_message(NumberFormatter $fmt): string {}
+function numfmt_get_error_message(NumberFormatter $formatter): string {}
 
 /* grapheme */
 
-function grapheme_strlen(string $input): int|false|null {}
+function grapheme_strlen(string $string): int|false|null {}
 
 function grapheme_strpos(string $haystack, string $needle, int $offset = 0): int|false {}
 
@@ -253,29 +253,29 @@ function grapheme_strrpos(string $haystack, string $needle, int $offset = 0): in
 
 function grapheme_strripos(string $haystack, string $needle, int $offset = 0): int|false {}
 
-function grapheme_substr(string $string, int $start, ?int $length = null): string|false {}
+function grapheme_substr(string $string, int $offset, ?int $length = null): string|false {}
 
-function grapheme_strstr(string $haystack, string $needle, bool $before_needle = false): string|false {}
+function grapheme_strstr(string $haystack, string $needle, bool $beforeNeedle = false): string|false {}
 
-function grapheme_stristr(string $haystack, string $needle, bool $before_needle = false): string|false {}
+function grapheme_stristr(string $haystack, string $needle, bool $beforeNeedle = false): string|false {}
 
 /** @param int $next */
-function grapheme_extract(string $haystack, int $size, int $extract_type = GRAPHEME_EXTR_COUNT, int $start = 0, &$next = null): string|false {}
+function grapheme_extract(string $haystack, int $size, int $type = GRAPHEME_EXTR_COUNT, int $offset = 0, &$next = null): string|false {}
 
 /* idn */
 
 /** @param array $idna_info */
-function idn_to_ascii(string $domain, int $options = 0, int $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = null): string|false {}
+function idn_to_ascii(string $domain, int $flags = 0, int $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = null): string|false {}
 
 /** @param array $idna_info */
-function idn_to_utf8(string $domain, int $options = 0, int $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = null): string|false {}
+function idn_to_utf8(string $domain, int $flags = 0, int $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = null): string|false {}
 
 /* locale */
 
 
 function locale_get_default(): string {}
 
-function locale_set_default(string $name): bool {}
+function locale_set_default(string $locale): bool {}
 
 function locale_get_primary_language(string $locale): ?string {}
 
@@ -285,15 +285,15 @@ function locale_get_region(string $locale): ?string {}
 
 function locale_get_keywords(string $locale): array|false|null {}
 
-function locale_get_display_script(string $locale, ?string $in_locale = null): string|false {}
+function locale_get_display_script(string $locale, ?string $displayLocale = null): string|false {}
 
-function locale_get_display_region(string $locale, ?string $in_locale = null): string|false {}
+function locale_get_display_region(string $locale, ?string $displayLocale = null): string|false {}
 
-function locale_get_display_name(string $locale, ?string $in_locale = null): string|false {}
+function locale_get_display_name(string $locale, ?string $displayLocale = null): string|false {}
 
-function locale_get_display_language(string $locale, ?string $in_locale = null): string|false {}
+function locale_get_display_language(string $locale, ?string $displayLocale = null): string|false {}
 
-function locale_get_display_variant(string $locale, ?string $in_locale = null): string|false {}
+function locale_get_display_variant(string $locale, ?string $displayLocale = null): string|false {}
 
 function locale_compose(array $subtags): string|false {}
 
@@ -301,11 +301,11 @@ function locale_parse(string $locale): ?array {}
 
 function locale_get_all_variants(string $locale): ?array {}
 
-function locale_filter_matches(string $langtag, string $locale, bool $canonicalize = false): ?bool {}
+function locale_filter_matches(string $languageTag, string $locale, bool $canonicalize = false): ?bool {}
 
 function locale_canonicalize(string $locale): ?string {}
 
-function locale_lookup(array $langtag, string $locale, bool $canonicalize = false, ?string $def = null): ?string {}
+function locale_lookup(array $languageTag, string $locale, bool $canonicalize = false, ?string $defaultLocale = null): ?string {}
 
 function locale_accept_from_http(string $header): string|false {}
 
@@ -313,37 +313,37 @@ function locale_accept_from_http(string $header): string|false {}
 
 function msgfmt_create(string $locale, string $pattern): ?MessageFormatter {}
 
-function msgfmt_format(MessageFormatter $fmt, array $args): string|false {}
+function msgfmt_format(MessageFormatter $formatter, array $values): string|false {}
 
-function msgfmt_format_message(string $locale, string $pattern, array $args): string|false {}
+function msgfmt_format_message(string $locale, string $pattern, array $values): string|false {}
 
-function msgfmt_parse(MessageFormatter $fmt, string $value): array|false {}
+function msgfmt_parse(MessageFormatter $formatter, string $string): array|false {}
 
-function msgfmt_parse_message(string $locale, string $pattern, string $source): array|false {}
+function msgfmt_parse_message(string $locale, string $pattern, string $message): array|false {}
 
-function msgfmt_set_pattern(MessageFormatter $fmt, string $pattern): bool {}
+function msgfmt_set_pattern(MessageFormatter $formatter, string $pattern): bool {}
 
-function msgfmt_get_pattern(MessageFormatter $fmt): string|false {}
+function msgfmt_get_pattern(MessageFormatter $formatter): string|false {}
 
-function msgfmt_get_locale(MessageFormatter $fmt): string {}
+function msgfmt_get_locale(MessageFormatter $formatter): string {}
 
-function msgfmt_get_error_code(MessageFormatter $fmt): int {}
+function msgfmt_get_error_code(MessageFormatter $formatter): int {}
 
-function msgfmt_get_error_message(MessageFormatter $fmt): string {}
+function msgfmt_get_error_message(MessageFormatter $formatter): string {}
 
 /* normalizer */
 
-function normalizer_normalize(string $input, int $form = Normalizer::FORM_C): string|false {}
+function normalizer_normalize(string $string, int $form = Normalizer::FORM_C): string|false {}
 
-function normalizer_is_normalized(string $input, int $form = Normalizer::FORM_C): bool {}
+function normalizer_is_normalized(string $string, int $form = Normalizer::FORM_C): bool {}
 
 #if U_ICU_VERSION_MAJOR_NUM >= 56
-function normalizer_get_raw_decomposition(string $input, int $form = Normalizer::FORM_C): ?string {}
+function normalizer_get_raw_decomposition(string $string, int $form = Normalizer::FORM_C): ?string {}
 #endif
 
 /* resourceboundle */
 
-function resourcebundle_create(?string $locale, ?string $bundlename, bool $fallback = true): ?ResourceBundle {}
+function resourcebundle_create(?string $locale, ?string $bundle, bool $fallback = true): ?ResourceBundle {}
 
 /**
  * @param string|int $index
@@ -353,7 +353,7 @@ function resourcebundle_get(ResourceBundle $bundle, $index) {}
 
 function resourcebundle_count(ResourceBundle $bundle): int {}
 
-function resourcebundle_locales(string $bundlename): array|false {}
+function resourcebundle_locales(string $bundle): array|false {}
 
 function resourcebundle_get_error_code(ResourceBundle $bundle): int {}
 
@@ -361,7 +361,7 @@ function resourcebundle_get_error_message(ResourceBundle $bundle): string {}
 
 /* timezone */
 
-function intltz_count_equivalent_ids(string $zoneId): int|false {}
+function intltz_count_equivalent_ids(string $timezoneId): int|false {}
 
 function intltz_create_default(): IntlTimeZone {}
 
@@ -371,54 +371,54 @@ function intltz_create_default(): IntlTimeZone {}
  */
 function intltz_create_enumeration($countryOrRawOffset = null) {}
 
-function intltz_create_time_zone(string $zoneId): ?IntlTimeZone {}
+function intltz_create_time_zone(string $timezoneId): ?IntlTimeZone {}
 
-function intltz_create_time_zone_id_enumeration(int $zoneType, ?string $region = null, ?int $rawOffset = null): IntlIterator|false {}
+function intltz_create_time_zone_id_enumeration(int $type, ?string $region = null, ?int $rawOffset = null): IntlIterator|false {}
 
-function intltz_from_date_time_zone(DateTimeZone $zone): ?IntlTimeZone {}
+function intltz_from_date_time_zone(DateTimeZone $timezone): ?IntlTimeZone {}
 
-/** @param bool $isSystemID */
-function intltz_get_canonical_id(string $zoneId, &$isSystemID = null): string|false {}
+/** @param bool $isSystemId */
+function intltz_get_canonical_id(string $timezoneId, &$isSystemId = null): string|false {}
 
-function intltz_get_display_name(IntlTimeZone $tz, bool $isDaylight = false, int $style = IntlTimeZone::DISPLAY_LONG, ?string $locale = null): string|false {}
+function intltz_get_display_name(IntlTimeZone $timezone, bool $dst = false, int $style = IntlTimeZone::DISPLAY_LONG, ?string $locale = null): string|false {}
 
-function intltz_get_dst_savings(IntlTimeZone $tz): int {}
+function intltz_get_dst_savings(IntlTimeZone $timezone): int {}
 
-function intltz_get_equivalent_id(string $zoneId, int $index): string|false {}
+function intltz_get_equivalent_id(string $timezoneId, int $offset): string|false {}
 
-function intltz_get_error_code(IntlTimeZone $tz): int|false {}
+function intltz_get_error_code(IntlTimeZone $timezone): int|false {}
 
-function intltz_get_error_message(IntlTimeZone $tz): string|false {}
+function intltz_get_error_message(IntlTimeZone $timezone): string|false {}
 
 function intltz_get_gmt(): IntlTimeZone {}
 
-function intltz_get_id(IntlTimeZone $tz): string|false {}
+function intltz_get_id(IntlTimeZone $timezone): string|false {}
 
 /**
  * @param int $rawOffset
  * @param int $dstOffset
  */
-function intltz_get_offset(IntlTimeZone $tz, float $date, bool $local, &$rawOffset, &$dstOffset): bool {}
+function intltz_get_offset(IntlTimeZone $timezone, float $timestamp, bool $local, &$rawOffset, &$dstOffset): bool {}
 
-function intltz_get_raw_offset(IntlTimeZone $tz): int {}
+function intltz_get_raw_offset(IntlTimeZone $timezone): int {}
 
-function intltz_get_region(string $zoneId): string|false {}
+function intltz_get_region(string $timezoneId): string|false {}
 
 function intltz_get_tz_data_version(): string|false {}
 
 function intltz_get_unknown(): IntlTimeZone {}
 
 #if U_ICU_VERSION_MAJOR_NUM >= 52
-function intltz_get_windows_id(string $timezone): string|false {}
+function intltz_get_windows_id(string $timezoneId): string|false {}
 
-function intltz_get_id_for_windows_id(string $timezone, ?string $region = null): string|false {}
+function intltz_get_id_for_windows_id(string $timezoneId, ?string $region = null): string|false {}
 #endif
 
-function intltz_has_same_rules(IntlTimeZone $tz, IntlTimeZone $otherTimeZone): bool {}
+function intltz_has_same_rules(IntlTimeZone $timezone, IntlTimeZone $other): bool {}
 
-function intltz_to_date_time_zone(IntlTimeZone $tz): DateTimeZone|false {}
+function intltz_to_date_time_zone(IntlTimeZone $timezone): DateTimeZone|false {}
 
-function intltz_use_daylight_time(IntlTimeZone $tz): bool {}
+function intltz_use_daylight_time(IntlTimeZone $timezone): bool {}
 
 /* transliterator */
 
@@ -428,10 +428,10 @@ function transliterator_create_from_rules(string $rules, int $direction = Transl
 
 function transliterator_list_ids(): array|false {}
 
-function transliterator_create_inverse(Transliterator $orig_trans): ?Transliterator {}
+function transliterator_create_inverse(Transliterator $transliterator): ?Transliterator {}
 
-function transliterator_transliterate(Transliterator|string $transliterator, string $subject, int $start = 0, int $end = -1): string|false {}
+function transliterator_transliterate(Transliterator|string $transliterator, string $string, int $start = 0, int $end = -1): string|false {}
 
-function transliterator_get_error_code(Transliterator $trans): int|false {}
+function transliterator_get_error_code(Transliterator $transliterator): int|false {}
 
-function transliterator_get_error_message(Transliterator $trans): string|false {}
+function transliterator_get_error_message(Transliterator $transliterator): string|false {}
diff --git a/ext/intl/php_intl_arginfo.h b/ext/intl/php_intl_arginfo.h
index a319532c53..6bd615278b 100644
--- a/ext/intl/php_intl_arginfo.h
+++ b/ext/intl/php_intl_arginfo.h
@@ -1,15 +1,15 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: f9cf4cbb4f8f827689042cfa0524bae487ed6aaf */
+ * Stub hash: 8340252225ea91a68fe61657f20c08a1876949c8 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intlcal_create_instance, 0, 0, IntlCalendar, 1)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timeZone, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_intlcal_get_keyword_values_for_locale, 0, 3, IntlIterator, MAY_BE_FALSE)
-	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, keyword, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, commonlyUsed, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, onlyCommon, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get_now, 0, 0, IS_DOUBLE, 0)
@@ -29,23 +29,23 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_time, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
-	ZEND_ARG_TYPE_INFO(0, date, IS_DOUBLE, 0)
+	ZEND_ARG_TYPE_INFO(0, timestamp, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_add, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
 	ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO(0, amount, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_time_zone, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
-	ZEND_ARG_INFO(0, timeZone)
+	ZEND_ARG_INFO(0, timezone)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_after, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, calendarObject, IntlCalendar, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
+	ZEND_ARG_OBJ_INFO(0, other, IntlCalendar, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_intlcal_before arginfo_intlcal_after
@@ -63,7 +63,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_roll, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
 	ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
-	ZEND_ARG_INFO(0, amountOrUpOrDown)
+	ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_clear, 0, 1, _IS_BOOL, 0)
@@ -73,7 +73,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_field_difference, 0, 3, IS_LONG, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
-	ZEND_ARG_TYPE_INFO(0, when, IS_DOUBLE, 0)
+	ZEND_ARG_TYPE_INFO(0, timestamp, IS_DOUBLE, 0)
 	ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
@@ -96,7 +96,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get_locale, 0, 2, IS_STRING, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
-	ZEND_ARG_TYPE_INFO(0, localeType, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_intlcal_get_maximum arginfo_intlcal_get
@@ -105,7 +105,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_minimal_days_in_first_week, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
-	ZEND_ARG_TYPE_INFO(0, numberOfDays, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, days, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_intlcal_get_minimum arginfo_intlcal_get
@@ -135,7 +135,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_is_weekend, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, date, IS_DOUBLE, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timestamp, IS_DOUBLE, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_first_day_of_week, 0, 2, _IS_BOOL, 0)
@@ -145,7 +145,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_lenient, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
-	ZEND_ARG_TYPE_INFO(0, isLenient, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, lenient, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_intlcal_get_repeated_wall_time_option arginfo_intlcal_get_first_day_of_week
@@ -156,7 +156,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_repeated_wall_time_option, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
-	ZEND_ARG_TYPE_INFO(0, wallTimeOption, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_intlcal_set_skipped_wall_time_option arginfo_intlcal_set_repeated_wall_time_option
@@ -179,9 +179,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get_error_message, 0, 1,
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intlgregcal_create_instance, 0, 0, IntlGregorianCalendar, 1)
-	ZEND_ARG_INFO(0, timeZoneOrYear)
+	ZEND_ARG_INFO(0, timezoneOrYear)
 	ZEND_ARG_INFO(0, localeOrMonth)
-	ZEND_ARG_INFO(0, dayOfMonth)
+	ZEND_ARG_INFO(0, day)
 	ZEND_ARG_INFO(0, hour)
 	ZEND_ARG_INFO(0, minute)
 	ZEND_ARG_INFO(0, second)
@@ -189,7 +189,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlgregcal_set_gregorian_change, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlGregorianCalendar, 0)
-	ZEND_ARG_TYPE_INFO(0, change, IS_DOUBLE, 0)
+	ZEND_ARG_TYPE_INFO(0, timestamp, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlgregcal_get_gregorian_change, 0, 1, IS_DOUBLE, 0)
@@ -207,19 +207,19 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_collator_compare, 0, 3, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, object, Collator, 0)
-	ZEND_ARG_TYPE_INFO(0, str1, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, str2, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string1, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string2, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_collator_get_attribute, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, object, Collator, 0)
-	ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_collator_set_attribute, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, object, Collator, 0)
-	ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO(0, val, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_collator_get_strength, 0, 1, IS_LONG, 0)
@@ -233,16 +233,20 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_collator_sort, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, object, Collator, 0)
-	ZEND_ARG_TYPE_INFO(1, arr, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sort_flag, IS_LONG, 0, "Collator::SORT_REGULAR")
+	ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "Collator::SORT_REGULAR")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_collator_sort_with_sort_keys, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, object, Collator, 0)
-	ZEND_ARG_TYPE_INFO(1, arr, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_collator_asort arginfo_collator_sort
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_collator_asort, 0, 2, _IS_BOOL, 0)
+	ZEND_ARG_OBJ_INFO(0, object, Collator, 0)
+	ZEND_ARG_TYPE_INFO(1, arr, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "Collator::SORT_REGULAR")
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_collator_get_locale, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, object, Collator, 0)
@@ -259,7 +263,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_collator_get_sort_key, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, object, Collator, 0)
-	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intl_get_error_code, 0, 0, IS_LONG, 0)
@@ -269,24 +273,24 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intl_get_error_message, 0, 0, IS
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intl_is_failure, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO(0, error_code, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, errorCode, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intl_error_name, 0, 1, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, error_code, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, errorCode, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_datefmt_create, 0, 3, IntlDateFormatter, 1)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO(0, datetype, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO(0, timetype, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, dateType, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, timeType, IS_LONG, 0)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
 	ZEND_ARG_OBJ_TYPE_MASK(0, calendar, IntlCalendar, MAY_BE_LONG|MAY_BE_NULL, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 0, "\"\"")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_datefmt_get_datetype, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_datefmt_get_timetype arginfo_datefmt_get_datetype
@@ -294,77 +298,77 @@ ZEND_END_ARG_INFO()
 #define arginfo_datefmt_get_calendar arginfo_datefmt_get_datetype
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_datefmt_set_calendar, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, which, IntlCalendar, MAY_BE_LONG|MAY_BE_NULL, NULL)
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
+	ZEND_ARG_OBJ_TYPE_MASK(0, calendar, IntlCalendar, MAY_BE_LONG|MAY_BE_NULL, NULL)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_datefmt_get_timezone_id, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_datefmt_get_calendar_object, 0, 1, IntlCalendar, MAY_BE_FALSE|MAY_BE_NULL)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_datefmt_get_timezone, 0, 1, IntlTimeZone, MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_datefmt_set_timezone, 0, 2, _IS_BOOL, 1)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
-	ZEND_ARG_INFO(0, zone)
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
+	ZEND_ARG_INFO(0, timezone)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_datefmt_set_pattern, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_datefmt_get_pattern arginfo_datefmt_get_timezone_id
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_datefmt_get_locale, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, which, IS_LONG, 0, "ULOC_ACTUAL_LOCALE")
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "ULOC_ACTUAL_LOCALE")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_datefmt_set_lenient, 0, 2, IS_VOID, 0)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
 	ZEND_ARG_TYPE_INFO(0, lenient, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_datefmt_is_lenient, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_datefmt_format, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
-	ZEND_ARG_INFO(0, value)
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
+	ZEND_ARG_INFO(0, datetime)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_datefmt_format_object, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_INFO(0, object)
+	ZEND_ARG_INFO(0, datetime)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, format, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_datefmt_parse, 0, 2, MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
-	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, position, "null")
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, offset, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_datefmt_localtime, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
-	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, position, "null")
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, offset, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_datefmt_get_error_code, 0, 1, IS_LONG, 0)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_datefmt_get_error_message, 0, 1, IS_STRING, 0)
-	ZEND_ARG_OBJ_INFO(0, df, IntlDateFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, IntlDateFormatter, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_numfmt_create, 0, 2, NumberFormatter, 1)
@@ -374,81 +378,88 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_numfmt_create, 0, 2, NumberFormat
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_numfmt_format, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, fmt, NumberFormatter, 0)
-	ZEND_ARG_TYPE_MASK(0, value, MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
+	ZEND_ARG_TYPE_MASK(0, num, MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "NumberFormatter::TYPE_DEFAULT")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_numfmt_parse, 0, 2, MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, fmt, NumberFormatter, 0)
-	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "NumberFormatter::TYPE_DOUBLE")
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, position, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, offset, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_numfmt_format_currency, 0, 3, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, fmt, NumberFormatter, 0)
-	ZEND_ARG_TYPE_INFO(0, value, IS_DOUBLE, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
+	ZEND_ARG_TYPE_INFO(0, amount, IS_DOUBLE, 0)
 	ZEND_ARG_TYPE_INFO(0, currency, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_numfmt_parse_currency, 0, 3, MAY_BE_DOUBLE|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, fmt, NumberFormatter, 0)
-	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_INFO(1, currency)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, position, "null")
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, offset, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_numfmt_set_attribute, 0, 3, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, fmt, NumberFormatter, 0)
-	ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
 	ZEND_ARG_TYPE_MASK(0, value, MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_numfmt_get_attribute, 0, 2, MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, fmt, NumberFormatter, 0)
-	ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_numfmt_set_text_attribute, 0, 3, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, fmt, NumberFormatter, 0)
-	ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_numfmt_get_text_attribute, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, fmt, NumberFormatter, 0)
-	ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_numfmt_set_symbol arginfo_numfmt_set_text_attribute
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_numfmt_set_symbol, 0, 3, _IS_BOOL, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
+	ZEND_ARG_TYPE_INFO(0, symbol, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_numfmt_get_symbol arginfo_numfmt_get_text_attribute
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_numfmt_get_symbol, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
+	ZEND_ARG_TYPE_INFO(0, symbol, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_numfmt_set_pattern, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, fmt, NumberFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_numfmt_get_pattern, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, fmt, NumberFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_numfmt_get_locale, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, fmt, NumberFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "ULOC_ACTUAL_LOCALE")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_numfmt_get_error_code, 0, 1, IS_LONG, 0)
-	ZEND_ARG_OBJ_INFO(0, fmt, NumberFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_numfmt_get_error_message, 0, 1, IS_STRING, 0)
-	ZEND_ARG_OBJ_INFO(0, fmt, NumberFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, NumberFormatter, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_grapheme_strlen, 0, 1, MAY_BE_LONG|MAY_BE_FALSE|MAY_BE_NULL)
-	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_grapheme_strpos, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
@@ -465,14 +476,14 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_grapheme_substr, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, start, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_grapheme_strstr, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, haystack, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, needle, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, before_needle, _IS_BOOL, 0, "false")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, beforeNeedle, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
 #define arginfo_grapheme_stristr arginfo_grapheme_strstr
@@ -480,14 +491,14 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_grapheme_extract, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, haystack, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, extract_type, IS_LONG, 0, "GRAPHEME_EXTR_COUNT")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start, IS_LONG, 0, "0")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "GRAPHEME_EXTR_COUNT")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, next, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_idn_to_ascii, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, domain, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, variant, IS_LONG, 0, "INTL_IDNA_VARIANT_UTS46")
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, idna_info, "null")
 ZEND_END_ARG_INFO()
@@ -497,7 +508,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_locale_get_default arginfo_intl_get_error_message
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_locale_set_default, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_locale_get_primary_language, 0, 1, IS_STRING, 1)
@@ -514,7 +525,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_locale_get_display_script, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, in_locale, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, displayLocale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_locale_get_display_region arginfo_locale_get_display_script
@@ -536,7 +547,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_locale_get_all_variants arginfo_locale_parse
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_locale_filter_matches, 0, 2, _IS_BOOL, 1)
-	ZEND_ARG_TYPE_INFO(0, langtag, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, languageTag, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, canonicalize, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
@@ -544,10 +555,10 @@ ZEND_END_ARG_INFO()
 #define arginfo_locale_canonicalize arginfo_locale_get_primary_language
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_locale_lookup, 0, 2, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO(0, langtag, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(0, languageTag, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, canonicalize, _IS_BOOL, 0, "false")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, def, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, defaultLocale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_locale_accept_from_http, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
@@ -560,66 +571,66 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_msgfmt_create, 0, 2, MessageForma
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_msgfmt_format, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, fmt, MessageFormatter, 0)
-	ZEND_ARG_TYPE_INFO(0, args, IS_ARRAY, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, MessageFormatter, 0)
+	ZEND_ARG_TYPE_INFO(0, values, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_msgfmt_format_message, 0, 3, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, args, IS_ARRAY, 0)
+	ZEND_ARG_TYPE_INFO(0, values, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_msgfmt_parse, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, fmt, MessageFormatter, 0)
-	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, MessageFormatter, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_msgfmt_parse_message, 0, 3, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_msgfmt_set_pattern, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, fmt, MessageFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, MessageFormatter, 0)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_msgfmt_get_pattern, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, fmt, MessageFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, MessageFormatter, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_msgfmt_get_locale, 0, 1, IS_STRING, 0)
-	ZEND_ARG_OBJ_INFO(0, fmt, MessageFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, MessageFormatter, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_msgfmt_get_error_code, 0, 1, IS_LONG, 0)
-	ZEND_ARG_OBJ_INFO(0, fmt, MessageFormatter, 0)
+	ZEND_ARG_OBJ_INFO(0, formatter, MessageFormatter, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_msgfmt_get_error_message arginfo_msgfmt_get_locale
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_normalizer_normalize, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, form, IS_LONG, 0, "Normalizer::FORM_C")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_normalizer_is_normalized, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, form, IS_LONG, 0, "Normalizer::FORM_C")
 ZEND_END_ARG_INFO()
 
 #if U_ICU_VERSION_MAJOR_NUM >= 56
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_normalizer_get_raw_decomposition, 0, 1, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, form, IS_LONG, 0, "Normalizer::FORM_C")
 ZEND_END_ARG_INFO()
 #endif
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_resourcebundle_create, 0, 2, ResourceBundle, 1)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO(0, bundlename, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, bundle, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fallback, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
@@ -633,7 +644,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_resourcebundle_count, 0, 1, IS_L
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_resourcebundle_locales, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
-	ZEND_ARG_TYPE_INFO(0, bundlename, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, bundle, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_resourcebundle_get_error_code arginfo_resourcebundle_count
@@ -643,7 +654,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_resourcebundle_get_error_message
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intltz_count_equivalent_ids, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
-	ZEND_ARG_TYPE_INFO(0, zoneId, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intltz_create_default, 0, 0, IntlTimeZone, 0)
@@ -654,46 +665,46 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_intltz_create_enumeration, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intltz_create_time_zone, 0, 1, IntlTimeZone, 1)
-	ZEND_ARG_TYPE_INFO(0, zoneId, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_intltz_create_time_zone_id_enumeration, 0, 1, IntlIterator, MAY_BE_FALSE)
-	ZEND_ARG_TYPE_INFO(0, zoneType, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, region, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, rawOffset, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intltz_from_date_time_zone, 0, 1, IntlTimeZone, 1)
-	ZEND_ARG_OBJ_INFO(0, zone, DateTimeZone, 0)
+	ZEND_ARG_OBJ_INFO(0, timezone, DateTimeZone, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intltz_get_canonical_id, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_TYPE_INFO(0, zoneId, IS_STRING, 0)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, isSystemID, "null")
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, isSystemId, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intltz_get_display_name, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, tz, IntlTimeZone, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, isDaylight, _IS_BOOL, 0, "false")
+	ZEND_ARG_OBJ_INFO(0, timezone, IntlTimeZone, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dst, _IS_BOOL, 0, "false")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, style, IS_LONG, 0, "IntlTimeZone::DISPLAY_LONG")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intltz_get_dst_savings, 0, 1, IS_LONG, 0)
-	ZEND_ARG_OBJ_INFO(0, tz, IntlTimeZone, 0)
+	ZEND_ARG_OBJ_INFO(0, timezone, IntlTimeZone, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intltz_get_equivalent_id, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_TYPE_INFO(0, zoneId, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intltz_get_error_code, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, tz, IntlTimeZone, 0)
+	ZEND_ARG_OBJ_INFO(0, timezone, IntlTimeZone, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intltz_get_error_message, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, tz, IntlTimeZone, 0)
+	ZEND_ARG_OBJ_INFO(0, timezone, IntlTimeZone, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_intltz_get_gmt arginfo_intltz_create_default
@@ -701,8 +712,8 @@ ZEND_END_ARG_INFO()
 #define arginfo_intltz_get_id arginfo_intltz_get_error_message
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intltz_get_offset, 0, 5, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, tz, IntlTimeZone, 0)
-	ZEND_ARG_TYPE_INFO(0, date, IS_DOUBLE, 0)
+	ZEND_ARG_OBJ_INFO(0, timezone, IntlTimeZone, 0)
+	ZEND_ARG_TYPE_INFO(0, timestamp, IS_DOUBLE, 0)
 	ZEND_ARG_TYPE_INFO(0, local, _IS_BOOL, 0)
 	ZEND_ARG_INFO(1, rawOffset)
 	ZEND_ARG_INFO(1, dstOffset)
@@ -711,7 +722,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_intltz_get_raw_offset arginfo_intltz_get_dst_savings
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intltz_get_region, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_TYPE_INFO(0, zoneId, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intltz_get_tz_data_version, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
@@ -721,28 +732,28 @@ ZEND_END_ARG_INFO()
 
 #if U_ICU_VERSION_MAJOR_NUM >= 52
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intltz_get_windows_id, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_TYPE_INFO(0, timezone, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 #endif
 
 #if U_ICU_VERSION_MAJOR_NUM >= 52
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intltz_get_id_for_windows_id, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_TYPE_INFO(0, timezone, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, region, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 #endif
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intltz_has_same_rules, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, tz, IntlTimeZone, 0)
-	ZEND_ARG_OBJ_INFO(0, otherTimeZone, IntlTimeZone, 0)
+	ZEND_ARG_OBJ_INFO(0, timezone, IntlTimeZone, 0)
+	ZEND_ARG_OBJ_INFO(0, other, IntlTimeZone, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_intltz_to_date_time_zone, 0, 1, DateTimeZone, MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, tz, IntlTimeZone, 0)
+	ZEND_ARG_OBJ_INFO(0, timezone, IntlTimeZone, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intltz_use_daylight_time, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, tz, IntlTimeZone, 0)
+	ZEND_ARG_OBJ_INFO(0, timezone, IntlTimeZone, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_transliterator_create, 0, 1, Transliterator, 1)
@@ -759,22 +770,22 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_transliterator_list_ids, 0, 0, M
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_transliterator_create_inverse, 0, 1, Transliterator, 1)
-	ZEND_ARG_OBJ_INFO(0, orig_trans, Transliterator, 0)
+	ZEND_ARG_OBJ_INFO(0, transliterator, Transliterator, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_transliterator_transliterate, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_OBJ_TYPE_MASK(0, transliterator, Transliterator, MAY_BE_STRING, NULL)
-	ZEND_ARG_TYPE_INFO(0, subject, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start, IS_LONG, 0, "0")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, end, IS_LONG, 0, "-1")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_transliterator_get_error_code, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, trans, Transliterator, 0)
+	ZEND_ARG_OBJ_INFO(0, transliterator, Transliterator, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_transliterator_get_error_message, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, trans, Transliterator, 0)
+	ZEND_ARG_OBJ_INFO(0, transliterator, Transliterator, 0)
 ZEND_END_ARG_INFO()
 
 
diff --git a/ext/intl/resourcebundle/resourcebundle.stub.php b/ext/intl/resourcebundle/resourcebundle.stub.php
index 6f91893bf3..fccd65e3df 100644
--- a/ext/intl/resourcebundle/resourcebundle.stub.php
+++ b/ext/intl/resourcebundle/resourcebundle.stub.php
@@ -4,13 +4,13 @@
 
 class ResourceBundle implements IteratorAggregate, Countable
 {
-    public function __construct(?string $locale, ?string $bundlename, bool $fallback = true) {}
+    public function __construct(?string $locale, ?string $bundle, bool $fallback = true) {}
 
     /**
      * @return ResourceBundle|null
      * @alias resourcebundle_create
      */
-    public static function create(?string $locale, ?string $bundlename, bool $fallback = true) {}
+    public static function create(?string $locale, ?string $bundle, bool $fallback = true) {}
 
     /**
      * @param string|int $index
@@ -29,7 +29,7 @@ class ResourceBundle implements IteratorAggregate, Countable
      * @return array|false
      * @alias resourcebundle_locales
      */
-    public static function getLocales(string $bundlename) {}
+    public static function getLocales(string $bundle) {}
 
     /**
      * @return int
diff --git a/ext/intl/resourcebundle/resourcebundle_arginfo.h b/ext/intl/resourcebundle/resourcebundle_arginfo.h
index 066dca2d88..fca8a23104 100644
--- a/ext/intl/resourcebundle/resourcebundle_arginfo.h
+++ b/ext/intl/resourcebundle/resourcebundle_arginfo.h
@@ -1,9 +1,9 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 9f811912b4a466a87477883abed02f998380481a */
+ * Stub hash: ba5e5a57404b44d2be662e9a6b5abb1a44ccfb22 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ResourceBundle___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO(0, bundlename, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, bundle, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fallback, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
@@ -18,7 +18,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ResourceBundle_count, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ResourceBundle_getLocales, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, bundlename, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, bundle, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_ResourceBundle_getErrorCode arginfo_class_ResourceBundle_count
diff --git a/ext/intl/spoofchecker/spoofchecker.stub.php b/ext/intl/spoofchecker/spoofchecker.stub.php
index b3f7159979..4fdd49473c 100644
--- a/ext/intl/spoofchecker/spoofchecker.stub.php
+++ b/ext/intl/spoofchecker/spoofchecker.stub.php
@@ -7,19 +7,19 @@ class Spoofchecker
     public function __construct() {}
 
     /**
-     * @param int $error
+     * @param int $errorCode
      * @return bool
      */
-    public function isSuspicious(string $text, &$error = null) {}
+    public function isSuspicious(string $string, &$errorCode = null) {}
 
     /**
-     * @param int $error
+     * @param int $errorCode
      * @return bool
      */
-    public function areConfusable(string $s1, string $s2, &$error = null) {}
+    public function areConfusable(string $string1, string $string2, &$errorCode = null) {}
 
     /** @return void */
-    public function setAllowedLocales(string $locale_list) {}
+    public function setAllowedLocales(string $locales) {}
 
     /** @return void */
     public function setChecks(int $checks) {}
diff --git a/ext/intl/spoofchecker/spoofchecker_arginfo.h b/ext/intl/spoofchecker/spoofchecker_arginfo.h
index 925195fcda..6079794fdf 100644
--- a/ext/intl/spoofchecker/spoofchecker_arginfo.h
+++ b/ext/intl/spoofchecker/spoofchecker_arginfo.h
@@ -1,22 +1,22 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 5f4ea7ab66c1748a8de076fca4b62a7d0a235598 */
+ * Stub hash: 10c330c8e06dbe21833f9c556b005fde2ea0ab42 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker_isSuspicious, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, text, IS_STRING, 0)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, error, "null")
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, errorCode, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker_areConfusable, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, s1, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, s2, IS_STRING, 0)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, error, "null")
+	ZEND_ARG_TYPE_INFO(0, string1, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string2, IS_STRING, 0)
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, errorCode, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker_setAllowedLocales, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, locale_list, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, locales, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker_setChecks, 0, 0, 1)
diff --git a/ext/intl/tests/breakiter___construct_error.phpt b/ext/intl/tests/breakiter___construct_error.phpt
index a92d4a3ca8..2deb7f4f0d 100644
--- a/ext/intl/tests/breakiter___construct_error.phpt
+++ b/ext/intl/tests/breakiter___construct_error.phpt
@@ -50,7 +50,7 @@ Exception: IntlRuleBasedBreakIterator::__construct() expects at least 1 argument
 
 Exception: IntlRuleBasedBreakIterator::__construct() expects at most 2 arguments, 3 given in %s on line %d
 
-Exception: IntlRuleBasedBreakIterator::__construct(): Argument #2 ($areCompiled) must be of type bool, array given in %s on line %d
+Exception: IntlRuleBasedBreakIterator::__construct(): Argument #2 ($compiled) must be of type bool, array given in %s on line %d
 
 Exception: IntlRuleBasedBreakIterator::__construct(): unable to create instance from compiled rules in %s on line %d
 
diff --git a/ext/intl/tests/breakiter_getPartsIterator_error.phpt b/ext/intl/tests/breakiter_getPartsIterator_error.phpt
index cd518b19d4..e3667afabf 100644
--- a/ext/intl/tests/breakiter_getPartsIterator_error.phpt
+++ b/ext/intl/tests/breakiter_getPartsIterator_error.phpt
@@ -18,4 +18,4 @@ try {
 
 ?>
 --EXPECT--
-IntlBreakIterator::getPartsIterator(): Argument #1 ($key_type) must be one of IntlPartsIterator::KEY_SEQUENTIAL, IntlPartsIterator::KEY_LEFT, or IntlPartsIterator::KEY_RIGHT
+IntlBreakIterator::getPartsIterator(): Argument #1 ($type) must be one of IntlPartsIterator::KEY_SEQUENTIAL, IntlPartsIterator::KEY_LEFT, or IntlPartsIterator::KEY_RIGHT
diff --git a/ext/intl/tests/bug48227.phpt b/ext/intl/tests/bug48227.phpt
index d44b5fc282..11f89df535 100644
--- a/ext/intl/tests/bug48227.phpt
+++ b/ext/intl/tests/bug48227.phpt
@@ -16,7 +16,7 @@ foreach (['', 1, NULL, $x] as $value) {
 
 ?>
 --EXPECT--
-NumberFormatter::format(): Argument #1 ($value) must be of type int|float, string given
+NumberFormatter::format(): Argument #1 ($num) must be of type int|float, string given
 string(1) "1"
 string(1) "0"
-NumberFormatter::format(): Argument #1 ($value) must be of type int|float, NumberFormatter given
+NumberFormatter::format(): Argument #1 ($num) must be of type int|float, NumberFormatter given
diff --git a/ext/intl/tests/bug62083.phpt b/ext/intl/tests/bug62083.phpt
index 9896cea79f..4f08af698a 100644
--- a/ext/intl/tests/bug62083.phpt
+++ b/ext/intl/tests/bug62083.phpt
@@ -14,4 +14,4 @@ try {
 }
 ?>
 --EXPECT--
-grapheme_extract(): Argument #3 ($extract_type) must be one of GRAPHEME_EXTR_COUNT, GRAPHEME_EXTR_MAXBYTES, or GRAPHEME_EXTR_MAXCHARS
+grapheme_extract(): Argument #3 ($type) must be one of GRAPHEME_EXTR_COUNT, GRAPHEME_EXTR_MAXBYTES, or GRAPHEME_EXTR_MAXCHARS
diff --git a/ext/intl/tests/calendar_before_after_error.phpt b/ext/intl/tests/calendar_before_after_error.phpt
index 850e59128d..1fb4ad0242 100644
--- a/ext/intl/tests/calendar_before_after_error.phpt
+++ b/ext/intl/tests/calendar_before_after_error.phpt
@@ -66,9 +66,9 @@ error: 0, IntlCalendar::after() expects exactly 1 argument, 0 given
 
 error: 0, IntlCalendar::before() expects exactly 1 argument, 0 given
 
-error: 0, IntlCalendar::after(): Argument #1 ($calendar) must be of type IntlCalendar, int given
+error: 0, IntlCalendar::after(): Argument #1 ($other) must be of type IntlCalendar, int given
 
-error: 0, IntlCalendar::before(): Argument #1 ($calendar) must be of type IntlCalendar, int given
+error: 0, IntlCalendar::before(): Argument #1 ($other) must be of type IntlCalendar, int given
 
 error: 0, IntlCalendar::after() expects exactly 1 argument, 2 given
 
diff --git a/ext/intl/tests/calendar_equals_error.phpt b/ext/intl/tests/calendar_equals_error.phpt
index f2ea3fefd0..57fe9ec9d5 100644
--- a/ext/intl/tests/calendar_equals_error.phpt
+++ b/ext/intl/tests/calendar_equals_error.phpt
@@ -48,10 +48,10 @@ try {
 --EXPECT--
 error: 0, IntlCalendar::equals() expects exactly 1 argument, 0 given
 
-error: 0, IntlCalendar::equals(): Argument #1 ($calendar) must be of type IntlCalendar, stdClass given
+error: 0, IntlCalendar::equals(): Argument #1 ($other) must be of type IntlCalendar, stdClass given
 
 error: 0, IntlCalendar::equals() expects exactly 1 argument, 2 given
 
-error: 0, intlcal_equals(): Argument #2 ($calendar) must be of type IntlCalendar, array given
+error: 0, intlcal_equals(): Argument #2 ($other) must be of type IntlCalendar, array given
 
-error: 0, intlcal_equals(): Argument #1 ($calendarObject) must be of type IntlCalendar, int given
+error: 0, intlcal_equals(): Argument #1 ($calendar) must be of type IntlCalendar, int given
diff --git a/ext/intl/tests/calendar_isEquivalentTo_error.phpt b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
index 33e5d415ce..df129869b5 100644
--- a/ext/intl/tests/calendar_isEquivalentTo_error.phpt
+++ b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
@@ -50,14 +50,14 @@ try {
 }
 ?>
 --EXPECT--
-error: 0, IntlCalendar::isEquivalentTo(): Argument #1 ($calendar) must be of type IntlCalendar, int given
+error: 0, IntlCalendar::isEquivalentTo(): Argument #1 ($other) must be of type IntlCalendar, int given
 
 error: 0, IntlCalendar::isEquivalentTo() expects exactly 1 argument, 2 given
 
-error: 0, IntlCalendar::isEquivalentTo(): Argument #1 ($calendar) must be of type IntlCalendar, int given
+error: 0, IntlCalendar::isEquivalentTo(): Argument #1 ($other) must be of type IntlCalendar, int given
 
 error: 0, intlcal_is_equivalent_to() expects exactly 2 arguments, 1 given
 
-error: 0, intlcal_is_equivalent_to(): Argument #2 ($calendar) must be of type IntlCalendar, int given
+error: 0, intlcal_is_equivalent_to(): Argument #2 ($other) must be of type IntlCalendar, int given
 
-error: 0, intlcal_is_equivalent_to(): Argument #1 ($calendarObject) must be of type IntlCalendar, int given
+error: 0, intlcal_is_equivalent_to(): Argument #1 ($calendar) must be of type IntlCalendar, int given
diff --git a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
index 8d4cf161ea..14dc2a6a53 100644
--- a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
@@ -30,6 +30,6 @@ try {
 
 ?>
 --EXPECT--
-IntlCalendar::setMinimalDaysInFirstWeek(): Argument #1 ($numberOfDays) must be between 1 and 7
-intlcal_set_minimal_days_in_first_week(): Argument #2 ($numberOfDays) must be between 1 and 7
+IntlCalendar::setMinimalDaysInFirstWeek(): Argument #1 ($days) must be between 1 and 7
+intlcal_set_minimal_days_in_first_week(): Argument #2 ($days) must be between 1 and 7
 intlcal_set_minimal_days_in_first_week(): Argument #1 ($calendar) must be of type IntlCalendar, int given
diff --git a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
index 40224bed15..6e72d1e7b8 100644
--- a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
@@ -30,6 +30,6 @@ try {
 }
 ?>
 --EXPECT--
-IntlCalendar::setSkippedWallTimeOption(): Argument #1 ($wallTimeOption) must be one of IntlCalendar::WALLTIME_FIRST, IntlCalendar::WALLTIME_LAST, or IntlCalendar::WALLTIME_NEXT_VALID
-IntlCalendar::setRepeatedWallTimeOption(): Argument #1 ($wallTimeOption) must be either IntlCalendar::WALLTIME_FIRST or IntlCalendar::WALLTIME_LAST
+IntlCalendar::setSkippedWallTimeOption(): Argument #1 ($option) must be one of IntlCalendar::WALLTIME_FIRST, IntlCalendar::WALLTIME_LAST, or IntlCalendar::WALLTIME_NEXT_VALID
+IntlCalendar::setRepeatedWallTimeOption(): Argument #1 ($option) must be either IntlCalendar::WALLTIME_FIRST or IntlCalendar::WALLTIME_LAST
 intlcal_set_repeated_wall_time_option(): Argument #1 ($calendar) must be of type IntlCalendar, int given
diff --git a/ext/intl/tests/locale/bug74993.phpt b/ext/intl/tests/locale/bug74993.phpt
index 67cc101993..40e3eb80a8 100644
--- a/ext/intl/tests/locale/bug74993.phpt
+++ b/ext/intl/tests/locale/bug74993.phpt
@@ -24,7 +24,7 @@ Function [ <internal:intl> function locale_get_display_language ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> string $locale ]
-    Parameter #1 [ <optional> ?string $in_locale = null ]
+    Parameter #1 [ <optional> ?string $displayLocale = null ]
   }
   - Return [ string|false ]
 }
@@ -32,7 +32,7 @@ Function [ <internal:intl> function locale_get_display_name ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> string $locale ]
-    Parameter #1 [ <optional> ?string $in_locale = null ]
+    Parameter #1 [ <optional> ?string $displayLocale = null ]
   }
   - Return [ string|false ]
 }
@@ -40,7 +40,7 @@ Function [ <internal:intl> function locale_get_display_region ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> string $locale ]
-    Parameter #1 [ <optional> ?string $in_locale = null ]
+    Parameter #1 [ <optional> ?string $displayLocale = null ]
   }
   - Return [ string|false ]
 }
@@ -48,7 +48,7 @@ Function [ <internal:intl> function locale_get_display_script ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> string $locale ]
-    Parameter #1 [ <optional> ?string $in_locale = null ]
+    Parameter #1 [ <optional> ?string $displayLocale = null ]
   }
   - Return [ string|false ]
 }
@@ -56,14 +56,14 @@ Function [ <internal:intl> function locale_get_display_variant ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> string $locale ]
-    Parameter #1 [ <optional> ?string $in_locale = null ]
+    Parameter #1 [ <optional> ?string $displayLocale = null ]
   }
   - Return [ string|false ]
 }
 Function [ <internal:intl> function locale_filter_matches ] {
 
   - Parameters [3] {
-    Parameter #0 [ <required> string $langtag ]
+    Parameter #0 [ <required> string $languageTag ]
     Parameter #1 [ <required> string $locale ]
     Parameter #2 [ <optional> bool $canonicalize = false ]
   }
@@ -72,10 +72,10 @@ Function [ <internal:intl> function locale_filter_matches ] {
 Function [ <internal:intl> function locale_lookup ] {
 
   - Parameters [4] {
-    Parameter #0 [ <required> array $langtag ]
+    Parameter #0 [ <required> array $languageTag ]
     Parameter #1 [ <required> string $locale ]
     Parameter #2 [ <optional> bool $canonicalize = false ]
-    Parameter #3 [ <optional> ?string $def = null ]
+    Parameter #3 [ <optional> ?string $defaultLocale = null ]
   }
   - Return [ ?string ]
 }
diff --git a/ext/intl/tests/timezone_getDSTSavings_error.phpt b/ext/intl/tests/timezone_getDSTSavings_error.phpt
index d6879597c3..1e19db2479 100644
--- a/ext/intl/tests/timezone_getDSTSavings_error.phpt
+++ b/ext/intl/tests/timezone_getDSTSavings_error.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
 var_dump(intltz_get_dst_savings(null));
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: intltz_get_dst_savings(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_get_dst_savings(): Argument #1 ($timezone) must be of type IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_get_dst_savings(NULL)
 #1 {main}
diff --git a/ext/intl/tests/timezone_getDisplayName_error.phpt b/ext/intl/tests/timezone_getDisplayName_error.phpt
index b38e305e6d..0a5bb02499 100644
--- a/ext/intl/tests/timezone_getDisplayName_error.phpt
+++ b/ext/intl/tests/timezone_getDisplayName_error.phpt
@@ -17,7 +17,7 @@ var_dump(intltz_get_display_name(null, IntlTimeZone::DISPLAY_SHORT, false, 'pt_P
 Warning: IntlTimeZone::getDisplayName(): intltz_get_display_name: wrong display type in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: intltz_get_display_name(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_get_display_name(): Argument #1 ($timezone) must be of type IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_get_display_name(NULL, 1, false, 'pt_PT')
 #1 {main}
diff --git a/ext/intl/tests/timezone_getErrorCode_error.phpt b/ext/intl/tests/timezone_getErrorCode_error.phpt
index c44a910726..3de68f863f 100644
--- a/ext/intl/tests/timezone_getErrorCode_error.phpt
+++ b/ext/intl/tests/timezone_getErrorCode_error.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
 var_dump(intltz_get_error_code(null));
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: intltz_get_error_code(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_get_error_code(): Argument #1 ($timezone) must be of type IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_get_error_code(NULL)
 #1 {main}
diff --git a/ext/intl/tests/timezone_getErrorMessage_error.phpt b/ext/intl/tests/timezone_getErrorMessage_error.phpt
index fb252415c8..152b3c6fa1 100644
--- a/ext/intl/tests/timezone_getErrorMessage_error.phpt
+++ b/ext/intl/tests/timezone_getErrorMessage_error.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
 var_dump(intltz_get_error_message(null));
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: intltz_get_error_message(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_get_error_message(): Argument #1 ($timezone) must be of type IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_get_error_message(NULL)
 #1 {main}
diff --git a/ext/intl/tests/timezone_getID_error.phpt b/ext/intl/tests/timezone_getID_error.phpt
index 5ec090159c..f6fb24629d 100644
--- a/ext/intl/tests/timezone_getID_error.phpt
+++ b/ext/intl/tests/timezone_getID_error.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
 intltz_get_id(null);
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: intltz_get_id(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_get_id(): Argument #1 ($timezone) must be of type IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_get_id(NULL)
 #1 {main}
diff --git a/ext/intl/tests/timezone_getOffset_error.phpt b/ext/intl/tests/timezone_getOffset_error.phpt
index d236c15170..e5268906ac 100644
--- a/ext/intl/tests/timezone_getOffset_error.phpt
+++ b/ext/intl/tests/timezone_getOffset_error.phpt
@@ -23,7 +23,7 @@ intltz_get_offset(null, time()*1000, false, $a, $a);
 Warning: IntlTimeZone::getOffset(): intltz_get_offset: error obtaining offset in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: intltz_get_offset(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_get_offset(): Argument #1 ($timezone) must be of type IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_get_offset(NULL, %d, false, NULL, NULL)
 #1 {main}
diff --git a/ext/intl/tests/timezone_getRawOffset_error.phpt b/ext/intl/tests/timezone_getRawOffset_error.phpt
index 3c9c463ec7..c0188898b8 100644
--- a/ext/intl/tests/timezone_getRawOffset_error.phpt
+++ b/ext/intl/tests/timezone_getRawOffset_error.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
 intltz_get_raw_offset(null);
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: intltz_get_raw_offset(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_get_raw_offset(): Argument #1 ($timezone) must be of type IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_get_raw_offset(NULL)
 #1 {main}
diff --git a/ext/intl/tests/timezone_hasSameRules_error.phpt b/ext/intl/tests/timezone_hasSameRules_error.phpt
index a3f59f73ea..a05f7cb5b4 100644
--- a/ext/intl/tests/timezone_hasSameRules_error.phpt
+++ b/ext/intl/tests/timezone_hasSameRules_error.phpt
@@ -32,7 +32,7 @@ try {
 ?>
 --EXPECT--
 int(0)
-string(101) "IntlTimeZone::hasSameRules(): Argument #1 ($otherTimeZone) must be of type IntlTimeZone, string given"
+string(93) "IntlTimeZone::hasSameRules(): Argument #1 ($other) must be of type IntlTimeZone, string given"
 
 int(0)
-string(83) "intltz_has_same_rules(): Argument #1 ($tz) must be of type IntlTimeZone, null given"
+string(89) "intltz_has_same_rules(): Argument #1 ($timezone) must be of type IntlTimeZone, null given"
diff --git a/ext/intl/tests/timezone_toDateTimeZone_error.phpt b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
index 83c422a143..1930c43e4a 100644
--- a/ext/intl/tests/timezone_toDateTimeZone_error.phpt
+++ b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
@@ -22,7 +22,7 @@ var_dump(intltz_to_date_time_zone(1));
 Warning: IntlTimeZone::toDateTimeZone(): intltz_to_date_time_zone: DateTimeZone constructor threw exception in %s on line %d
 string(66) "DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)"
 
-Fatal error: Uncaught TypeError: intltz_to_date_time_zone(): Argument #1 ($tz) must be of type IntlTimeZone, int given in %s:%d
+Fatal error: Uncaught TypeError: intltz_to_date_time_zone(): Argument #1 ($timezone) must be of type IntlTimeZone, int given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_to_date_time_zone(1)
 #1 {main}
diff --git a/ext/intl/tests/timezone_useDaylightTime_error.phpt b/ext/intl/tests/timezone_useDaylightTime_error.phpt
index 72cebfe7e5..176b41a629 100644
--- a/ext/intl/tests/timezone_useDaylightTime_error.phpt
+++ b/ext/intl/tests/timezone_useDaylightTime_error.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
 intltz_use_daylight_time(null);
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: intltz_use_daylight_time(): Argument #1 ($tz) must be of type IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: intltz_use_daylight_time(): Argument #1 ($timezone) must be of type IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_use_daylight_time(NULL)
 #1 {main}
diff --git a/ext/intl/tests/transliterator_create_inverse_error.phpt b/ext/intl/tests/transliterator_create_inverse_error.phpt
index a93554043d..7a54ca133c 100644
--- a/ext/intl/tests/transliterator_create_inverse_error.phpt
+++ b/ext/intl/tests/transliterator_create_inverse_error.phpt
@@ -10,7 +10,7 @@ ini_set("intl.error_level", E_WARNING);
 transliterator_create_inverse("jj");
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: transliterator_create_inverse(): Argument #1 ($orig_trans) must be of type Transliterator, string given in %s:%d
+Fatal error: Uncaught TypeError: transliterator_create_inverse(): Argument #1 ($transliterator) must be of type Transliterator, string given in %s:%d
 Stack trace:
 #0 %s(%d): transliterator_create_inverse('jj')
 #1 {main}
diff --git a/ext/intl/tests/transliterator_get_error_code_error.phpt b/ext/intl/tests/transliterator_get_error_code_error.phpt
index 64f9ea5cc2..7a46544b83 100644
--- a/ext/intl/tests/transliterator_get_error_code_error.phpt
+++ b/ext/intl/tests/transliterator_get_error_code_error.phpt
@@ -8,7 +8,7 @@ ini_set("intl.error_level", E_WARNING);
 echo transliterator_get_error_code(array()), "\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: transliterator_get_error_code(): Argument #1 ($trans) must be of type Transliterator, array given in %s:%d
+Fatal error: Uncaught TypeError: transliterator_get_error_code(): Argument #1 ($transliterator) must be of type Transliterator, array given in %s:%d
 Stack trace:
 #0 %s(%d): transliterator_get_error_code(Array)
 #1 {main}
diff --git a/ext/intl/tests/transliterator_get_error_message_error.phpt b/ext/intl/tests/transliterator_get_error_message_error.phpt
index 9c2e837da3..26cb089090 100644
--- a/ext/intl/tests/transliterator_get_error_message_error.phpt
+++ b/ext/intl/tests/transliterator_get_error_message_error.phpt
@@ -8,7 +8,7 @@ ini_set("intl.error_level", E_WARNING);
 echo transliterator_get_error_message(array()), "\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: transliterator_get_error_message(): Argument #1 ($trans) must be of type Transliterator, array given in %s:%d
+Fatal error: Uncaught TypeError: transliterator_get_error_message(): Argument #1 ($transliterator) must be of type Transliterator, array given in %s:%d
 Stack trace:
 #0 %s(%d): transliterator_get_error_message(Array)
 #1 {main}
diff --git a/ext/intl/tests/transliterator_transliterate_error.phpt b/ext/intl/tests/transliterator_transliterate_error.phpt
index f59b850798..0a93c326a1 100644
--- a/ext/intl/tests/transliterator_transliterate_error.phpt
+++ b/ext/intl/tests/transliterator_transliterate_error.phpt
@@ -26,7 +26,7 @@ echo "Done.\n";
 --EXPECTF--
 Warning: transliterator_transliterate(): transliterator_transliterate: Neither "start" nor the "end" arguments can exceed the number of UTF-16 code units (in this case, 3) in %s on line %d
 bool(false)
-transliterator_transliterate(): Argument #2 ($subject) must be less than or equal to argument #3 ($end)
+transliterator_transliterate(): Argument #2 ($string) must be less than or equal to argument #3 ($end)
 
 Warning: transliterator_transliterate(): String conversion of string to UTF-16 failed in %s on line %d
 Done.
diff --git a/ext/intl/timezone/timezone.stub.php b/ext/intl/timezone/timezone.stub.php
index da8c2c88d7..48356edb05 100644
--- a/ext/intl/timezone/timezone.stub.php
+++ b/ext/intl/timezone/timezone.stub.php
@@ -10,7 +10,7 @@ class IntlTimeZone
      * @return int|false
      * @alias intltz_count_equivalent_ids
      */
-    public static function countEquivalentIDs(string $zoneId) {}
+    public static function countEquivalentIDs(string $timezoneId) {}
 
     /**
      * @return IntlTimeZone
@@ -29,32 +29,32 @@ class IntlTimeZone
      * @return IntlTimeZone|null
      * @alias intltz_create_time_zone
      */
-    public static function createTimeZone(string $zoneId) {}
+    public static function createTimeZone(string $timezoneId) {}
 
     /**
      * @return IntlIterator|false
      * @alias intltz_create_time_zone_id_enumeration
      */
-    public static function createTimeZoneIDEnumeration(int $zoneType, ?string $region = null, ?int $rawOffset = null) {}
+    public static function createTimeZoneIDEnumeration(int $type, ?string $region = null, ?int $rawOffset = null) {}
 
     /**
      * @return IntlTimeZone|null
      * @alias intltz_from_date_time_zone
      */
-    public static function fromDateTimeZone(DateTimeZone $zone) {}
+    public static function fromDateTimeZone(DateTimeZone $timezone) {}
 
     /**
-     * @param bool $isSystemID
+     * @param bool $isSystemId
      * @return string|false
      * @alias intltz_get_canonical_id
      */
-    public static function getCanonicalID(string $zoneId, &$isSystemID = null) {}
+    public static function getCanonicalID(string $timezoneId, &$isSystemId = null) {}
 
     /**
      * @return string|false
      * @alias intltz_get_display_name
      */
-    public function getDisplayName(bool $isDaylight = false, int $style = IntlTimeZone::DISPLAY_LONG, ?string $locale = null) {}
+    public function getDisplayName(bool $dst = false, int $style = IntlTimeZone::DISPLAY_LONG, ?string $locale = null) {}
 
     /**
      * @return int
@@ -66,7 +66,7 @@ class IntlTimeZone
      * @return string|false
      * @alias intltz_get_equivalent_id
      */
-    public static function getEquivalentID(string $zoneId, int $index) {}
+    public static function getEquivalentID(string $timezoneId, int $index) {}
 
     /**
      * @return int|false
@@ -98,7 +98,7 @@ class IntlTimeZone
      * @return bool
      * @alias intltz_get_offset
      */
-    public function getOffset(float $date, bool $local, &$rawOffset, &$dstOffset) {}
+    public function getOffset(float $timestamp, bool $local, &$rawOffset, &$dstOffset) {}
 
     /**
      * @return int
@@ -110,7 +110,7 @@ class IntlTimeZone
      * @return string|false
      * @alias intltz_get_region
      */
-    public static function getRegion(string $zoneId) {}
+    public static function getRegion(string $timezoneId) {}
 
     /**
      * @return string|false
@@ -129,19 +129,19 @@ class IntlTimeZone
      * @return string|false
      * @alias intltz_get_windows_id
      */
-    public static function getWindowsID(string $timezone) {}
+    public static function getWindowsID(string $timezoneId) {}
 
     /**
      * @return string|false
      * @alias intltz_get_id_for_windows_id
      */
-    public static function getIDForWindowsID(string $timezone, ?string $region = null) {}
+    public static function getIDForWindowsID(string $timezoneId, ?string $region = null) {}
 #endif
     /**
      * @return bool
      * @alias intltz_has_same_rules
      */
-    public function hasSameRules(IntlTimeZone $otherTimeZone) {}
+    public function hasSameRules(IntlTimeZone $other) {}
 
     /**
      * @return DateTimeZone|false
diff --git a/ext/intl/timezone/timezone_arginfo.h b/ext/intl/timezone/timezone_arginfo.h
index ce14cdced3..03b834cd4f 100644
--- a/ext/intl/timezone/timezone_arginfo.h
+++ b/ext/intl/timezone/timezone_arginfo.h
@@ -1,11 +1,11 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 69c4f052e9c75c4adb5b1b7056db981b2b26a22f */
+ * Stub hash: 6bdd65d7ba5a32b32c96511e391beb876d9d20c3 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_countEquivalentIDs, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, zoneId, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlTimeZone_createDefault arginfo_class_IntlTimeZone___construct
@@ -17,22 +17,22 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_IntlTimeZone_createTimeZone arginfo_class_IntlTimeZone_countEquivalentIDs
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_createTimeZoneIDEnumeration, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, zoneType, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, region, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, rawOffset, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_fromDateTimeZone, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, zone, DateTimeZone, 0)
+	ZEND_ARG_OBJ_INFO(0, timezone, DateTimeZone, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_getCanonicalID, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, zoneId, IS_STRING, 0)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, isSystemID, "null")
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, isSystemId, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_getDisplayName, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, isDaylight, _IS_BOOL, 0, "false")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dst, _IS_BOOL, 0, "false")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, style, IS_LONG, 0, "IntlTimeZone::DISPLAY_LONG")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
@@ -40,7 +40,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_IntlTimeZone_getDSTSavings arginfo_class_IntlTimeZone___construct
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_getEquivalentID, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, zoneId, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
@@ -53,7 +53,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_IntlTimeZone_getID arginfo_class_IntlTimeZone___construct
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_getOffset, 0, 0, 4)
-	ZEND_ARG_TYPE_INFO(0, date, IS_DOUBLE, 0)
+	ZEND_ARG_TYPE_INFO(0, timestamp, IS_DOUBLE, 0)
 	ZEND_ARG_TYPE_INFO(0, local, _IS_BOOL, 0)
 	ZEND_ARG_INFO(1, rawOffset)
 	ZEND_ARG_INFO(1, dstOffset)
@@ -69,19 +69,19 @@ ZEND_END_ARG_INFO()
 
 #if U_ICU_VERSION_MAJOR_NUM >= 52
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_getWindowsID, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, timezone, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 #endif
 
 #if U_ICU_VERSION_MAJOR_NUM >= 52
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_getIDForWindowsID, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, timezone, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, region, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 #endif
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_hasSameRules, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, otherTimeZone, IntlTimeZone, 0)
+	ZEND_ARG_OBJ_INFO(0, other, IntlTimeZone, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlTimeZone_toDateTimeZone arginfo_class_IntlTimeZone___construct
diff --git a/ext/intl/transliterator/transliterator.stub.php b/ext/intl/transliterator/transliterator.stub.php
index 5b47f05dd3..c14a4cf0c0 100644
--- a/ext/intl/transliterator/transliterator.stub.php
+++ b/ext/intl/transliterator/transliterator.stub.php
@@ -34,7 +34,7 @@ class Transliterator
      * @return string|false
      * @alias transliterator_transliterate
      */
-    public function transliterate(string $subject, int $start = 0, int $end = -1) {}
+    public function transliterate(string $string, int $start = 0, int $end = -1) {}
 
     /**
      * @return int|false
diff --git a/ext/intl/transliterator/transliterator_arginfo.h b/ext/intl/transliterator/transliterator_arginfo.h
index d596fdc72c..406a086293 100644
--- a/ext/intl/transliterator/transliterator_arginfo.h
+++ b/ext/intl/transliterator/transliterator_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 52c803e82863ebdbe7a2fdcbe8508fb22984cbfd */
+ * Stub hash: 4bcb458de884a68797bee28339399fb8c8664605 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Transliterator___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -19,7 +19,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_Transliterator_listIDs arginfo_class_Transliterator___construct
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Transliterator_transliterate, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, subject, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start, IS_LONG, 0, "0")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, end, IS_LONG, 0, "-1")
 ZEND_END_ARG_INFO()
diff --git a/ext/intl/uchar/uchar.stub.php b/ext/intl/uchar/uchar.stub.php
index 6f793a6147..f3ebd78bcb 100644
--- a/ext/intl/uchar/uchar.stub.php
+++ b/ext/intl/uchar/uchar.stub.php
@@ -18,13 +18,13 @@ class IntlChar
     public static function charDirection(int|string $codepoint) {}
 
     /** @return int|null */
-    public static function charFromName(string $characterName, int $nameChoice = IntlChar::UNICODE_CHAR_NAME) {}
+    public static function charFromName(string $name, int $type = IntlChar::UNICODE_CHAR_NAME) {}
 
     /** @return int|string|null */
     public static function charMirror(int|string $codepoint) {}
 
     /** @return string|null */
-    public static function charName(int|string $codepoint, int $nameChoice = IntlChar::UNICODE_CHAR_NAME) {}
+    public static function charName(int|string $codepoint, int $type = IntlChar::UNICODE_CHAR_NAME) {}
 
     /** @return int|null */
     public static function charType(int|string $codepoint) {}
@@ -33,10 +33,10 @@ class IntlChar
     public static function chr(int|string $codepoint) {}
 
     /** @return int|false|null */
-    public static function digit(int|string $codepoint, int $radix = 10) {}
+    public static function digit(int|string $codepoint, int $base = 10) {}
 
     /** @return bool|null */
-    public static function enumCharNames(int|string $start, int|string $limit, callable $callback, int $nameChoice = IntlChar::UNICODE_CHAR_NAME) {}
+    public static function enumCharNames(int|string $start, int|string $end, callable $callback, int $type = IntlChar::UNICODE_CHAR_NAME) {}
 
     /** @return void */
     public static function enumCharTypes(callable $callback) {}
@@ -47,7 +47,7 @@ class IntlChar
     public static function foldCase(int|string $codepoint, int $options = IntlChar::FOLD_CASE_DEFAULT) {}
 
     /** @return int */
-    public static function forDigit(int $digit, int $radix = 10) {}
+    public static function forDigit(int $digit, int $base = 10) {}
 
 #if U_ICU_VERSION_MAJOR_NUM >= 52
     /** @return int|string|null */
@@ -79,13 +79,13 @@ class IntlChar
     public static function getPropertyEnum(string $alias) {}
 
     /** @return string|false */
-    public static function getPropertyName(int $property, int $nameChoice = IntlChar::LONG_PROPERTY_NAME) {}
+    public static function getPropertyName(int $property, int $type = IntlChar::LONG_PROPERTY_NAME) {}
 
     /** @return int */
     public static function getPropertyValueEnum(int $property, string $name) {}
 
     /** @return string|false */
-    public static function getPropertyValueName(int $property, int $value, int $nameChoice = IntlChar::LONG_PROPERTY_NAME) {}
+    public static function getPropertyValueName(int $property, int $value, int $type = IntlChar::LONG_PROPERTY_NAME) {}
 
     /** @return array */
     public static function getUnicodeVersion() {}
diff --git a/ext/intl/uchar/uchar_arginfo.h b/ext/intl/uchar/uchar_arginfo.h
index 3ea897c189..c4e22cd767 100644
--- a/ext/intl/uchar/uchar_arginfo.h
+++ b/ext/intl/uchar/uchar_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 61f9c0a6c5048d25e070379f2f98fa10f8ce25ee */
+ * Stub hash: 05ea5d884642e75721f90728fb24b7ad5ce46897 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_hasBinaryProperty, 0, 0, 2)
 	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
@@ -15,15 +15,15 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_IntlChar_charDirection arginfo_class_IntlChar_charAge
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_charFromName, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, characterName, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, nameChoice, IS_LONG, 0, "IntlChar::UNICODE_CHAR_NAME")
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "IntlChar::UNICODE_CHAR_NAME")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlChar_charMirror arginfo_class_IntlChar_charAge
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_charName, 0, 0, 1)
 	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, nameChoice, IS_LONG, 0, "IntlChar::UNICODE_CHAR_NAME")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "IntlChar::UNICODE_CHAR_NAME")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlChar_charType arginfo_class_IntlChar_charAge
@@ -32,14 +32,14 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_digit, 0, 0, 1)
 	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, radix, IS_LONG, 0, "10")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, base, IS_LONG, 0, "10")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_enumCharNames, 0, 0, 3)
 	ZEND_ARG_TYPE_MASK(0, start, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_TYPE_MASK(0, limit, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_TYPE_MASK(0, end, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, nameChoice, IS_LONG, 0, "IntlChar::UNICODE_CHAR_NAME")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "IntlChar::UNICODE_CHAR_NAME")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_enumCharTypes, 0, 0, 1)
@@ -53,7 +53,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_forDigit, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, digit, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, radix, IS_LONG, 0, "10")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, base, IS_LONG, 0, "10")
 ZEND_END_ARG_INFO()
 
 #if U_ICU_VERSION_MAJOR_NUM >= 52
@@ -84,7 +84,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_getPropertyName, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, property, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, nameChoice, IS_LONG, 0, "IntlChar::LONG_PROPERTY_NAME")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "IntlChar::LONG_PROPERTY_NAME")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_getPropertyValueEnum, 0, 0, 2)
@@ -95,7 +95,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_getPropertyValueName, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, property, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, nameChoice, IS_LONG, 0, "IntlChar::LONG_PROPERTY_NAME")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "IntlChar::LONG_PROPERTY_NAME")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_getUnicodeVersion, 0, 0, 0)
author	Máté Kocsis <kocsismate@woohoolabs.com>	2020-10-09 13:14:41 +0200
committer	Máté Kocsis <kocsismate@woohoolabs.com>	2020-10-12 18:06:45 +0200
commit	186612e4d79b82c6a1ae610293b7816078dd611c (patch)
tree	a46431907f11d489f998b6b03ebae33f45039f28
parent	eef994d6211ae96b108caccd77669336f4ec46e8 (diff)
download	php-git-186612e4d79b82c6a1ae610293b7816078dd611c.tar.gz