Skip to content

Commit ae2e0ed

Browse files
nikicnikic
committed
Some updates
1 parent dd82fd5 commit ae2e0ed

File tree

2 files changed

+73
-71
lines changed

2 files changed

+73
-71
lines changed

‎ext/standard/basic_functions.stub.php

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -688,6 +688,8 @@ function utf8_encode(string $string): string {}
688688

689689
function utf8_decode(string $string): string {}
690690

691+
/* dir.c */
692+
691693
/**
692694
* @param resource|null $context
693695
* @return resource|false
@@ -958,18 +960,18 @@ function vfprintf($stream, string $format, array $values): int {}
958960
/* fsock.c */
959961

960962
/**
961-
* @param int $errno
963+
* @param int $error_code
962964
* @param string $error_message
963965
* @return resource|false
964966
*/
965-
function fsockopen(string $hostname, int $port = -1, &$errno = null, &$error_message = null, ?float $timeout = null) {}
967+
function fsockopen(string $hostname, int $port = -1, &$error_code = null, &$error_message = null, ?float $timeout = null) {}
966968

967969
/**
968-
* @param int $errno
970+
* @param int $error_code
969971
* @param string $error_message
970972
* @return resource|false
971973
*/
972-
function pfsockopen(string $hostname, int $port = -1, &$errno = null, &$error_message = null, ?float $timeout = null) {}
974+
function pfsockopen(string $hostname, int $port = -1, &$error_code = null, &$error_message = null, ?float $timeout = null) {}
973975

974976
/* http.c */
975977

