com php-src: Last pass of 'More consistent parameter names for date/time functions': ext/date/php_date.stub.php ext/date/php_d ate_arginfo.h
ext/standard/basic_functions.stub.php ext/standard/basic_functions_arginfo.h
| From: | Derick Rethans | Date: | Mon, 27 Jul 2020 10:42:13 +0000 |
| Subject: | com php-src: Last pass of 'More consistent parameter names for date/time functions': ext/date/php_date.stub.php ext/date/php_d ate_arginfo.h ext/standard/basic_functions.stub.php ext/standard/basic_functions_arginfo.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-112372@lists.php.net to get a copy of this message | ||
Commit: cdc8523300a4e3635cdc6aaed0b807e72ebdcfc8
Author: Derick Rethans <github@derickrethans.nl> Mon, 27 Jul 2020 11:42:13 +0100
Parents: c56c19cec37334b3a5466cf561053ad1db27cb81
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cdc8523300a4e3635cdc6aaed0b807e72ebdcfc8
Log:
Last pass of 'More consistent parameter names for date/time functions'
Changed paths:
M ext/date/php_date.stub.php
M ext/date/php_date_arginfo.h
M ext/standard/basic_functions.stub.php
M ext/standard/basic_functions_arginfo.h
Diff:
diff --git a/ext/date/php_date.stub.php b/ext/date/php_date.stub.php
index dd65a65181..c86b51d7ca 100644
--- a/ext/date/php_date.stub.php
+++ b/ext/date/php_date.stub.php
@@ -79,7 +79,7 @@ function timezone_open(string $timezone): DateTimeZone|false {}
function timezone_name_get(DateTimeZone $object): string {}
-function timezone_name_from_abbr(string $abbr, int $gmtoffset = -1, int $isdst = -1): string|false
{}
+function timezone_name_from_abbr(string $abbr, int $utcOffset = -1, int $isDST = -1): string|false
{}
function timezone_offset_get(DateTimeZone $object, DateTimeInterface $datetime): int {}
@@ -88,7 +88,7 @@ function timezone_transitions_get(
function timezone_location_get(DateTimeZone $object): array|false {}
-function timezone_identifiers_list(int $what = DateTimeZone::ALL, ?string $country = null):
array|false {}
+function timezone_identifiers_list(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode =
null): array|false {}
function timezone_abbreviations_list(): array {}
@@ -103,14 +103,14 @@ function date_default_timezone_set(string $timezoneID): bool {}
function date_default_timezone_get(): string {}
function date_sunrise(
- int $timestamp, int $retformat = SUNFUNCS_RET_STRING,
+ int $timestamp, int $returnFormat = SUNFUNCS_RET_STRING,
?float $latitude = null, ?float $longitude = null, ?float $zenith = null,
- float $gmt_offset = 0): string|int|float|false {}
+ float $utcOffset = 0): string|int|float|false {}
function date_sunset(
- int $timestamp, int $retformat = SUNFUNCS_RET_STRING,
+ int $timestamp, int $returnFormat = SUNFUNCS_RET_STRING,
?float $latitude = null, ?float $longitude = null, ?float $zenith = null,
- float $gmt_offset = 0): string|int|float|false {}
+ float $utcOffset = 0): string|int|float|false {}
function date_sun_info(int $timestamp, float $latitude, float $longitude): array {}
diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h
index af4dabf292..b15ff5008c 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: 8791b7918a9d72cb4f1c1ab6703324e3c7a805c5 */
+ * Stub hash: aa0e2c059662d4015658b85c932126b34934b5a4 */
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)
@@ -165,8 +165,8 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_timezone_name_from_abbr, 0, 1,
MAY_BE_STRING|MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO(0, abbr, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, gmtoffset, IS_LONG, 0, "-1")
- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, isdst, IS_LONG, 0, "-1")
+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, utcOffset, IS_LONG, 0, "-1")
+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, isDST, IS_LONG, 0, "-1")
ZEND_END_ARG_INFO()
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
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_timezone_identifiers_list, 0, 0,
MAY_BE_ARRAY|MAY_BE_FALSE)
- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, what, IS_LONG, 0, "DateTimeZone::ALL")
- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, country, IS_STRING, 1, "null")
+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timezoneGroup, IS_LONG, 0, "DateTimeZone::ALL")
+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, countryCode, IS_STRING, 1, "null")
ZEND_END_ARG_INFO()
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()
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)
ZEND_ARG_TYPE_INFO(0, timestamp, IS_LONG, 0)
- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, retformat, IS_LONG, 0, "SUNFUNCS_RET_STRING")
+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, returnFormat, IS_LONG, 0,
"SUNFUNCS_RET_STRING")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, latitude, IS_DOUBLE, 1, "null")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, longitude, IS_DOUBLE, 1, "null")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, zenith, IS_DOUBLE, 1, "null")
- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, gmt_offset, IS_DOUBLE, 0, "0")
+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, utcOffset, IS_DOUBLE, 0, "0")
ZEND_END_ARG_INFO()
#define arginfo_date_sunset arginfo_date_sunrise
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index 1d6a3cd49a..7fbb4b0960 100755
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -1092,9 +1092,9 @@ function fdiv(float $dividend, float $divisor): float {}
/* microtime.c */
#ifdef HAVE_GETTIMEOFDAY
-function microtime(bool $get_as_float = false): string|float {}
+function microtime(bool $getAsFloat = false): string|float {}
-function gettimeofday(bool $return_float = false): array|float {}
+function gettimeofday(bool $returnFloat = false): array|float {}
#endif
#ifdef HAVE_GETRUSAGE
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index 7784f49111..eb26e1d86a 100755
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
- * Stub hash: f19f6cfcda6c591e3842a3c108e078acea21d5be */
+ * Stub hash: 22afbf7f01658785162ad9c82e09f1f11d3fb13a */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -1738,13 +1738,13 @@ ZEND_END_ARG_INFO()
#if defined(HAVE_GETTIMEOFDAY)
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_microtime, 0, 0, MAY_BE_STRING|MAY_BE_DOUBLE)
- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, get_as_float, _IS_BOOL, 0, "false")
+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, getAsFloat, _IS_BOOL, 0, "false")
ZEND_END_ARG_INFO()
#endif
#if defined(HAVE_GETTIMEOFDAY)
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_gettimeofday, 0, 0, MAY_BE_ARRAY|MAY_BE_DOUBLE)
- ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, return_float, _IS_BOOL, 0, "false")
+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, returnFloat, _IS_BOOL, 0, "false")
ZEND_END_ARG_INFO()
#endif