Skip to content

Commit f8741fe

Browse files
committed
Tweaks
1 parent 1548da0 commit f8741fe

15 files changed

+41
-41
lines changed

ext/bcmath/bcmath.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ function bcdiv(string $num1, string $num2, ?int $scale = null): string {}
1212

1313
function bcmod(string $num1, string $num2, ?int $scale = null): string {}
1414

15-
function bcpowmod(string $base, string $exp, string $mod, ?int $scale = null): string {}
15+
function bcpowmod(string $num, string $exponent, string $modulus, ?int $scale = null): string {}
1616

17-
function bcpow(string $base, string $exp, ?int $scale = null): string {}
17+
function bcpow(string $num, string $exponent, ?int $scale = null): string {}
1818

1919
function bcsqrt(string $num, ?int $scale = null): string {}
2020

ext/bcmath/bcmath_arginfo.h

Lines changed: 6 additions & 6 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: 39f4f9ccb85c835b6949347f9dacbbcd8a58142b */
2+
* Stub hash: 0c1e2a6163a5fc0f42bf79bbc530af7c5fd77074 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bcadd, 0, 2, IS_STRING, 0)
55
ZEND_ARG_TYPE_INFO(0, num1, IS_STRING, 0)
@@ -16,15 +16,15 @@ ZEND_END_ARG_INFO()
1616
#define arginfo_bcmod arginfo_bcadd
1717

1818
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bcpowmod, 0, 3, IS_STRING, 0)
19-
ZEND_ARG_TYPE_INFO(0, base, IS_STRING, 0)
20-
ZEND_ARG_TYPE_INFO(0, exp, IS_STRING, 0)
21-
ZEND_ARG_TYPE_INFO(0, mod, IS_STRING, 0)
19+
ZEND_ARG_TYPE_INFO(0, num, IS_STRING, 0)
20+
ZEND_ARG_TYPE_INFO(0, exponent, IS_STRING, 0)
21+
ZEND_ARG_TYPE_INFO(0, modulus, IS_STRING, 0)
2222
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, scale, IS_LONG, 1, "null")
2323
ZEND_END_ARG_INFO()
2424

2525
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bcpow, 0, 2, IS_STRING, 0)
26-
ZEND_ARG_TYPE_INFO(0, base, IS_STRING, 0)
27-
ZEND_ARG_TYPE_INFO(0, exp, IS_STRING, 0)
26+
ZEND_ARG_TYPE_INFO(0, num, IS_STRING, 0)
27+
ZEND_ARG_TYPE_INFO(0, exponent, IS_STRING, 0)
2828
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, scale, IS_LONG, 1, "null")
2929
ZEND_END_ARG_INFO()
3030

ext/bcmath/tests/bcpow_error1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ try {
1313
}
1414
?>
1515
--EXPECT--
16-
bcpow(): Argument #2 ($exp) cannot have a fractional part
16+
bcpow(): Argument #2 ($exponent) cannot have a fractional part

ext/bcmath/tests/bcpow_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ try {
1313
}
1414
?>
1515
--EXPECT--
16-
bcpow(): Argument #2 ($exp) is too large
16+
bcpow(): Argument #2 ($exponent) is too large

ext/bcmath/tests/bcpowmod_negative_exponent.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ try {
1313
}
1414
?>
1515
--EXPECT--
16-
bcpowmod(): Argument #2 ($exp) must be greater than or equal to 0
16+
bcpowmod(): Argument #2 ($exponent) must be greater than or equal to 0