@@ -1031,89 +1033,89 @@ function mail(string $to, string $subject, string $message, array|string $additi
10311033

10321034
/* math.c */
10331035

1034-
function abs(int|float $number): int|float {}
1036+
function abs(int|float $num): int|float {}
10351037

1036-
function ceil(int|float $number): float {}
1038+
function ceil(int|float $num): float {}
10371039

1038-
function floor(int|float $number): float {}
1040+
function floor(int|float $num): float {}
10391041

1040-
function round(int|float $number, int $precision = 0, int $mode = PHP_ROUND_HALF_UP): float {}
1042+
function round(int|float $num, int $precision = 0, int $mode = PHP_ROUND_HALF_UP): float {}
10411043

1042-
function sin(float $number): float {}
1044+
function sin(float $num): float {}
10431045

1044-
function cos(float $number): float {}
1046+
function cos(float $num): float {}
10451047

1046-
function tan(float $number): float {}
1048+
function tan(float $num): float {}
10471049

1048-
function asin(float $number): float {}
1050+
function asin(float $num): float {}
10491051

1050-
function acos(float $number): float {}
1052+
function acos(float $num): float {}
10511053

1052-
function atan(float $number): float {}
1054+
function atan(float $num): float {}
10531055

1054-
function atanh(float $number): float {}
1056+
function atanh(float $num): float {}
10551057

10561058
function atan2(float $y, float $x): float {}
10571059

1058-
function sinh(float $number): float {}
1060+
function sinh(float $num): float {}
10591061

1060-
function cosh(float $number): float {}
1062+
function cosh(float $num): float {}
10611063

1062-
function tanh(float $number): float {}
1064+
function tanh(float $num): float {}
10631065

1064-
function asinh(float $number): float {}
1066+
function asinh(float $num): float {}
10651067

1066-
function acosh(float $number): float {}
1068+
function acosh(float $num): float {}
10671069

1068-
function expm1(float $number): float {}
1070+
function expm1(float $num): float {}
10691071

1070-
function log1p(float $number): float {}
1072+
function log1p(float $num): float {}
10711073

10721074
function pi(): float {}
10731075

1074-
function is_finite(float $number): bool {}
1076+
function is_finite(float $num): bool {}
10751077

1076-
function is_nan(float $number): bool {}
1078+
function is_nan(float $num): bool {}
10771079

1078-
function intdiv(int $dividend, int $divisor): int {}
1080+
function intdiv(int $num1, int $num2): int {}
10791081

1080-
function is_infinite(float $number): bool {}
1082+
function is_infinite(float $num): bool {}
10811083

1082-
function pow(mixed $base, mixed $exp): int|float|object {}
1084+
function pow(mixed $num, mixed $exponent): int|float|object {}
10831085

1084-
function exp(float $number): float {}
1086+
function exp(float $num): float {}
10851087

1086-
function log(float $number, float $base = M_E): float {}
1088+
function log(float $num, float $base = M_E): float {}
10871089

1088-
function log10(float $number): float {}
1090+
function log10(float $num): float {}
10891091

1090-
function sqrt(float $number): float {}
1092+
function sqrt(float $num): float {}
10911093

10921094
function hypot(float $x, float $y): float {}
10931095

1094-
function deg2rad(float $number): float {}
1096+
function deg2rad(float $num): float {}
10951097

1096-
function rad2deg(float $number): float {}
1098+
function rad2deg(float $num): float {}
10971099

10981100
function bindec(string $binary_string): int|float {}
10991101

11001102
function hexdec(string $hex_string): int|float {}
11011103

11021104
function octdec(string $octal_string): int|float {}
11031105

1104-
function decbin(int $number): string {}
1106+
function decbin(int $num): string {}
11051107

1106-
function decoct(int $number): string {}
1108+
function decoct(int $num): string {}
11071109

1108-
function dechex(int $number): string {}
1110+
function dechex(int $num): string {}
11091111

1110-
function base_convert(string $number, int $from_base, int $to_base): string {}
1112+
function base_convert(string $num, int $from_base, int $to_base): string {}
11111113

1112-
function number_format(float $number, int $decimals = 0, ?string $decimal_point = "." , ?string $thousands_separator = ","): string {}
1114+
function number_format(float $num, int $decimals = 0, ?string $decimal_separator = "." , ?string $thousands_separator = ","): string {}
11131115

1114-
function fmod(float $x, float $y): float {}
1116+
function fmod(float $num1, float $num2): float {}
11151117

1116-
function fdiv(float $dividend, float $divisor): float {}
1118+
function fdiv(float $num1, float $num2): float {}
11171119

11181120
/* microtime.c */
11191121

@@ -1152,7 +1154,7 @@ function password_algos(): array {}
11521154
* @param array $pipes
11531155
* @return resource|false
11541156
*/
1155-
function proc_open(array|string $command, array $descriptor_spec, &$pipes, ?string $cwd = null, ?array $env = null, ?array $options = null) {}
1157+
function proc_open(array|string $command, array $descriptor_spec, &$pipes, ?string $cwd = null, ?array $env_vars = null, ?array $options = null) {}
11561158

11571159
/** @param resource $process */
11581160
function proc_close($process): int {}
@@ -1198,7 +1200,7 @@ function soundex(string $string): string {}
11981200

11991201
/* streamsfuncs.c */
12001202

1201-
function stream_select(?array &$read, ?array &$write, ?array &$except, ?int $seconds, int $microsectons = 0): int|false {}
1203+
function stream_select(?array &$read, ?array &$write, ?array &$except, ?int $seconds, int $microseconds = 0): int|false {}
12021204

12031205
/** @return resource */
12041206
function stream_context_create(?array $options = null, ?array $params = null) {}
@@ -1237,20 +1239,20 @@ function stream_filter_append($stream, string $filter_name, int $mode = 0, mixed
12371239
function stream_filter_remove($stream_filter): bool {}
12381240

12391241
/**
1240-
* @param int $errno
1242+
* @param int $error_code
12411243
* @param string $error_message
12421244
* @param resource|null $context
12431245
* @return resource|false
12441246
*/
1245-
function stream_socket_client(string $address, &$errno = null, &$error_message = null, ?float $timeout = null, int $flags = STREAM_CLIENT_CONNECT, $context = null) {}
1247+
function stream_socket_client(string $address, &$error_code = null, &$error_message = null, ?float $timeout = null, int $flags = STREAM_CLIENT_CONNECT, $context = null) {}
12461248

12471249
/**
1248-
* @param int $errno
1250+
* @param int $error_code
12491251
* @param string $error_message
12501252
* @param resource|null $context
12511253
* @return resource|false
12521254
*/
1253-
function stream_socket_server(string $address, &$errno = null, &$error_message = null, int $flags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $context = null) {}
1255+
function stream_socket_server(string $address, &$error_code = null, &$error_message = null, int $flags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $context = null) {}
12541256

12551257
/**
12561258
* @param resource $socket

‎ext/standard/basic_functions_arginfo.h

Lines changed: 25 additions & 25 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: 2c2e3c377e2c3716845541b7832061e292b5aaf6 */
2+
* Stub hash: 6a0d8ead5c3b4a9ced8731089e48c623c0b653a3 */
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)
@@ -1489,7 +1489,7 @@ ZEND_END_ARG_INFO()
14891489
ZEND_BEGIN_ARG_INFO_EX(arginfo_fsockopen, 0, 0, 1)
14901490
ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0)
14911491
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "-1")
1492-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, errno, "null")
1492+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, error_code, "null")
14931493
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, error_message, "null")
14941494
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeout, IS_DOUBLE, 1, "null")
14951495
ZEND_END_ARG_INFO()
@@ -1594,23 +1594,23 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mail, 0, 3, _IS_BOOL, 0)
15941594
ZEND_END_ARG_INFO()
15951595

