Skip to content

Improve parameter names in ext/intl #6309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/date/php_date.stub.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}

Expand Down
4 changes: 2 additions & 2 deletions ext/date/php_date_arginfo.h
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ext/intl/breakiterator/breakiterator.stub.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public function getErrorCode() {}
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() {}
Expand Down Expand Up @@ -71,7 +71,7 @@ public function getIterator(): Iterator {}

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() {}
Expand Down
8 changes: 4 additions & 4 deletions ext/intl/breakiterator/breakiterator_arginfo.h
Original file line number Diff line number Diff line change
@@ -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")
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
46 changes: 23 additions & 23 deletions ext/intl/calendar/calendar.stub.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -53,7 +53,7 @@ public function clear(?int $field = null) {}
* @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
Expand Down Expand Up @@ -113,7 +113,7 @@ public function getGreatestMinimum(int $field) {}
* @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
Expand All @@ -125,7 +125,7 @@ public function getLeastMaximum(int $field) {}
* @return string
* @alias intlcal_get_locale
*/
public function getLocale(int $localeType) {}
public function getLocale(int $type) {}

/**
* @return int
Expand All @@ -143,7 +143,7 @@ public function getMinimalDaysInFirstWeek() {}
* @return bool
* @alias intlcal_set_minimal_days_in_first_week
*/
public function setMinimalDaysInFirstWeek(int $numberOfDays) {}
public function setMinimalDaysInFirstWeek(int $days) {}

/**
* @return int
Expand Down Expand Up @@ -203,7 +203,7 @@ public function inDaylightTime() {}
* @return bool
* @alias intlcal_is_equivalent_to
*/
public function isEquivalentTo(IntlCalendar $calendar) {}
public function isEquivalentTo(IntlCalendar $other) {}

/**
* @return bool
Expand All @@ -215,7 +215,7 @@ public function isLenient() {}
* @return bool
* @alias intlcal_is_weekend
*/
public function isWeekend(?float $date = null) {}
public function isWeekend(?float $timestamp = null) {}

/**
* @param int|bool $amountOrUpOrDown
Expand Down Expand Up @@ -246,32 +246,32 @@ public function setFirstDayOfWeek(int $dayOfWeek) {}
* @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
Expand All @@ -283,20 +283,20 @@ public function toDateTime() {}
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
Expand Down
38 changes: 18 additions & 20 deletions ext/intl/calendar/calendar_arginfo.h
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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()

Expand All @@ -59,23 +59,23 @@ 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

#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
Expand All @@ -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)
Expand All @@ -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

Expand Down
Loading