ext/bcmath/tests/bug72093.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ try {
1919
?>
2020
--EXPECT--
2121
bcpowmod(): Argument #4 ($scale) must be between 0 and 2147483647
22-
bcpowmod(): Argument #2 ($exp) cannot have a fractional part
22+
bcpowmod(): Argument #2 ($exponent) cannot have a fractional part

ext/bcmath/tests/bug75178.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ try {
1818
}
1919
?>
2020
--EXPECT--
21-
bcpowmod(): Argument #1 ($base) cannot have a fractional part
22-
bcpowmod(): Argument #3 ($mod) cannot have a fractional part
21+
bcpowmod(): Argument #1 ($num) cannot have a fractional part
22+
bcpowmod(): Argument #3 ($modulus) cannot have a fractional part

ext/bcmath/tests/bug78878.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ try {
1313
}
1414
?>
1515
--EXPECT--
16-
bcpowmod(): Argument #3 ($mod) cannot have a fractional part
16+
bcpowmod(): Argument #3 ($modulus) cannot have a fractional part

ext/gmp/gmp.stub.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ function gmp_sub(GMP|int|string $num1, GMP|int|string $num2): GMP {}
2222

2323
function gmp_mul(GMP|int|string $num1, GMP|int|string $num2): GMP {}
2424

25-
function gmp_div_qr(GMP|int|string $num1, GMP|int|string $num2, int $round = GMP_ROUND_ZERO): array {}
25+
function gmp_div_qr(GMP|int|string $num1, GMP|int|string $num2, int $rounding_mode = GMP_ROUND_ZERO): array {}
2626

27-
function gmp_div_q(GMP|int|string $num1, GMP|int|string $num2, int $round = GMP_ROUND_ZERO): GMP {}
27+
function gmp_div_q(GMP|int|string $num1, GMP|int|string $num2, int $rounding_mode = GMP_ROUND_ZERO): GMP {}
2828

29-
function gmp_div_r(GMP|int|string $num1, GMP|int|string $num2, int $round = GMP_ROUND_ZERO): GMP {}
29+
function gmp_div_r(GMP|int|string $num1, GMP|int|string $num2, int $rounding_mode = GMP_ROUND_ZERO): GMP {}
3030

3131
/** @alias gmp_div_q */
32-
function gmp_div(GMP|int|string $num1, GMP|int|string $num2, int $round = GMP_ROUND_ZERO): GMP {}
32+
function gmp_div(GMP|int|string $num1, GMP|int|string $num2, int $rounding_mode = GMP_ROUND_ZERO): GMP {}
3333

3434
function gmp_mod(GMP|int|string $num1, GMP|int|string $num2): GMP {}
3535

@@ -49,9 +49,9 @@ function gmp_root(GMP|int|string $num, int $nth): GMP {}
4949

5050
function gmp_rootrem(GMP|int|string $num, int $nth): array {}
5151

52-
function gmp_pow(GMP|int|string $base, int $exp): GMP {}
52+
function gmp_pow(GMP|int|string $num, int $exponent): GMP {}
5353

54-
function gmp_powm(GMP|int|string $base, GMP|int|string $exp, GMP|int|string $mod): GMP {}
54+
function gmp_powm(GMP|int|string $num, GMP|int|string $exponent, GMP|int|string $modulus): GMP {}
5555

5656
function gmp_perfect_square(GMP|int|string $num): bool {}
5757

ext/gmp/gmp_arginfo.h

Lines changed: 8 additions & 8 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: e807903038d57f74415907f763e0de51a4edfc5e */
2+
* Stub hash: a1eb4fd58c0b2155692611386c77035f1ef11c2c */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_init, 0, 1, GMP, 0)
55
ZEND_ARG_TYPE_MASK(0, num, MAY_BE_LONG|MAY_BE_STRING, NULL)
@@ -39,13 +39,13 @@ ZEND_END_ARG_INFO()
3939
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_div_qr, 0, 2, IS_ARRAY, 0)
4040
ZEND_ARG_OBJ_TYPE_MASK(0, num1, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
4141
ZEND_ARG_OBJ_TYPE_MASK(0, num2, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
42-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, round, IS_LONG, 0, "GMP_ROUND_ZERO")
42+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, rounding_mode, IS_LONG, 0, "GMP_ROUND_ZERO")
4343
ZEND_END_ARG_INFO()
4444

4545
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_div_q, 0, 2, GMP, 0)
4646
ZEND_ARG_OBJ_TYPE_MASK(0, num1, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
4747
ZEND_ARG_OBJ_TYPE_MASK(0, num2, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
48-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, round, IS_LONG, 0, "GMP_ROUND_ZERO")
48+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, rounding_mode, IS_LONG, 0, "GMP_ROUND_ZERO")
4949
ZEND_END_ARG_INFO()
5050

5151
#define arginfo_gmp_div_r arginfo_gmp_div_q
@@ -81,14 +81,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_rootrem, 0, 2, IS_ARRAY, 0)
8181
ZEND_END_ARG_INFO()
8282