15961596
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_abs, 0, 1, MAY_BE_LONG|MAY_BE_DOUBLE)
1597-
ZEND_ARG_TYPE_MASK(0, number, MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
1597+
ZEND_ARG_TYPE_MASK(0, num, MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
15981598
ZEND_END_ARG_INFO()
15991599

16001600
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ceil, 0, 1, IS_DOUBLE, 0)
1601-
ZEND_ARG_TYPE_MASK(0, number, MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
1601+
ZEND_ARG_TYPE_MASK(0, num, MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
16021602
ZEND_END_ARG_INFO()
16031603

16041604
#define arginfo_floor arginfo_ceil
16051605

16061606
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_round, 0, 1, IS_DOUBLE, 0)
1607-
ZEND_ARG_TYPE_MASK(0, number, MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
1607+
ZEND_ARG_TYPE_MASK(0, num, MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
16081608
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, precision, IS_LONG, 0, "0")
16091609
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "PHP_ROUND_HALF_UP")
16101610
ZEND_END_ARG_INFO()
16111611

16121612
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_sin, 0, 1, IS_DOUBLE, 0)
1613-
ZEND_ARG_TYPE_INFO(0, number, IS_DOUBLE, 0)
1613+
ZEND_ARG_TYPE_INFO(0, num, IS_DOUBLE, 0)
16141614
ZEND_END_ARG_INFO()
16151615

16161616
#define arginfo_cos arginfo_sin
@@ -1647,27 +1647,27 @@ ZEND_END_ARG_INFO()
16471647
#define arginfo_pi arginfo_lcg_value
16481648

16491649
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_is_finite, 0, 1, _IS_BOOL, 0)
1650-
ZEND_ARG_TYPE_INFO(0, number, IS_DOUBLE, 0)
1650+
ZEND_ARG_TYPE_INFO(0, num, IS_DOUBLE, 0)
16511651
ZEND_END_ARG_INFO()
16521652

16531653
#define arginfo_is_nan arginfo_is_finite
16541654

16551655
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intdiv, 0, 2, IS_LONG, 0)
1656-
ZEND_ARG_TYPE_INFO(0, dividend, IS_LONG, 0)
1657-
ZEND_ARG_TYPE_INFO(0, divisor, IS_LONG, 0)
1656+
ZEND_ARG_TYPE_INFO(0, num1, IS_LONG, 0)
1657+
ZEND_ARG_TYPE_INFO(0, num2, IS_LONG, 0)
16581658
ZEND_END_ARG_INFO()
16591659

16601660
#define arginfo_is_infinite arginfo_is_finite
16611661

16621662
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pow, 0, 2, MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_OBJECT)
1663-
ZEND_ARG_TYPE_INFO(0, base, IS_MIXED, 0)
1664-
ZEND_ARG_TYPE_INFO(0, exp, IS_MIXED, 0)
1663+
ZEND_ARG_TYPE_INFO(0, num, IS_MIXED, 0)
1664+
ZEND_ARG_TYPE_INFO(0, exponent, IS_MIXED, 0)
16651665
ZEND_END_ARG_INFO()
16661666

16671667
#define arginfo_exp arginfo_sin
16681668

16691669
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_log, 0, 1, IS_DOUBLE, 0)
1670-
ZEND_ARG_TYPE_INFO(0, number, IS_DOUBLE, 0)
1670+
ZEND_ARG_TYPE_INFO(0, num, IS_DOUBLE, 0)
16711671
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, base, IS_DOUBLE, 0, "M_E")
16721672
ZEND_END_ARG_INFO()
16731673

@@ -1697,33 +1697,33 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_octdec, 0, 1, MAY_BE_LONG|MAY_BE
16971697
ZEND_END_ARG_INFO()
16981698

