Skip to content

Commit cdc8523

Browse files
committed
Last pass of 'More consistent parameter names for date/time functions'
1 parent c56c19c commit cdc8523

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

ext/date/php_date.stub.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function timezone_open(string $timezone): DateTimeZone|false {}
7979

8080
function timezone_name_get(DateTimeZone $object): string {}
8181

82-
function timezone_name_from_abbr(string $abbr, int $gmtoffset = -1, int $isdst = -1): string|false {}
82+
function timezone_name_from_abbr(string $abbr, int $utcOffset = -1, int $isDST = -1): string|false {}
8383

8484
function timezone_offset_get(DateTimeZone $object, DateTimeInterface $datetime): int {}
8585

@@ -88,7 +88,7 @@ function timezone_transitions_get(
8888

8989
function timezone_location_get(DateTimeZone $object): array|false {}
9090

91-
function timezone_identifiers_list(int $what = DateTimeZone::ALL, ?string $country = null): array|false {}
91+
function timezone_identifiers_list(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): array|false {}
9292

9393
function timezone_abbreviations_list(): array {}
9494

@@ -103,14 +103,14 @@ function date_default_timezone_set(string $timezoneID): bool {}
103103
function date_default_timezone_get(): string {}
104104

105105
function date_sunrise(
106-
int $timestamp, int $retformat = SUNFUNCS_RET_STRING,
106+
int $timestamp, int $returnFormat = SUNFUNCS_RET_STRING,
107107
?float $latitude = null, ?float $longitude = null, ?float $zenith = null,
108-
float $gmt_offset = 0): string|int|float|false {}
108+
float $utcOffset = 0): string|int|float|false {}
109109

110110
function date_sunset(
111-
int $timestamp, int $retformat = SUNFUNCS_RET_STRING,
111+
int $timestamp, int $returnFormat = SUNFUNCS_RET_STRING,
112112
?float $latitude = null, ?float $longitude = null, ?float $zenith = null,
113-
float $gmt_offset = 0): string|int|float|false {}
113+
float $utcOffset = 0): string|int|float|false {}
114114

115115
function date_sun_info(int $timestamp, float $latitude, float $longitude): array {}
116116

ext/date/php_date_arginfo.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 8791b7918a9d72cb4f1c1ab6703324e3c7a805c5 */
2+
* Stub hash: aa0e2c059662d4015658b85c932126b34934b5a4 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
55
ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0)
@@ -165,8 +165,8 @@ ZEND_END_ARG_INFO()
165165

166166
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_timezone_name_from_abbr, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
167167
ZEND_ARG_TYPE_INFO(0, abbr, IS_STRING, 0)
168-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, gmtoffset, IS_LONG, 0, "-1")
169-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, isdst, IS_LONG, 0, "-1")
168+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, utcOffset, IS_LONG, 0, "-1")
169+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, isDST, IS_LONG, 0, "-1")
170170
ZEND_END_ARG_INFO()
171171

172172
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_timezone_offset_get, 0, 2, IS_LONG, 0)
@@ -185,8 +185,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_timezone_location_get, 0, 1, MAY
185185
ZEND_END_ARG_INFO()
186186

187187
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_timezone_identifiers_list, 0, 0, MAY_BE_ARRAY|MAY_BE_FALSE)
188-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, what, IS_LONG, 0, "DateTimeZone::ALL")
189-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, country, IS_STRING, 1, "null")
188+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timezoneGroup, IS_LONG, 0, "DateTimeZone::ALL")
189+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, countryCode, IS_STRING, 1, "null")
190190
ZEND_END_ARG_INFO()
191191

192192
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_timezone_abbreviations_list, 0, 0, IS_ARRAY, 0)
@@ -212,11 +212,11 @@ ZEND_END_ARG_INFO()
212212

213213
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_date_sunrise, 0, 1, MAY_BE_STRING|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_FALSE)
214214
ZEND_ARG_TYPE_INFO(0, timestamp, IS_LONG, 0)
215-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, retformat, IS_LONG, 0, "SUNFUNCS_RET_STRING")
215+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, returnFormat, IS_LONG, 0, "SUNFUNCS_RET_STRING")
216216
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, latitude, IS_DOUBLE, 1, "null")
217217
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, longitude, IS_DOUBLE, 1, "null")
218218
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, zenith, IS_DOUBLE, 1, "null")
219-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, gmt_offset, IS_DOUBLE, 0, "0")
219+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, utcOffset, IS_DOUBLE, 0, "0")
220220
ZEND_END_ARG_INFO()
221221

222222
#define arginfo_date_sunset arginfo_date_sunrise

ext/standard/basic_functions.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,9 +1092,9 @@ function fdiv(float $dividend, float $divisor): float {}
10921092
/* microtime.c */
10931093

10941094
#ifdef HAVE_GETTIMEOFDAY
1095-
function microtime(bool $get_as_float = false): string|float {}
1095+
function microtime(bool $getAsFloat = false): string|float {}
10961096

1097-
function gettimeofday(bool $return_float = false): array|float {}
1097+
function gettimeofday(bool $returnFloat = false): array|float {}
10981098
#endif
10991099

11001100
#ifdef HAVE_GETRUSAGE

ext/standard/basic_functions_arginfo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: f19f6cfcda6c591e3842a3c108e078acea21d5be */
2+
* Stub hash: 22afbf7f01658785162ad9c82e09f1f11d3fb13a */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
55
ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -1738,13 +1738,13 @@ ZEND_END_ARG_INFO()
17381738

17391739
#if defined(HAVE_GETTIMEOFDAY)
17401740
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_microtime, 0, 0, MAY_BE_STRING|MAY_BE_DOUBLE)
1741-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, get_as_float, _IS_BOOL, 0, "false")
1741+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, getAsFloat, _IS_BOOL, 0, "false")
17421742
ZEND_END_ARG_INFO()
17431743
#endif
17441744

17451745
#if defined(HAVE_GETTIMEOFDAY)
17461746
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_gettimeofday, 0, 0, MAY_BE_ARRAY|MAY_BE_DOUBLE)
1747-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, return_float, _IS_BOOL, 0, "false")
1747+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, returnFloat, _IS_BOOL, 0, "false")
17481748
ZEND_END_ARG_INFO()
17491749
#endif
17501750

0 commit comments

Comments
 (0)