8383
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_pow, 0, 2, GMP, 0)
84-
ZEND_ARG_OBJ_TYPE_MASK(0, base, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
85-
ZEND_ARG_TYPE_INFO(0, exp, IS_LONG, 0)
84+
ZEND_ARG_OBJ_TYPE_MASK(0, num, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
85+
ZEND_ARG_TYPE_INFO(0, exponent, IS_LONG, 0)
8686
ZEND_END_ARG_INFO()
8787

8888
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_powm, 0, 3, GMP, 0)
89-
ZEND_ARG_OBJ_TYPE_MASK(0, base, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
90-
ZEND_ARG_OBJ_TYPE_MASK(0, exp, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
91-
ZEND_ARG_OBJ_TYPE_MASK(0, mod, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
89+
ZEND_ARG_OBJ_TYPE_MASK(0, num, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
90+
ZEND_ARG_OBJ_TYPE_MASK(0, exponent, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
91+
ZEND_ARG_OBJ_TYPE_MASK(0, modulus, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
9292
ZEND_END_ARG_INFO()
9393

9494
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_perfect_square, 0, 1, _IS_BOOL, 0)

ext/gmp/tests/gmp_div_q.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ object(GMP)#2 (1) {
5151
["num"]=>
5252
string(1) "0"
5353
}
54-
gmp_div_q(): Argument #3 ($round) must be one of GMP_ROUND_ZERO, GMP_ROUND_PLUSINF, or GMP_ROUND_MINUSINF
54+
gmp_div_q(): Argument #3 ($rounding_mode) must be one of GMP_ROUND_ZERO, GMP_ROUND_PLUSINF, or GMP_ROUND_MINUSINF
5555
object(GMP)#1 (1) {
5656
["num"]=>
5757
string(4) "9131"

ext/gmp/tests/gmp_div_qr.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ array(2) {
7474
string(5) "12653"
7575
}
7676
}
77-
gmp_div_qr(): Argument #3 ($round) must be one of GMP_ROUND_ZERO, GMP_ROUND_PLUSINF, or GMP_ROUND_MINUSINF
77+
gmp_div_qr(): Argument #3 ($rounding_mode) must be one of GMP_ROUND_ZERO, GMP_ROUND_PLUSINF, or GMP_ROUND_MINUSINF
7878
array(2) {
7979
[0]=>
8080
object(GMP)#4 (1) {

ext/gmp/tests/gmp_div_r.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ object(GMP)#3 (1) {
5151
["num"]=>
5252
string(5) "12653"
5353
}
54-
gmp_div_r(): Argument #3 ($round) must be one of GMP_ROUND_ZERO, GMP_ROUND_PLUSINF, or GMP_ROUND_MINUSINF
54+
gmp_div_r(): Argument #3 ($rounding_mode) must be one of GMP_ROUND_ZERO, GMP_ROUND_PLUSINF, or GMP_ROUND_MINUSINF
5555
object(GMP)#2 (1) {
5656
["num"]=>
5757
string(2) "10"

ext/gmp/tests/gmp_pow.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ string(4) "1024"
4949
string(5) "-2048"
5050
string(4) "1024"
5151
string(1) "1"
52-
gmp_pow(): Argument #2 ($exp) must be greater than or equal to 0
52+
gmp_pow(): Argument #2 ($exponent) must be greater than or equal to 0
5353
string(4) "1024"
5454
string(14) "10240000000000"
5555
string(17) "97656250000000000"
56-
gmp_pow(): Argument #2 ($exp) must be greater than or equal to 0
56+
gmp_pow(): Argument #2 ($exponent) must be greater than or equal to 0
5757
string(14) "10240000000000"
5858
string(14) "10240000000000"
59-
gmp_pow(): Argument #2 ($exp) must be of type int, array given
60-
gmp_pow(): Argument #1 ($base) must be of type GMP|string|int, array given
59+
gmp_pow(): Argument #2 ($exponent) must be of type int, array given
60+
gmp_pow(): Argument #1 ($num) must be of type GMP|string|int, array given
6161
Done

ext/gmp/tests/gmp_pown.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ string(3) "171"
7575
string(3) "371"
7676
Modulo by zero
7777
Modulo by zero
78-
gmp_powm(): Argument #1 ($base) must be of type GMP|string|int, array given
79-
gmp_powm(): Argument #2 ($exp) must be of type GMP|string|int, array given
80-
gmp_powm(): Argument #2 ($exp) must be of type GMP|string|int, TypeError given
81-
gmp_powm(): Argument #1 ($base) must be of type GMP|string|int, array given
82-
gmp_powm(): Argument #2 ($exp) must be greater than or equal to 0
78+
gmp_powm(): Argument #1 ($num) must be of type GMP|string|int, array given
79+
gmp_powm(): Argument #2 ($exponent) must be of type GMP|string|int, array given
80+
gmp_powm(): Argument #2 ($exponent) must be of type GMP|string|int, TypeError given
81+
gmp_powm(): Argument #1 ($num) must be of type GMP|string|int, array given
82+
gmp_powm(): Argument #2 ($exponent) must be greater than or equal to 0
8383
object(GMP)#6 (1) {
8484
["num"]=>
8585
string(1) "1"

0 commit comments

Comments
 (0)