16991699
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_decbin, 0, 1, IS_STRING, 0)
1700-
ZEND_ARG_TYPE_INFO(0, number, IS_LONG, 0)
1700+
ZEND_ARG_TYPE_INFO(0, num, IS_LONG, 0)
17011701
ZEND_END_ARG_INFO()
17021702

17031703
#define arginfo_decoct arginfo_decbin
17041704

17051705
#define arginfo_dechex arginfo_decbin
17061706

17071707
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_base_convert, 0, 3, IS_STRING, 0)
1708-
ZEND_ARG_TYPE_INFO(0, number, IS_STRING, 0)
1708+
ZEND_ARG_TYPE_INFO(0, num, IS_STRING, 0)
17091709
ZEND_ARG_TYPE_INFO(0, from_base, IS_LONG, 0)
17101710
ZEND_ARG_TYPE_INFO(0, to_base, IS_LONG, 0)
17111711
ZEND_END_ARG_INFO()
17121712

17131713
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_number_format, 0, 1, IS_STRING, 0)
1714-
ZEND_ARG_TYPE_INFO(0, number, IS_DOUBLE, 0)
1714+
ZEND_ARG_TYPE_INFO(0, num, IS_DOUBLE, 0)
17151715
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, decimals, IS_LONG, 0, "0")
1716-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, decimal_point, IS_STRING, 1, "\".\"")
1716+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, decimal_separator, IS_STRING, 1, "\".\"")
17171717
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, thousands_separator, IS_STRING, 1, "\",\"")
17181718
ZEND_END_ARG_INFO()
17191719

1720-
#define arginfo_fmod arginfo_hypot
1721-
1722-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_fdiv, 0, 2, IS_DOUBLE, 0)
1723-
ZEND_ARG_TYPE_INFO(0, dividend, IS_DOUBLE, 0)
1724-
ZEND_ARG_TYPE_INFO(0, divisor, IS_DOUBLE, 0)
1720+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_fmod, 0, 2, IS_DOUBLE, 0)
1721+
ZEND_ARG_TYPE_INFO(0, num1, IS_DOUBLE, 0)
1722+
ZEND_ARG_TYPE_INFO(0, num2, IS_DOUBLE, 0)
17251723
ZEND_END_ARG_INFO()
17261724

1725+
#define arginfo_fdiv arginfo_fmod
1726+
17271727
#if defined(HAVE_GETTIMEOFDAY)
17281728
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_microtime, 0, 0, MAY_BE_STRING|MAY_BE_DOUBLE)
17291729
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, as_float, _IS_BOOL, 0, "false")
@@ -1779,7 +1779,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_proc_open, 0, 0, 3)
17791779
ZEND_ARG_TYPE_INFO(0, descriptor_spec, IS_ARRAY, 0)
17801780
ZEND_ARG_INFO(1, pipes)
17811781
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cwd, IS_STRING, 1, "null")
1782-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, env, IS_ARRAY, 1, "null")
1782+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, env_vars, IS_ARRAY, 1, "null")
17831783
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
17841784
ZEND_END_ARG_INFO()
17851785
#endif
@@ -1841,7 +1841,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_stream_select, 0, 4, MAY_BE_LONG
18411841
ZEND_ARG_TYPE_INFO(1, write, IS_ARRAY, 1)
18421842
ZEND_ARG_TYPE_INFO(1, except, IS_ARRAY, 1)
18431843
ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 1)
1844-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, microsectons, IS_LONG, 0, "0")
1844+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, microseconds, IS_LONG, 0, "0")
18451845
ZEND_END_ARG_INFO()
18461846

18471847
ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_context_create, 0, 0, 0)
@@ -1892,7 +1892,7 @@ ZEND_END_ARG_INFO()
18921892

18931893
ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_client, 0, 0, 1)
18941894
ZEND_ARG_TYPE_INFO(0, address, IS_STRING, 0)
1895-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, errno, "null")
1895+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, error_code, "null")
18961896
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, error_message, "null")
18971897
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeout, IS_DOUBLE, 1, "null")
18981898
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "STREAM_CLIENT_CONNECT")
@@ -1901,7 +1901,7 @@ ZEND_END_ARG_INFO()
19011901

19021902
ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_server, 0, 0, 1)
19031903
ZEND_ARG_TYPE_INFO(0, address, IS_STRING, 0)
1904-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, errno, "null")
1904+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, error_code, "null")
19051905
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, error_message, "null")
19061906
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "STREAM_SERVER_BIND | STREAM_SERVER_LISTEN")
19071907
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, context, "null")

0 commit comments

Comments
 (0)