From 0988037325ae01980887ff079f21ae007902b564 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 24 Sep 2020 15:28:36 +0200
Subject: [PATCH 1/3] Update gmp parameter names

---
 ext/gmp/gmp.stub.php                  | 92 +++++++++++++--------------
 ext/gmp/gmp_arginfo.h                 | 72 ++++++++++-----------
 ext/gmp/tests/003.phpt                |  2 +-
 ext/gmp/tests/bug66872.phpt           |  2 +-
 ext/gmp/tests/gmp_abs.phpt            | 10 +--
 ext/gmp/tests/gmp_and.phpt            |  8 +--
 ext/gmp/tests/gmp_binomial.phpt       |  2 +-
 ext/gmp/tests/gmp_clrbit.phpt         |  2 +-
 ext/gmp/tests/gmp_cmp.phpt            |  2 +-
 ext/gmp/tests/gmp_com.phpt            |  4 +-
 ext/gmp/tests/gmp_div_q.phpt          |  4 +-
 ext/gmp/tests/gmp_div_qr.phpt         |  4 +-
 ext/gmp/tests/gmp_div_r.phpt          |  4 +-
 ext/gmp/tests/gmp_export.phpt         |  4 +-
 ext/gmp/tests/gmp_fact.phpt           | 10 +--
 ext/gmp/tests/gmp_gcdext.phpt         |  4 +-
 ext/gmp/tests/gmp_hamdist.phpt        |  6 +-
 ext/gmp/tests/gmp_import.phpt         |  4 +-
 ext/gmp/tests/gmp_init.phpt           |  6 +-
 ext/gmp/tests/gmp_intval.phpt         |  8 +--
 ext/gmp/tests/gmp_invert.phpt         |  6 +-
 ext/gmp/tests/gmp_jacobi.phpt         |  6 +-
 ext/gmp/tests/gmp_legendre.phpt       |  6 +-
 ext/gmp/tests/gmp_mod.phpt            |  4 +-
 ext/gmp/tests/gmp_neg.phpt            |  4 +-
 ext/gmp/tests/gmp_nextprime.phpt      |  6 +-
 ext/gmp/tests/gmp_or.phpt             |  8 +--
 ext/gmp/tests/gmp_perfect_square.phpt |  2 +-
 ext/gmp/tests/gmp_popcount.phpt       |  2 +-
 ext/gmp/tests/gmp_prob_prime.phpt     |  2 +-
 ext/gmp/tests/gmp_scan0.phpt          |  2 +-
 ext/gmp/tests/gmp_scan1.phpt          |  2 +-
 ext/gmp/tests/gmp_setbit.phpt         |  4 +-
 ext/gmp/tests/gmp_sign.phpt           |  6 +-
 ext/gmp/tests/gmp_sqrt.phpt           |  8 +--
 ext/gmp/tests/gmp_sqrtrem.phpt        |  6 +-
 ext/gmp/tests/gmp_strict_types.phpt   | 10 +--
 ext/gmp/tests/gmp_strval.phpt         |  8 +--
 ext/gmp/tests/gmp_sub.phpt            |  8 +--
 ext/gmp/tests/gmp_xor.phpt            |  8 +--
 40 files changed, 178 insertions(+), 180 deletions(-)

diff --git a/ext/gmp/gmp.stub.php b/ext/gmp/gmp.stub.php
index 8f2c6ed944fd2..85578d6a81819 100644
--- a/ext/gmp/gmp.stub.php
+++ b/ext/gmp/gmp.stub.php
@@ -6,76 +6,76 @@ class GMP
 {
 }
 
-function gmp_init(int|string $number, int $base = 0): GMP {}
+function gmp_init(int|string $num, int $base = 0): GMP {}
 
-function gmp_import(string $data, int $word_size = 1, int $options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN): GMP {}
+function gmp_import(string $data, int $word_size = 1, int $flags = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN): GMP {}
 
-function gmp_export(GMP|int|string $gmpnumber, int $word_size = 1, int $options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN): string {}
+function gmp_export(GMP|int|string $num, int $word_size = 1, int $flags = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN): string {}
 
-function gmp_intval(GMP|int|string $gmpnumber): int {}
+function gmp_intval(GMP|int|string $num): int {}
 
-function gmp_strval(GMP|int|string $gmpnumber, int $base = 10): string {}
+function gmp_strval(GMP|int|string $num, int $base = 10): string {}
 
-function gmp_add(GMP|int|string $a, GMP|int|string $b): GMP {}
+function gmp_add(GMP|int|string $num1, GMP|int|string $num2): GMP {}
 
-function gmp_sub(GMP|int|string $a, GMP|int|string $b): GMP {}
+function gmp_sub(GMP|int|string $num1, GMP|int|string $num2): GMP {}
 
-function gmp_mul(GMP|int|string $a, GMP|int|string $b): GMP {}
+function gmp_mul(GMP|int|string $num1, GMP|int|string $num2): GMP {}
 
-function gmp_div_qr(GMP|int|string $a, GMP|int|string $b, int $round = GMP_ROUND_ZERO): array {}
+function gmp_div_qr(GMP|int|string $num1, GMP|int|string $num2, int $round = GMP_ROUND_ZERO): array {}
 
-function gmp_div_q(GMP|int|string $a, GMP|int|string $b, int $round = GMP_ROUND_ZERO): GMP {}
+function gmp_div_q(GMP|int|string $num1, GMP|int|string $num2, int $round = GMP_ROUND_ZERO): GMP {}
 
-function gmp_div_r(GMP|int|string $a, GMP|int|string $b, int $round = GMP_ROUND_ZERO): GMP {}
+function gmp_div_r(GMP|int|string $num1, GMP|int|string $num2, int $round = GMP_ROUND_ZERO): GMP {}
 
 /** @alias gmp_div_q */
-function gmp_div(GMP|int|string $a, GMP|int|string $b, int $round = GMP_ROUND_ZERO): GMP {}
+function gmp_div(GMP|int|string $num1, GMP|int|string $num2, int $round = GMP_ROUND_ZERO): GMP {}
 
-function gmp_mod(GMP|int|string $a, GMP|int|string $b): GMP {}
+function gmp_mod(GMP|int|string $num1, GMP|int|string $num2): GMP {}
 
-function gmp_divexact(GMP|int|string $a, GMP|int|string $b): GMP {}
+function gmp_divexact(GMP|int|string $num1, GMP|int|string $num2): GMP {}
 
-function gmp_neg(GMP|int|string $a): GMP {}
+function gmp_neg(GMP|int|string $num): GMP {}
 
-function gmp_abs(GMP|int|string $a): GMP {}
+function gmp_abs(GMP|int|string $num): GMP {}
 
-function gmp_fact(GMP|int|string $a): GMP {}
+function gmp_fact(GMP|int|string $num): GMP {}
 
-function gmp_sqrt(GMP|int|string $a): GMP {}
+function gmp_sqrt(GMP|int|string $num): GMP {}
 
-function gmp_sqrtrem(GMP|int|string $a): array {}
+function gmp_sqrtrem(GMP|int|string $num): array {}
 
-function gmp_root(GMP|int|string $a, int $nth): GMP {}
+function gmp_root(GMP|int|string $num, int $nth): GMP {}
 
-function gmp_rootrem(GMP|int|string $a, int $nth): array {}
+function gmp_rootrem(GMP|int|string $num, int $nth): array {}
 
 function gmp_pow(GMP|int|string $base, int $exp): GMP {}
 
 function gmp_powm(GMP|int|string $base, GMP|int|string $exp, GMP|int|string $mod): GMP {}
 
-function gmp_perfect_square(GMP|int|string $a): bool {}
+function gmp_perfect_square(GMP|int|string $num): bool {}
 
-function gmp_perfect_power(GMP|int|string $a): bool {}
+function gmp_perfect_power(GMP|int|string $num): bool {}
 
-function gmp_prob_prime(GMP|int|string $a, int $reps = 10): int {}
+function gmp_prob_prime(GMP|int|string $num, int $repetitions = 10): int {}
 
-function gmp_gcd(GMP|int|string $a, GMP|int|string $b): GMP {}
+function gmp_gcd(GMP|int|string $num1, GMP|int|string $num2): GMP {}
 
-function gmp_gcdext(GMP|int|string $a, GMP|int|string $b): array {}
+function gmp_gcdext(GMP|int|string $num1, GMP|int|string $num2): array {}
 
-function gmp_lcm(GMP|int|string $a, GMP|int|string $b): GMP {}
+function gmp_lcm(GMP|int|string $num1, GMP|int|string $num2): GMP {}
 
-function gmp_invert(GMP|int|string $a, GMP|int|string $b): GMP|false {}
+function gmp_invert(GMP|int|string $num1, GMP|int|string $num2): GMP|false {}
 
-function gmp_jacobi(GMP|int|string $a, GMP|int|string $b): int {}
+function gmp_jacobi(GMP|int|string $num1, GMP|int|string $num2): int {}
 
-function gmp_legendre(GMP|int|string $a, GMP|int|string $b): int {}
+function gmp_legendre(GMP|int|string $num1, GMP|int|string $num2): int {}
 
-function gmp_kronecker(GMP|int|string $a, GMP|int|string $b): int {}
+function gmp_kronecker(GMP|int|string $num1, GMP|int|string $num2): int {}
 
-function gmp_cmp(GMP|int|string $a, GMP|int|string $b): int {}
+function gmp_cmp(GMP|int|string $num1, GMP|int|string $num2): int {}
 
-function gmp_sign(GMP|int|string $a): int {}
+function gmp_sign(GMP|int|string $num): int {}
 
 function gmp_random_seed(GMP|int|string $seed): void {}
 
@@ -83,28 +83,28 @@ function gmp_random_bits(int $bits): GMP {}
 
 function gmp_random_range(GMP|int|string $min, GMP|int|string $max): GMP {}
 
-function gmp_and(GMP|int|string $a, GMP|int|string $b): GMP {}
+function gmp_and(GMP|int|string $num1, GMP|int|string $num2): GMP {}
 
-function gmp_or(GMP|int|string $a, GMP|int|string $b): GMP {}
+function gmp_or(GMP|int|string $num1, GMP|int|string $num2): GMP {}
 
-function gmp_com(GMP|int|string $a): GMP {}
+function gmp_com(GMP|int|string $num): GMP {}
 
-function gmp_xor(GMP|int|string $a, GMP|int|string $b): GMP {}
+function gmp_xor(GMP|int|string $num1, GMP|int|string $num2): GMP {}
 
-function gmp_setbit(GMP $a, int $index, bool $set_clear = true): void {}
+function gmp_setbit(GMP $num, int $index, bool $value = true): void {}
 
-function gmp_clrbit(GMP $a, int $index): void {}
+function gmp_clrbit(GMP $num, int $index): void {}
 
-function gmp_testbit(GMP|int|string $a, int $index): bool {}
+function gmp_testbit(GMP|int|string $num, int $index): bool {}
 
-function gmp_scan0(GMP|int|string $a, int $start): int {}
+function gmp_scan0(GMP|int|string $num1, int $start): int {}
 
-function gmp_scan1(GMP|int|string $a, int $start): int {}
+function gmp_scan1(GMP|int|string $num1, int $start): int {}
 
-function gmp_popcount(GMP|int|string $a): int {}
+function gmp_popcount(GMP|int|string $num): int {}
 
-function gmp_hamdist(GMP|int|string $a, GMP|int|string $b): int {}
+function gmp_hamdist(GMP|int|string $num1, GMP|int|string $num2): int {}
 
-function gmp_nextprime(GMP|int|string $a): GMP {}
+function gmp_nextprime(GMP|int|string $num): GMP {}
 
-function gmp_binomial(GMP|int|string $a, int $b): GMP {}
+function gmp_binomial(GMP|int|string $n, int $k): GMP {}
diff --git a/ext/gmp/gmp_arginfo.h b/ext/gmp/gmp_arginfo.h
index 9f4a44f6d7954..920104ae5f5d4 100644
--- a/ext/gmp/gmp_arginfo.h
+++ b/ext/gmp/gmp_arginfo.h
@@ -1,35 +1,35 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: fe4ff47c3359705bf2b1a64a882659fabd370bab */
+ * Stub hash: e807903038d57f74415907f763e0de51a4edfc5e */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_init, 0, 1, GMP, 0)
-	ZEND_ARG_TYPE_MASK(0, number, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_TYPE_MASK(0, num, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, base, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_import, 0, 1, GMP, 0)
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, word_size, IS_LONG, 0, "1")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "GMP_MSW_FIRST | GMP_NATIVE_ENDIAN")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "GMP_MSW_FIRST | GMP_NATIVE_ENDIAN")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_export, 0, 1, IS_STRING, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, gmpnumber, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, word_size, IS_LONG, 0, "1")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "GMP_MSW_FIRST | GMP_NATIVE_ENDIAN")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "GMP_MSW_FIRST | GMP_NATIVE_ENDIAN")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_intval, 0, 1, IS_LONG, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, gmpnumber, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_strval, 0, 1, IS_STRING, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, gmpnumber, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, base, IS_LONG, 0, "10")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_add, 0, 2, GMP, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_OBJ_TYPE_MASK(0, b, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num1, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num2, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 ZEND_END_ARG_INFO()
 
 #define arginfo_gmp_sub arginfo_gmp_add
@@ -37,14 +37,14 @@ ZEND_END_ARG_INFO()
 #define arginfo_gmp_mul arginfo_gmp_add
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_div_qr, 0, 2, IS_ARRAY, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_OBJ_TYPE_MASK(0, b, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num1, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num2, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, round, IS_LONG, 0, "GMP_ROUND_ZERO")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_div_q, 0, 2, GMP, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_OBJ_TYPE_MASK(0, b, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num1, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num2, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, round, IS_LONG, 0, "GMP_ROUND_ZERO")
 ZEND_END_ARG_INFO()
 
@@ -57,7 +57,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_gmp_divexact arginfo_gmp_add
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_neg, 0, 1, GMP, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 ZEND_END_ARG_INFO()
 
 #define arginfo_gmp_abs arginfo_gmp_neg
@@ -67,16 +67,16 @@ ZEND_END_ARG_INFO()
 #define arginfo_gmp_sqrt arginfo_gmp_neg
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_sqrtrem, 0, 1, IS_ARRAY, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_root, 0, 2, GMP, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO(0, nth, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_rootrem, 0, 2, IS_ARRAY, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO(0, nth, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
@@ -92,33 +92,33 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_powm, 0, 3, GMP, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_perfect_square, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 ZEND_END_ARG_INFO()
 
 #define arginfo_gmp_perfect_power arginfo_gmp_perfect_square
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_prob_prime, 0, 1, IS_LONG, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, reps, IS_LONG, 0, "10")
+	ZEND_ARG_OBJ_TYPE_MASK(0, num, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, repetitions, IS_LONG, 0, "10")
 ZEND_END_ARG_INFO()
 
 #define arginfo_gmp_gcd arginfo_gmp_add
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_gcdext, 0, 2, IS_ARRAY, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_OBJ_TYPE_MASK(0, b, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num1, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num2, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 ZEND_END_ARG_INFO()
 
 #define arginfo_gmp_lcm arginfo_gmp_add
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_gmp_invert, 0, 2, GMP, MAY_BE_FALSE)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_OBJ_TYPE_MASK(0, b, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num1, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num2, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_jacobi, 0, 2, IS_LONG, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_OBJ_TYPE_MASK(0, b, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num1, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num2, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 ZEND_END_ARG_INFO()
 
 #define arginfo_gmp_legendre arginfo_gmp_jacobi
@@ -127,9 +127,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_gmp_cmp arginfo_gmp_jacobi
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_sign, 0, 1, IS_LONG, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
-ZEND_END_ARG_INFO()
+#define arginfo_gmp_sign arginfo_gmp_intval
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_random_seed, 0, 1, IS_VOID, 0)
 	ZEND_ARG_OBJ_TYPE_MASK(0, seed, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
@@ -153,37 +151,37 @@ ZEND_END_ARG_INFO()
 #define arginfo_gmp_xor arginfo_gmp_add
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_setbit, 0, 2, IS_VOID, 0)
-	ZEND_ARG_OBJ_INFO(0, a, GMP, 0)
+	ZEND_ARG_OBJ_INFO(0, num, GMP, 0)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, set_clear, _IS_BOOL, 0, "true")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_clrbit, 0, 2, IS_VOID, 0)
-	ZEND_ARG_OBJ_INFO(0, a, GMP, 0)
+	ZEND_ARG_OBJ_INFO(0, num, GMP, 0)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_testbit, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_scan0, 0, 2, IS_LONG, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num1, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO(0, start, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_gmp_scan1 arginfo_gmp_scan0
 
-#define arginfo_gmp_popcount arginfo_gmp_sign
+#define arginfo_gmp_popcount arginfo_gmp_intval
 
 #define arginfo_gmp_hamdist arginfo_gmp_jacobi
 
 #define arginfo_gmp_nextprime arginfo_gmp_neg
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_binomial, 0, 2, GMP, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, a, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_TYPE_INFO(0, b, IS_LONG, 0)
+	ZEND_ARG_OBJ_TYPE_MASK(0, n, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_TYPE_INFO(0, k, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 
diff --git a/ext/gmp/tests/003.phpt b/ext/gmp/tests/003.phpt
index 7a84d3f8d0151..70613eb94b046 100644
--- a/ext/gmp/tests/003.phpt
+++ b/ext/gmp/tests/003.phpt
@@ -35,7 +35,7 @@ Check for number base recognition
         }
 ?>
 --EXPECT--
-gmp_init(): Argument #1 ($number) is not an integer string
+gmp_init(): Argument #1 ($num) is not an integer string
 1234
 1234
 10011010010
diff --git a/ext/gmp/tests/bug66872.phpt b/ext/gmp/tests/bug66872.phpt
index c44d4c807e8a0..e4090176de538 100644
--- a/ext/gmp/tests/bug66872.phpt
+++ b/ext/gmp/tests/bug66872.phpt
@@ -13,4 +13,4 @@ try {
 
 ?>
 --EXPECT--
-gmp_testbit(): Argument #1 ($a) is not an integer string
+gmp_testbit(): Argument #1 ($num) is not an integer string
diff --git a/ext/gmp/tests/gmp_abs.phpt b/ext/gmp/tests/gmp_abs.phpt
index 0fb8ba5f1a291..57b0dde25c821 100644
--- a/ext/gmp/tests/gmp_abs.phpt
+++ b/ext/gmp/tests/gmp_abs.phpt
@@ -44,14 +44,14 @@ try {
 echo "Done\n";
 ?>
 --EXPECT--
-gmp_abs(): Argument #1 ($a) is not an integer string
+gmp_abs(): Argument #1 ($num) is not an integer string
 string(1) "0"
 string(1) "0"
-gmp_abs(): Argument #1 ($a) must be of type GMP|string|int, float given
+gmp_abs(): Argument #1 ($num) must be of type GMP|string|int, float given
 string(21) "111111111111111111111"
 string(21) "111111111111111111111"
 string(1) "0"
-gmp_abs(): Argument #1 ($a) is not an integer string
-gmp_abs(): Argument #1 ($a) is not an integer string
-gmp_abs(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_abs(): Argument #1 ($num) is not an integer string
+gmp_abs(): Argument #1 ($num) is not an integer string
+gmp_abs(): Argument #1 ($num) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_and.phpt b/ext/gmp/tests/gmp_and.phpt
index 26ed3dda3761b..aa40a12aa4b54 100644
--- a/ext/gmp/tests/gmp_and.phpt
+++ b/ext/gmp/tests/gmp_and.phpt
@@ -47,10 +47,10 @@ string(5) "40994"
 string(3) "515"
 string(4) "3333"
 string(4) "4544"
-gmp_and(): Argument #1 ($a) is not an integer string
+gmp_and(): Argument #1 ($num1) is not an integer string
 string(4) "1536"
 string(15) "424703623692768"
-gmp_and(): Argument #1 ($a) must be of type GMP|string|int, array given
-gmp_and(): Argument #2 ($b) must be of type GMP|string|int, array given
-gmp_and(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_and(): Argument #1 ($num1) must be of type GMP|string|int, array given
+gmp_and(): Argument #2 ($num2) must be of type GMP|string|int, array given
+gmp_and(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_binomial.phpt b/ext/gmp/tests/gmp_binomial.phpt
index b6db19c35cc7c..eadf175ac9e0a 100644
--- a/ext/gmp/tests/gmp_binomial.phpt
+++ b/ext/gmp/tests/gmp_binomial.phpt
@@ -67,4 +67,4 @@ object(GMP)#2 (1) {
   ["num"]=>
   string(1) "7"
 }
-gmp_binomial(): Argument #2 ($b) must be greater than or equal to 0
+gmp_binomial(): Argument #2 ($k) must be greater than or equal to 0
diff --git a/ext/gmp/tests/gmp_clrbit.phpt b/ext/gmp/tests/gmp_clrbit.phpt
index 5dc0ff4dbb8d9..7bcf6969e9df3 100644
--- a/ext/gmp/tests/gmp_clrbit.phpt
+++ b/ext/gmp/tests/gmp_clrbit.phpt
@@ -52,5 +52,5 @@ gmp_clrbit(): Argument #2 ($index) must be greater than or equal to 0
 string(7) "1000000"
 string(7) "1000000"
 string(30) "238462734628347239571822592658"
-gmp_clrbit(): Argument #1 ($a) must be of type GMP, array given
+gmp_clrbit(): Argument #1 ($num) must be of type GMP, array given
 Done
diff --git a/ext/gmp/tests/gmp_cmp.phpt b/ext/gmp/tests/gmp_cmp.phpt
index 35c2796ffaae2..45ca865dc6344 100644
--- a/ext/gmp/tests/gmp_cmp.phpt
+++ b/ext/gmp/tests/gmp_cmp.phpt
@@ -34,5 +34,5 @@ int(1)
 int(-1)
 bool(true)
 int(0)
-gmp_cmp(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_cmp(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_com.phpt b/ext/gmp/tests/gmp_com.phpt
index 71f9f39e96a40..1cc0aae428e4a 100644
--- a/ext/gmp/tests/gmp_com.phpt
+++ b/ext/gmp/tests/gmp_com.phpt
@@ -33,12 +33,12 @@ echo "Done\n";
 --EXPECT--
 string(2) "-1"
 string(2) "-1"
-gmp_com(): Argument #1 ($a) is not an integer string
+gmp_com(): Argument #1 ($num) is not an integer string
 string(14) "-2394876545679"
 string(3) "110"
 string(7) "-874654"
 string(4) "9875"
 string(9) "-98765468"
 string(12) "-98765463338"
-gmp_com(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_com(): Argument #1 ($num) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_div_q.phpt b/ext/gmp/tests/gmp_div_q.phpt
index 08d82c6132c62..4cce74ce5db5a 100644
--- a/ext/gmp/tests/gmp_div_q.phpt
+++ b/ext/gmp/tests/gmp_div_q.phpt
@@ -76,6 +76,6 @@ object(GMP)#1 (1) {
   ["num"]=>
   string(4) "9131"
 }
-gmp_div_q(): Argument #1 ($a) must be of type GMP|string|int, resource given
-gmp_div_q(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_div_q(): Argument #1 ($num1) must be of type GMP|string|int, resource given
+gmp_div_q(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_div_qr.phpt b/ext/gmp/tests/gmp_div_qr.phpt
index 03c5facac2a48..fe9fb1e091799 100644
--- a/ext/gmp/tests/gmp_div_qr.phpt
+++ b/ext/gmp/tests/gmp_div_qr.phpt
@@ -159,6 +159,6 @@ array(2) {
     string(2) "10"
   }
 }
-gmp_div_qr(): Argument #1 ($a) must be of type GMP|string|int, resource given
-gmp_div_qr(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_div_qr(): Argument #1 ($num1) must be of type GMP|string|int, resource given
+gmp_div_qr(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_div_r.phpt b/ext/gmp/tests/gmp_div_r.phpt
index eab9286fe763b..545457a73f4a1 100644
--- a/ext/gmp/tests/gmp_div_r.phpt
+++ b/ext/gmp/tests/gmp_div_r.phpt
@@ -76,6 +76,6 @@ object(GMP)#3 (1) {
   ["num"]=>
   string(2) "10"
 }
-gmp_div_r(): Argument #1 ($a) must be of type GMP|string|int, resource given
-gmp_div_r(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_div_r(): Argument #1 ($num1) must be of type GMP|string|int, resource given
+gmp_div_r(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_export.phpt b/ext/gmp/tests/gmp_export.phpt
index d3ccfb3b1e5fb..6877e5624d680 100644
--- a/ext/gmp/tests/gmp_export.phpt
+++ b/ext/gmp/tests/gmp_export.phpt
@@ -78,5 +78,5 @@ try {
 bool(true)
 gmp_export(): Argument #2 ($word_size) must be greater than or equal to 1
 gmp_export(): Argument #2 ($word_size) must be greater than or equal to 1
-gmp_export(): Argument #3 ($options) cannot use multiple word order options
-gmp_export(): Argument #3 ($options) cannot use multiple endian options
+gmp_export(): Argument #3 ($flags) cannot use multiple word order options
+gmp_export(): Argument #3 ($flags) cannot use multiple endian options
diff --git a/ext/gmp/tests/gmp_fact.phpt b/ext/gmp/tests/gmp_fact.phpt
index 81f16019f0928..d2b98f78c28c9 100644
--- a/ext/gmp/tests/gmp_fact.phpt
+++ b/ext/gmp/tests/gmp_fact.phpt
@@ -48,16 +48,16 @@ echo "Done\n";
 ?>
 --EXPECT--
 string(1) "1"
-gmp_fact(): Argument #1 ($a) is not an integer string
+gmp_fact(): Argument #1 ($num) is not an integer string
 string(1) "1"
-gmp_fact(): Argument #1 ($a) must be greater than or equal to 0
-gmp_fact(): Argument #1 ($a) must be greater than or equal to 0
+gmp_fact(): Argument #1 ($num) must be greater than or equal to 0
+gmp_fact(): Argument #1 ($num) must be greater than or equal to 0
 string(1) "1"
 string(19) "2432902008176640000"
 string(65) "30414093201713378043612608166064768844377641568960512000000000000"
 string(7) "3628800"
 string(1) "1"
 string(9) "479001600"
-gmp_fact(): Argument #1 ($a) must be greater than or equal to 0
-gmp_fact(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_fact(): Argument #1 ($num) must be greater than or equal to 0
+gmp_fact(): Argument #1 ($num) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_gcdext.phpt b/ext/gmp/tests/gmp_gcdext.phpt
index abab8cdfdcd83..0f4b23af7d9f9 100644
--- a/ext/gmp/tests/gmp_gcdext.phpt
+++ b/ext/gmp/tests/gmp_gcdext.phpt
@@ -63,6 +63,6 @@ string(1) "1"
 string(1) "1"
 string(3) "195"
 string(3) "195"
-gmp_gcdext(): Argument #2 ($b) must be of type GMP|string|int, array given
-gmp_gcdext(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_gcdext(): Argument #2 ($num2) must be of type GMP|string|int, array given
+gmp_gcdext(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_hamdist.phpt b/ext/gmp/tests/gmp_hamdist.phpt
index c4b28949411fd..8e216e39a080b 100644
--- a/ext/gmp/tests/gmp_hamdist.phpt
+++ b/ext/gmp/tests/gmp_hamdist.phpt
@@ -42,7 +42,7 @@ int(-1)
 int(43)
 int(0)
 int(26)
-gmp_hamdist(): Argument #2 ($b) must be of type GMP|string|int, array given
-gmp_hamdist(): Argument #1 ($a) must be of type GMP|string|int, array given
-gmp_hamdist(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_hamdist(): Argument #2 ($num2) must be of type GMP|string|int, array given
+gmp_hamdist(): Argument #1 ($num1) must be of type GMP|string|int, array given
+gmp_hamdist(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_import.phpt b/ext/gmp/tests/gmp_import.phpt
index 59bf652a1f3cf..026ab079d5637 100644
--- a/ext/gmp/tests/gmp_import.phpt
+++ b/ext/gmp/tests/gmp_import.phpt
@@ -95,5 +95,5 @@ gmp_import(): Argument #2 ($word_size) must be greater than or equal to 1
 gmp_import(): Argument #1 ($data) must be a multiple of argument #2 ($word_size)
 gmp_import(): Argument #1 ($data) must be a multiple of argument #2 ($word_size)
 gmp_import(): Argument #1 ($data) must be a multiple of argument #2 ($word_size)
-gmp_import(): Argument #3 ($options) cannot use multiple word order options
-gmp_import(): Argument #3 ($options) cannot use multiple endian options
+gmp_import(): Argument #3 ($flags) cannot use multiple word order options
+gmp_import(): Argument #3 ($flags) cannot use multiple endian options
diff --git a/ext/gmp/tests/gmp_init.phpt b/ext/gmp/tests/gmp_init.phpt
index b600a020ec7f9..045ddc668e38e 100644
--- a/ext/gmp/tests/gmp_init.phpt
+++ b/ext/gmp/tests/gmp_init.phpt
@@ -38,7 +38,7 @@ object(GMP)#1 (1) {
 }
 string(8) "98765678"
 gmp_init(): Argument #2 ($base) must be between 2 and 62
-gmp_init(): Argument #1 ($number) is not an integer string
-gmp_init(): Argument #1 ($number) is not an integer string
-gmp_init(): Argument #1 ($number) is not an integer string
+gmp_init(): Argument #1 ($num) is not an integer string
+gmp_init(): Argument #1 ($num) is not an integer string
+gmp_init(): Argument #1 ($num) is not an integer string
 Done
diff --git a/ext/gmp/tests/gmp_intval.phpt b/ext/gmp/tests/gmp_intval.phpt
index 9540f7a432ca1..4642d9ec5229e 100644
--- a/ext/gmp/tests/gmp_intval.phpt
+++ b/ext/gmp/tests/gmp_intval.phpt
@@ -44,8 +44,8 @@ int(-2349828)
 int(2342344)
 int(1)
 int(12345678)
-gmp_intval(): Argument #1 ($gmpnumber) is not an integer string
-gmp_intval(): Argument #1 ($gmpnumber) must be of type GMP|string|int, stdClass given
-gmp_intval(): Argument #1 ($gmpnumber) must be of type GMP|string|int, array given
-gmp_intval(): Argument #1 ($gmpnumber) is not an integer string
+gmp_intval(): Argument #1 ($num) is not an integer string
+gmp_intval(): Argument #1 ($num) must be of type GMP|string|int, stdClass given
+gmp_intval(): Argument #1 ($num) must be of type GMP|string|int, array given
+gmp_intval(): Argument #1 ($num) is not an integer string
 Done
diff --git a/ext/gmp/tests/gmp_invert.phpt b/ext/gmp/tests/gmp_invert.phpt
index b5ab666061a25..888802f25dd65 100644
--- a/ext/gmp/tests/gmp_invert.phpt
+++ b/ext/gmp/tests/gmp_invert.phpt
@@ -53,7 +53,7 @@ string(1) "0"
 string(1) "0"
 string(22) "3498273496234234523441"
 string(1) "1"
-gmp_invert(): Argument #1 ($a) must be of type GMP|string|int, array given
-gmp_invert(): Argument #2 ($b) must be of type GMP|string|int, array given
-gmp_invert(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_invert(): Argument #1 ($num1) must be of type GMP|string|int, array given
+gmp_invert(): Argument #2 ($num2) must be of type GMP|string|int, array given
+gmp_invert(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_jacobi.phpt b/ext/gmp/tests/gmp_jacobi.phpt
index 116442457819b..da95b805facec 100644
--- a/ext/gmp/tests/gmp_jacobi.phpt
+++ b/ext/gmp/tests/gmp_jacobi.phpt
@@ -56,7 +56,7 @@ string(1) "0"
 string(2) "-1"
 string(1) "0"
 string(2) "-1"
-gmp_jacobi(): Argument #2 ($b) must be of type GMP|string|int, array given
-gmp_jacobi(): Argument #1 ($a) must be of type GMP|string|int, array given
-gmp_jacobi(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_jacobi(): Argument #2 ($num2) must be of type GMP|string|int, array given
+gmp_jacobi(): Argument #1 ($num1) must be of type GMP|string|int, array given
+gmp_jacobi(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_legendre.phpt b/ext/gmp/tests/gmp_legendre.phpt
index 258e453e4de18..fb8ad08423811 100644
--- a/ext/gmp/tests/gmp_legendre.phpt
+++ b/ext/gmp/tests/gmp_legendre.phpt
@@ -56,7 +56,7 @@ string(1) "0"
 string(2) "-1"
 string(1) "0"
 string(2) "-1"
-gmp_legendre(): Argument #2 ($b) must be of type GMP|string|int, array given
-gmp_legendre(): Argument #1 ($a) must be of type GMP|string|int, array given
-gmp_legendre(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_legendre(): Argument #2 ($num2) must be of type GMP|string|int, array given
+gmp_legendre(): Argument #1 ($num1) must be of type GMP|string|int, array given
+gmp_legendre(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_mod.phpt b/ext/gmp/tests/gmp_mod.phpt
index 90868ab9d99da..a20f871df9561 100644
--- a/ext/gmp/tests/gmp_mod.phpt
+++ b/ext/gmp/tests/gmp_mod.phpt
@@ -33,7 +33,7 @@ var_dump(gmp_mod($a, $b));
 echo "Done\n";
 ?>
 --EXPECT--
-gmp_mod(): Argument #1 ($a) is not an integer string
+gmp_mod(): Argument #1 ($num1) is not an integer string
 object(GMP)#2 (1) {
   ["num"]=>
   string(1) "0"
@@ -43,7 +43,7 @@ object(GMP)#2 (1) {
   string(1) "0"
 }
 Modulo by zero
-gmp_mod(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_mod(): Argument #1 ($num1) must be of type GMP|string|int, array given
 object(GMP)#4 (1) {
   ["num"]=>
   string(5) "31161"
diff --git a/ext/gmp/tests/gmp_neg.phpt b/ext/gmp/tests/gmp_neg.phpt
index 5d8e80cd5b620..bed25722bb52e 100644
--- a/ext/gmp/tests/gmp_neg.phpt
+++ b/ext/gmp/tests/gmp_neg.phpt
@@ -36,9 +36,9 @@ int(0)
 int(-1)
 int(1)
 int(1)
-gmp_neg(): Argument #1 ($a) is not an integer string
+gmp_neg(): Argument #1 ($num) is not an integer string
 int(0)
 int(0)
 string(21) "-12345678901234567890"
-gmp_neg(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_neg(): Argument #1 ($num) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_nextprime.phpt b/ext/gmp/tests/gmp_nextprime.phpt
index e2fa2703cbbc8..7d252aee65985 100644
--- a/ext/gmp/tests/gmp_nextprime.phpt
+++ b/ext/gmp/tests/gmp_nextprime.phpt
@@ -43,7 +43,7 @@ string(1) "2"
 string(1) "2"
 string(4) "1009"
 string(6) "100003"
-gmp_nextprime(): Argument #1 ($a) must be of type GMP|string|int, array given
-gmp_nextprime(): Argument #1 ($a) is not an integer string
-gmp_nextprime(): Argument #1 ($a) must be of type GMP|string|int, stdClass given
+gmp_nextprime(): Argument #1 ($num) must be of type GMP|string|int, array given
+gmp_nextprime(): Argument #1 ($num) is not an integer string
+gmp_nextprime(): Argument #1 ($num) must be of type GMP|string|int, stdClass given
 Done
diff --git a/ext/gmp/tests/gmp_or.phpt b/ext/gmp/tests/gmp_or.phpt
index 5a34a82addf91..75f631e326817 100644
--- a/ext/gmp/tests/gmp_or.phpt
+++ b/ext/gmp/tests/gmp_or.phpt
@@ -46,10 +46,10 @@ string(6) "517363"
 string(10) "2342341163"
 string(2) "-1"
 string(3) "-19"
-gmp_or(): Argument #1 ($a) is not an integer string
+gmp_or(): Argument #1 ($num1) is not an integer string
 string(15) "987657876576252"
 string(21) "987658441719689394144"
-gmp_or(): Argument #1 ($a) must be of type GMP|string|int, array given
-gmp_or(): Argument #2 ($b) must be of type GMP|string|int, array given
-gmp_or(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_or(): Argument #1 ($num1) must be of type GMP|string|int, array given
+gmp_or(): Argument #2 ($num2) must be of type GMP|string|int, array given
+gmp_or(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_perfect_square.phpt b/ext/gmp/tests/gmp_perfect_square.phpt
index d6cd09e40ef49..f96f39091f3de 100644
--- a/ext/gmp/tests/gmp_perfect_square.phpt
+++ b/ext/gmp/tests/gmp_perfect_square.phpt
@@ -41,5 +41,5 @@ bool(false)
 bool(false)
 bool(true)
 bool(false)
-gmp_perfect_square(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_perfect_square(): Argument #1 ($num) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_popcount.phpt b/ext/gmp/tests/gmp_popcount.phpt
index fa1a6172d4fb6..ddd1c2434c20a 100644
--- a/ext/gmp/tests/gmp_popcount.phpt
+++ b/ext/gmp/tests/gmp_popcount.phpt
@@ -28,5 +28,5 @@ int(10)
 int(31)
 int(-1)
 int(20)
-gmp_popcount(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_popcount(): Argument #1 ($num) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_prob_prime.phpt b/ext/gmp/tests/gmp_prob_prime.phpt
index efc5cf4e165ae..be8a8d0f6859f 100644
--- a/ext/gmp/tests/gmp_prob_prime.phpt
+++ b/ext/gmp/tests/gmp_prob_prime.phpt
@@ -75,5 +75,5 @@ int(0)
 int(0)
 int(0)
 int(0)
-gmp_prob_prime(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_prob_prime(): Argument #1 ($num) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_scan0.phpt b/ext/gmp/tests/gmp_scan0.phpt
index 017148c0119b0..c949f6a3beef6 100644
--- a/ext/gmp/tests/gmp_scan0.phpt
+++ b/ext/gmp/tests/gmp_scan0.phpt
@@ -34,5 +34,5 @@ int(0)
 int(5)
 int(200)
 int(13)
-gmp_scan0(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_scan0(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_scan1.phpt b/ext/gmp/tests/gmp_scan1.phpt
index ba480e3e9665e..d625f0cb86343 100644
--- a/ext/gmp/tests/gmp_scan1.phpt
+++ b/ext/gmp/tests/gmp_scan1.phpt
@@ -34,5 +34,5 @@ int(12)
 int(9)
 int(-1)
 int(10)
-gmp_scan1(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_scan1(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_setbit.phpt b/ext/gmp/tests/gmp_setbit.phpt
index 02857c7e52ed9..6dad79f5d3b4e 100644
--- a/ext/gmp/tests/gmp_setbit.phpt
+++ b/ext/gmp/tests/gmp_setbit.phpt
@@ -59,6 +59,6 @@ string(1) "7"
 string(12) "100008388608"
 string(12) "100000000000"
 string(12) "100000000008"
-gmp_setbit(): Argument #1 ($a) must be of type GMP, string given
-gmp_setbit(): Argument #1 ($a) must be of type GMP, array given
+gmp_setbit(): Argument #1 ($num) must be of type GMP, string given
+gmp_setbit(): Argument #1 ($num) must be of type GMP, array given
 Done
diff --git a/ext/gmp/tests/gmp_sign.phpt b/ext/gmp/tests/gmp_sign.phpt
index 01567bb5c43f8..7d7e67177c996 100644
--- a/ext/gmp/tests/gmp_sign.phpt
+++ b/ext/gmp/tests/gmp_sign.phpt
@@ -36,7 +36,7 @@ int(1)
 int(0)
 int(1)
 int(-1)
-gmp_sign(): Argument #1 ($a) is not an integer string
-gmp_init(): Argument #1 ($number) is not an integer string
-gmp_sign(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_sign(): Argument #1 ($num) is not an integer string
+gmp_init(): Argument #1 ($num) is not an integer string
+gmp_sign(): Argument #1 ($num) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_sqrt.phpt b/ext/gmp/tests/gmp_sqrt.phpt
index 19a44121b6593..dcd9c58373d08 100644
--- a/ext/gmp/tests/gmp_sqrt.phpt
+++ b/ext/gmp/tests/gmp_sqrt.phpt
@@ -40,13 +40,13 @@ try {
 echo "Done\n";
 ?>
 --EXPECT--
-gmp_sqrt(): Argument #1 ($a) must be greater than or equal to 0
-gmp_sqrt(): Argument #1 ($a) must be greater than or equal to 0
+gmp_sqrt(): Argument #1 ($num) must be greater than or equal to 0
+gmp_sqrt(): Argument #1 ($num) must be greater than or equal to 0
 string(1) "0"
 string(1) "1"
 string(2) "12"
 string(1) "0"
-gmp_sqrt(): Argument #1 ($a) must be greater than or equal to 0
+gmp_sqrt(): Argument #1 ($num) must be greater than or equal to 0
 string(2) "27"
-gmp_sqrt(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_sqrt(): Argument #1 ($num) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_sqrtrem.phpt b/ext/gmp/tests/gmp_sqrtrem.phpt
index 0d63a54ff8e66..b415711bd4f2e 100644
--- a/ext/gmp/tests/gmp_sqrtrem.phpt
+++ b/ext/gmp/tests/gmp_sqrtrem.phpt
@@ -66,7 +66,7 @@ try {
 echo "Done\n";
 ?>
 --EXPECT--
-gmp_sqrtrem(): Argument #1 ($a) must be greater than or equal to 0
+gmp_sqrtrem(): Argument #1 ($num) must be greater than or equal to 0
 string(1) "0"
 string(1) "0"
 string(1) "1"
@@ -83,8 +83,8 @@ string(4) "1000"
 string(1) "0"
 string(4) "1000"
 string(1) "1"
-gmp_sqrtrem(): Argument #1 ($a) must be greater than or equal to 0
+gmp_sqrtrem(): Argument #1 ($num) must be greater than or equal to 0
 string(4) "1000"
 string(1) "1"
-gmp_sqrtrem(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_sqrtrem(): Argument #1 ($num) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_strict_types.phpt b/ext/gmp/tests/gmp_strict_types.phpt
index 8a2b5509a5c78..e697afa67533c 100644
--- a/ext/gmp/tests/gmp_strict_types.phpt
+++ b/ext/gmp/tests/gmp_strict_types.phpt
@@ -48,8 +48,8 @@ object(GMP)#2 (1) {
   ["num"]=>
   string(1) "1"
 }
-gmp_abs(): Argument #1 ($a) must be of type GMP|string|int, float given
-gmp_abs(): Argument #1 ($a) must be of type GMP|string|int, bool given
-gmp_abs(): Argument #1 ($a) must be of type GMP|string|int, bool given
-gmp_abs(): Argument #1 ($a) must be of type GMP|string|int, null given
-gmp_abs(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_abs(): Argument #1 ($num) must be of type GMP|string|int, float given
+gmp_abs(): Argument #1 ($num) must be of type GMP|string|int, bool given
+gmp_abs(): Argument #1 ($num) must be of type GMP|string|int, bool given
+gmp_abs(): Argument #1 ($num) must be of type GMP|string|int, null given
+gmp_abs(): Argument #1 ($num) must be of type GMP|string|int, array given
diff --git a/ext/gmp/tests/gmp_strval.phpt b/ext/gmp/tests/gmp_strval.phpt
index 234465c294a6b..3aa3e372a9fa4 100644
--- a/ext/gmp/tests/gmp_strval.phpt
+++ b/ext/gmp/tests/gmp_strval.phpt
@@ -65,9 +65,9 @@ try {
 echo "Done\n";
 ?>
 --EXPECT--
-gmp_strval(): Argument #1 ($gmpnumber) is not an integer string
+gmp_strval(): Argument #1 ($num) is not an integer string
 gmp_strval(): Argument #2 ($base) must be between 2 and 62, or -2 and -36
-gmp_strval(): Argument #1 ($gmpnumber) must be of type GMP|string|int, resource given
+gmp_strval(): Argument #1 ($num) must be of type GMP|string|int, resource given
 string(7) "9765456"
 gmp_strval(): Argument #2 ($base) must be between 2 and 62, or -2 and -36
 gmp_strval(): Argument #2 ($base) must be between 2 and 62, or -2 and -36
@@ -76,6 +76,6 @@ string(8) "-3373333"
 gmp_strval(): Argument #2 ($base) must be between 2 and 62, or -2 and -36
 gmp_strval(): Argument #2 ($base) must be between 2 and 62, or -2 and -36
 string(8) "-3373333"
-gmp_strval(): Argument #1 ($gmpnumber) must be of type GMP|string|int, array given
-gmp_strval(): Argument #1 ($gmpnumber) must be of type GMP|string|int, stdClass given
+gmp_strval(): Argument #1 ($num) must be of type GMP|string|int, array given
+gmp_strval(): Argument #1 ($num) must be of type GMP|string|int, stdClass given
 Done
diff --git a/ext/gmp/tests/gmp_sub.phpt b/ext/gmp/tests/gmp_sub.phpt
index 28a01f86ee640..a1e5a6158305c 100644
--- a/ext/gmp/tests/gmp_sub.phpt
+++ b/ext/gmp/tests/gmp_sub.phpt
@@ -37,8 +37,8 @@ try {
 echo "Done\n";
 ?>
 --EXPECT--
-gmp_sub(): Argument #1 ($a) is not an integer string
-gmp_sub(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_sub(): Argument #1 ($num1) is not an integer string
+gmp_sub(): Argument #1 ($num1) must be of type GMP|string|int, array given
 object(GMP)#1 (1) {
   ["num"]=>
   string(2) "-1"
@@ -49,6 +49,6 @@ object(GMP)#3 (1) {
   string(5) "10001"
 }
 string(5) "10001"
-gmp_sub(): Argument #2 ($b) must be of type GMP|string|int, stdClass given
-gmp_sub(): Argument #1 ($a) must be of type GMP|string|int, stdClass given
+gmp_sub(): Argument #2 ($num2) must be of type GMP|string|int, stdClass given
+gmp_sub(): Argument #1 ($num1) must be of type GMP|string|int, stdClass given
 Done
diff --git a/ext/gmp/tests/gmp_xor.phpt b/ext/gmp/tests/gmp_xor.phpt
index d81b5947fcbde..eb99f8c99c9ab 100644
--- a/ext/gmp/tests/gmp_xor.phpt
+++ b/ext/gmp/tests/gmp_xor.phpt
@@ -46,10 +46,10 @@ string(6) "476369"
 string(10) "2342340648"
 string(5) "-3334"
 string(5) "-4563"
-gmp_xor(): Argument #1 ($a) is not an integer string
+gmp_xor(): Argument #1 ($num1) is not an integer string
 string(15) "987657876574716"
 string(21) "987658017016065701376"
-gmp_xor(): Argument #1 ($a) must be of type GMP|string|int, array given
-gmp_xor(): Argument #2 ($b) must be of type GMP|string|int, array given
-gmp_xor(): Argument #1 ($a) must be of type GMP|string|int, array given
+gmp_xor(): Argument #1 ($num1) must be of type GMP|string|int, array given
+gmp_xor(): Argument #2 ($num2) must be of type GMP|string|int, array given
+gmp_xor(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done

From 1548da030c5c63b1bf38e4e22e049123bd5f5a4c Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 24 Sep 2020 15:50:57 +0200
Subject: [PATCH 2/3] Update bcmath parameter names

---
 ext/bcmath/bcmath.stub.php                    | 18 ++++++-------
 ext/bcmath/bcmath_arginfo.h                   | 26 ++++++++-----------
 ext/bcmath/tests/bcpow_error1.phpt            |  2 +-
 ext/bcmath/tests/bcpow_error2.phpt            |  2 +-
 .../tests/bcpowmod_negative_exponent.phpt     |  2 +-
 ext/bcmath/tests/bcsqrt_error1.phpt           |  2 +-
 ext/bcmath/tests/bug72093.phpt                |  2 +-
 ext/bcmath/tests/bug75178.phpt                |  2 +-
 ext/bcmath/tests/bug78878.phpt                |  2 +-
 9 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/ext/bcmath/bcmath.stub.php b/ext/bcmath/bcmath.stub.php
index 97232b0ed7121..ddace15c66dbf 100644
--- a/ext/bcmath/bcmath.stub.php
+++ b/ext/bcmath/bcmath.stub.php
@@ -2,22 +2,22 @@
 
 /** @generate-function-entries */
 
-function bcadd(string $left_operand, string $right_operand, ?int $scale = null): string {}
+function bcadd(string $num1, string $num2, ?int $scale = null): string {}
 
-function bcsub(string $left_operand, string $right_operand, ?int $scale = null): string {}
+function bcsub(string $num1, string $num2, ?int $scale = null): string {}
 
-function bcmul(string $left_operand, string $right_operand, ?int $scale = null): string {}
+function bcmul(string $num1, string $num2, ?int $scale = null): string {}
 
-function bcdiv(string $dividend, string $divisor, ?int $scale = null): string {}
+function bcdiv(string $num1, string $num2, ?int $scale = null): string {}
 
-function bcmod(string $dividend, string $divisor, ?int $scale = null): string {}
+function bcmod(string $num1, string $num2, ?int $scale = null): string {}
 
-function bcpowmod(string $base, string $exponent, string $modulus, ?int $scale = null): string {}
+function bcpowmod(string $base, string $exp, string $mod, ?int $scale = null): string {}
 
-function bcpow(string $base, string $exponent, ?int $scale = null): string {}
+function bcpow(string $base, string $exp, ?int $scale = null): string {}
 
-function bcsqrt(string $operand, ?int $scale = null): string {}
+function bcsqrt(string $num, ?int $scale = null): string {}
 
-function bccomp(string $left_operand, string $right_operand, ?int $scale = null): int {}
+function bccomp(string $num1, string $num2, ?int $scale = null): int {}
 
 function bcscale(?int $scale = null): int {}
diff --git a/ext/bcmath/bcmath_arginfo.h b/ext/bcmath/bcmath_arginfo.h
index 83956366a2822..d12e545c4c344 100644
--- a/ext/bcmath/bcmath_arginfo.h
+++ b/ext/bcmath/bcmath_arginfo.h
@@ -1,9 +1,9 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a1e223f29a06a2292a88c0e90e104cb956f80500 */
+ * Stub hash: 39f4f9ccb85c835b6949347f9dacbbcd8a58142b */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bcadd, 0, 2, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, left_operand, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, right_operand, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, num1, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, num2, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, scale, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
@@ -11,35 +11,31 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_bcmul arginfo_bcadd
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bcdiv, 0, 2, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, dividend, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, divisor, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, scale, IS_LONG, 1, "null")
-ZEND_END_ARG_INFO()
+#define arginfo_bcdiv arginfo_bcadd
 
-#define arginfo_bcmod arginfo_bcdiv
+#define arginfo_bcmod arginfo_bcadd
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bcpowmod, 0, 3, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, base, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, exponent, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, modulus, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, exp, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, mod, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, scale, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bcpow, 0, 2, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, base, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, exponent, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, exp, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, scale, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bcsqrt, 0, 1, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, operand, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, num, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, scale, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bccomp, 0, 2, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO(0, left_operand, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, right_operand, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, num1, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, num2, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, scale, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
diff --git a/ext/bcmath/tests/bcpow_error1.phpt b/ext/bcmath/tests/bcpow_error1.phpt
index 38d9bda181bf0..2d287284b61f5 100644
--- a/ext/bcmath/tests/bcpow_error1.phpt
+++ b/ext/bcmath/tests/bcpow_error1.phpt
@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECT--
-bcpow(): Argument #2 ($exponent) cannot have a fractional part
+bcpow(): Argument #2 ($exp) cannot have a fractional part
diff --git a/ext/bcmath/tests/bcpow_error2.phpt b/ext/bcmath/tests/bcpow_error2.phpt
index d6271b18eb338..7684612158dc1 100644
--- a/ext/bcmath/tests/bcpow_error2.phpt
+++ b/ext/bcmath/tests/bcpow_error2.phpt
@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECT--
-bcpow(): Argument #2 ($exponent) is too large
+bcpow(): Argument #2 ($exp) is too large
diff --git a/ext/bcmath/tests/bcpowmod_negative_exponent.phpt b/ext/bcmath/tests/bcpowmod_negative_exponent.phpt
index 518f9eb0a98a5..9d592d3016382 100644
--- a/ext/bcmath/tests/bcpowmod_negative_exponent.phpt
+++ b/ext/bcmath/tests/bcpowmod_negative_exponent.phpt
@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECT--
-bcpowmod(): Argument #2 ($exponent) must be greater than or equal to 0
+bcpowmod(): Argument #2 ($exp) must be greater than or equal to 0
diff --git a/ext/bcmath/tests/bcsqrt_error1.phpt b/ext/bcmath/tests/bcsqrt_error1.phpt
index 83c85183f4080..bdc850f979627 100644
--- a/ext/bcmath/tests/bcsqrt_error1.phpt
+++ b/ext/bcmath/tests/bcsqrt_error1.phpt
@@ -14,4 +14,4 @@ try {
 }
 ?>
 --EXPECT--
-bcsqrt(): Argument #1 ($operand) must be greater than or equal to 0
+bcsqrt(): Argument #1 ($num) must be greater than or equal to 0
diff --git a/ext/bcmath/tests/bug72093.phpt b/ext/bcmath/tests/bug72093.phpt
index 3a6405d04a26c..ada33935e202c 100644
--- a/ext/bcmath/tests/bug72093.phpt
+++ b/ext/bcmath/tests/bug72093.phpt
@@ -19,4 +19,4 @@ try {
 ?>
 --EXPECT--
 bcpowmod(): Argument #4 ($scale) must be between 0 and 2147483647
-bcpowmod(): Argument #2 ($exponent) cannot have a fractional part
+bcpowmod(): Argument #2 ($exp) cannot have a fractional part
diff --git a/ext/bcmath/tests/bug75178.phpt b/ext/bcmath/tests/bug75178.phpt
index 48044523840cf..6028232a67078 100644
--- a/ext/bcmath/tests/bug75178.phpt
+++ b/ext/bcmath/tests/bug75178.phpt
@@ -19,4 +19,4 @@ try {
 ?>
 --EXPECT--
 bcpowmod(): Argument #1 ($base) cannot have a fractional part
-bcpowmod(): Argument #3 ($modulus) cannot have a fractional part
+bcpowmod(): Argument #3 ($mod) cannot have a fractional part
diff --git a/ext/bcmath/tests/bug78878.phpt b/ext/bcmath/tests/bug78878.phpt
index 7edc666f75244..90220bbf40ca6 100644
--- a/ext/bcmath/tests/bug78878.phpt
+++ b/ext/bcmath/tests/bug78878.phpt
@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECT--
-bcpowmod(): Argument #3 ($modulus) cannot have a fractional part
+bcpowmod(): Argument #3 ($mod) cannot have a fractional part

From f8741fe92b7b4f367f8e990ed450338f56c73fbd Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 29 Sep 2020 11:15:12 +0200
Subject: [PATCH 3/3] Tweaks

---
 ext/bcmath/bcmath.stub.php                       |  4 ++--
 ext/bcmath/bcmath_arginfo.h                      | 12 ++++++------
 ext/bcmath/tests/bcpow_error1.phpt               |  2 +-
 ext/bcmath/tests/bcpow_error2.phpt               |  2 +-
 ext/bcmath/tests/bcpowmod_negative_exponent.phpt |  2 +-
 ext/bcmath/tests/bug72093.phpt                   |  2 +-
 ext/bcmath/tests/bug75178.phpt                   |  4 ++--
 ext/bcmath/tests/bug78878.phpt                   |  2 +-
 ext/gmp/gmp.stub.php                             | 12 ++++++------
 ext/gmp/gmp_arginfo.h                            | 16 ++++++++--------
 ext/gmp/tests/gmp_div_q.phpt                     |  2 +-
 ext/gmp/tests/gmp_div_qr.phpt                    |  2 +-
 ext/gmp/tests/gmp_div_r.phpt                     |  2 +-
 ext/gmp/tests/gmp_pow.phpt                       |  8 ++++----
 ext/gmp/tests/gmp_pown.phpt                      | 10 +++++-----
 15 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/ext/bcmath/bcmath.stub.php b/ext/bcmath/bcmath.stub.php
index ddace15c66dbf..acd63f000e79c 100644
--- a/ext/bcmath/bcmath.stub.php
+++ b/ext/bcmath/bcmath.stub.php
@@ -12,9 +12,9 @@ function bcdiv(string $num1, string $num2, ?int $scale = null): string {}
 
 function bcmod(string $num1, string $num2, ?int $scale = null): string {}
 
-function bcpowmod(string $base, string $exp, string $mod, ?int $scale = null): string {}
+function bcpowmod(string $num, string $exponent, string $modulus, ?int $scale = null): string {}
 
-function bcpow(string $base, string $exp, ?int $scale = null): string {}
+function bcpow(string $num, string $exponent, ?int $scale = null): string {}
 
 function bcsqrt(string $num, ?int $scale = null): string {}
 
diff --git a/ext/bcmath/bcmath_arginfo.h b/ext/bcmath/bcmath_arginfo.h
index d12e545c4c344..3e0104e04c358 100644
--- a/ext/bcmath/bcmath_arginfo.h
+++ b/ext/bcmath/bcmath_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 39f4f9ccb85c835b6949347f9dacbbcd8a58142b */
+ * Stub hash: 0c1e2a6163a5fc0f42bf79bbc530af7c5fd77074 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bcadd, 0, 2, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, num1, IS_STRING, 0)
@@ -16,15 +16,15 @@ ZEND_END_ARG_INFO()
 #define arginfo_bcmod arginfo_bcadd
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bcpowmod, 0, 3, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, base, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, exp, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, mod, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, num, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, exponent, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, modulus, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, scale, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bcpow, 0, 2, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, base, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, exp, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, num, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, exponent, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, scale, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
diff --git a/ext/bcmath/tests/bcpow_error1.phpt b/ext/bcmath/tests/bcpow_error1.phpt
index 2d287284b61f5..38d9bda181bf0 100644
--- a/ext/bcmath/tests/bcpow_error1.phpt
+++ b/ext/bcmath/tests/bcpow_error1.phpt
@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECT--
-bcpow(): Argument #2 ($exp) cannot have a fractional part
+bcpow(): Argument #2 ($exponent) cannot have a fractional part
diff --git a/ext/bcmath/tests/bcpow_error2.phpt b/ext/bcmath/tests/bcpow_error2.phpt
index 7684612158dc1..d6271b18eb338 100644
--- a/ext/bcmath/tests/bcpow_error2.phpt
+++ b/ext/bcmath/tests/bcpow_error2.phpt
@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECT--
-bcpow(): Argument #2 ($exp) is too large
+bcpow(): Argument #2 ($exponent) is too large
diff --git a/ext/bcmath/tests/bcpowmod_negative_exponent.phpt b/ext/bcmath/tests/bcpowmod_negative_exponent.phpt
index 9d592d3016382..518f9eb0a98a5 100644
--- a/ext/bcmath/tests/bcpowmod_negative_exponent.phpt
+++ b/ext/bcmath/tests/bcpowmod_negative_exponent.phpt
@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECT--
-bcpowmod(): Argument #2 ($exp) must be greater than or equal to 0
+bcpowmod(): Argument #2 ($exponent) must be greater than or equal to 0
diff --git a/ext/bcmath/tests/bug72093.phpt b/ext/bcmath/tests/bug72093.phpt
index ada33935e202c..3a6405d04a26c 100644
--- a/ext/bcmath/tests/bug72093.phpt
+++ b/ext/bcmath/tests/bug72093.phpt
@@ -19,4 +19,4 @@ try {
 ?>
 --EXPECT--
 bcpowmod(): Argument #4 ($scale) must be between 0 and 2147483647
-bcpowmod(): Argument #2 ($exp) cannot have a fractional part
+bcpowmod(): Argument #2 ($exponent) cannot have a fractional part
diff --git a/ext/bcmath/tests/bug75178.phpt b/ext/bcmath/tests/bug75178.phpt
index 6028232a67078..9025e61c73bf7 100644
--- a/ext/bcmath/tests/bug75178.phpt
+++ b/ext/bcmath/tests/bug75178.phpt
@@ -18,5 +18,5 @@ try {
 }
 ?>
 --EXPECT--
-bcpowmod(): Argument #1 ($base) cannot have a fractional part
-bcpowmod(): Argument #3 ($mod) cannot have a fractional part
+bcpowmod(): Argument #1 ($num) cannot have a fractional part
+bcpowmod(): Argument #3 ($modulus) cannot have a fractional part
diff --git a/ext/bcmath/tests/bug78878.phpt b/ext/bcmath/tests/bug78878.phpt
index 90220bbf40ca6..7edc666f75244 100644
--- a/ext/bcmath/tests/bug78878.phpt
+++ b/ext/bcmath/tests/bug78878.phpt
@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECT--
-bcpowmod(): Argument #3 ($mod) cannot have a fractional part
+bcpowmod(): Argument #3 ($modulus) cannot have a fractional part
diff --git a/ext/gmp/gmp.stub.php b/ext/gmp/gmp.stub.php
index 85578d6a81819..729ae37245aa6 100644
--- a/ext/gmp/gmp.stub.php
+++ b/ext/gmp/gmp.stub.php
@@ -22,14 +22,14 @@ function gmp_sub(GMP|int|string $num1, GMP|int|string $num2): GMP {}
 
 function gmp_mul(GMP|int|string $num1, GMP|int|string $num2): GMP {}
 
-function gmp_div_qr(GMP|int|string $num1, GMP|int|string $num2, int $round = GMP_ROUND_ZERO): array {}
+function gmp_div_qr(GMP|int|string $num1, GMP|int|string $num2, int $rounding_mode = GMP_ROUND_ZERO): array {}
 
-function gmp_div_q(GMP|int|string $num1, GMP|int|string $num2, int $round = GMP_ROUND_ZERO): GMP {}
+function gmp_div_q(GMP|int|string $num1, GMP|int|string $num2, int $rounding_mode = GMP_ROUND_ZERO): GMP {}
 
-function gmp_div_r(GMP|int|string $num1, GMP|int|string $num2, int $round = GMP_ROUND_ZERO): GMP {}
+function gmp_div_r(GMP|int|string $num1, GMP|int|string $num2, int $rounding_mode = GMP_ROUND_ZERO): GMP {}
 
 /** @alias gmp_div_q */
-function gmp_div(GMP|int|string $num1, GMP|int|string $num2, int $round = GMP_ROUND_ZERO): GMP {}
+function gmp_div(GMP|int|string $num1, GMP|int|string $num2, int $rounding_mode = GMP_ROUND_ZERO): GMP {}
 
 function gmp_mod(GMP|int|string $num1, GMP|int|string $num2): GMP {}
 
@@ -49,9 +49,9 @@ function gmp_root(GMP|int|string $num, int $nth): GMP {}
 
 function gmp_rootrem(GMP|int|string $num, int $nth): array {}
 
-function gmp_pow(GMP|int|string $base, int $exp): GMP {}
+function gmp_pow(GMP|int|string $num, int $exponent): GMP {}
 
-function gmp_powm(GMP|int|string $base, GMP|int|string $exp, GMP|int|string $mod): GMP {}
+function gmp_powm(GMP|int|string $num, GMP|int|string $exponent, GMP|int|string $modulus): GMP {}
 
 function gmp_perfect_square(GMP|int|string $num): bool {}
 
diff --git a/ext/gmp/gmp_arginfo.h b/ext/gmp/gmp_arginfo.h
index 920104ae5f5d4..fd341edbb565d 100644
--- a/ext/gmp/gmp_arginfo.h
+++ b/ext/gmp/gmp_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: e807903038d57f74415907f763e0de51a4edfc5e */
+ * Stub hash: a1eb4fd58c0b2155692611386c77035f1ef11c2c */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_init, 0, 1, GMP, 0)
 	ZEND_ARG_TYPE_MASK(0, num, MAY_BE_LONG|MAY_BE_STRING, NULL)
@@ -39,13 +39,13 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_div_qr, 0, 2, IS_ARRAY, 0)
 	ZEND_ARG_OBJ_TYPE_MASK(0, num1, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_OBJ_TYPE_MASK(0, num2, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, round, IS_LONG, 0, "GMP_ROUND_ZERO")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, rounding_mode, IS_LONG, 0, "GMP_ROUND_ZERO")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_div_q, 0, 2, GMP, 0)
 	ZEND_ARG_OBJ_TYPE_MASK(0, num1, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_OBJ_TYPE_MASK(0, num2, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, round, IS_LONG, 0, "GMP_ROUND_ZERO")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, rounding_mode, IS_LONG, 0, "GMP_ROUND_ZERO")
 ZEND_END_ARG_INFO()
 
 #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)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_pow, 0, 2, GMP, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, base, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_TYPE_INFO(0, exp, IS_LONG, 0)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_TYPE_INFO(0, exponent, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_powm, 0, 3, GMP, 0)
-	ZEND_ARG_OBJ_TYPE_MASK(0, base, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_OBJ_TYPE_MASK(0, exp, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
-	ZEND_ARG_OBJ_TYPE_MASK(0, mod, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, num, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, exponent, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_OBJ_TYPE_MASK(0, modulus, GMP, MAY_BE_LONG|MAY_BE_STRING, NULL)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_perfect_square, 0, 1, _IS_BOOL, 0)
diff --git a/ext/gmp/tests/gmp_div_q.phpt b/ext/gmp/tests/gmp_div_q.phpt
index 4cce74ce5db5a..a9adeab24ce7d 100644
--- a/ext/gmp/tests/gmp_div_q.phpt
+++ b/ext/gmp/tests/gmp_div_q.phpt
@@ -51,7 +51,7 @@ object(GMP)#2 (1) {
   ["num"]=>
   string(1) "0"
 }
-gmp_div_q(): Argument #3 ($round) must be one of GMP_ROUND_ZERO, GMP_ROUND_PLUSINF, or GMP_ROUND_MINUSINF
+gmp_div_q(): Argument #3 ($rounding_mode) must be one of GMP_ROUND_ZERO, GMP_ROUND_PLUSINF, or GMP_ROUND_MINUSINF
 object(GMP)#1 (1) {
   ["num"]=>
   string(4) "9131"
diff --git a/ext/gmp/tests/gmp_div_qr.phpt b/ext/gmp/tests/gmp_div_qr.phpt
index fe9fb1e091799..a31c39c731cf5 100644
--- a/ext/gmp/tests/gmp_div_qr.phpt
+++ b/ext/gmp/tests/gmp_div_qr.phpt
@@ -74,7 +74,7 @@ array(2) {
     string(5) "12653"
   }
 }
-gmp_div_qr(): Argument #3 ($round) must be one of GMP_ROUND_ZERO, GMP_ROUND_PLUSINF, or GMP_ROUND_MINUSINF
+gmp_div_qr(): Argument #3 ($rounding_mode) must be one of GMP_ROUND_ZERO, GMP_ROUND_PLUSINF, or GMP_ROUND_MINUSINF
 array(2) {
   [0]=>
   object(GMP)#4 (1) {
diff --git a/ext/gmp/tests/gmp_div_r.phpt b/ext/gmp/tests/gmp_div_r.phpt
index 545457a73f4a1..2372474bc89cd 100644
--- a/ext/gmp/tests/gmp_div_r.phpt
+++ b/ext/gmp/tests/gmp_div_r.phpt
@@ -51,7 +51,7 @@ object(GMP)#3 (1) {
   ["num"]=>
   string(5) "12653"
 }
-gmp_div_r(): Argument #3 ($round) must be one of GMP_ROUND_ZERO, GMP_ROUND_PLUSINF, or GMP_ROUND_MINUSINF
+gmp_div_r(): Argument #3 ($rounding_mode) must be one of GMP_ROUND_ZERO, GMP_ROUND_PLUSINF, or GMP_ROUND_MINUSINF
 object(GMP)#2 (1) {
   ["num"]=>
   string(2) "10"
diff --git a/ext/gmp/tests/gmp_pow.phpt b/ext/gmp/tests/gmp_pow.phpt
index d4d20f2ce796a..ab87e7f093309 100644
--- a/ext/gmp/tests/gmp_pow.phpt
+++ b/ext/gmp/tests/gmp_pow.phpt
@@ -49,13 +49,13 @@ string(4) "1024"
 string(5) "-2048"
 string(4) "1024"
 string(1) "1"
-gmp_pow(): Argument #2 ($exp) must be greater than or equal to 0
+gmp_pow(): Argument #2 ($exponent) must be greater than or equal to 0
 string(4) "1024"
 string(14) "10240000000000"
 string(17) "97656250000000000"
-gmp_pow(): Argument #2 ($exp) must be greater than or equal to 0
+gmp_pow(): Argument #2 ($exponent) must be greater than or equal to 0
 string(14) "10240000000000"
 string(14) "10240000000000"
-gmp_pow(): Argument #2 ($exp) must be of type int, array given
-gmp_pow(): Argument #1 ($base) must be of type GMP|string|int, array given
+gmp_pow(): Argument #2 ($exponent) must be of type int, array given
+gmp_pow(): Argument #1 ($num) must be of type GMP|string|int, array given
 Done
diff --git a/ext/gmp/tests/gmp_pown.phpt b/ext/gmp/tests/gmp_pown.phpt
index 76d5576e47581..49bc308e156dc 100644
--- a/ext/gmp/tests/gmp_pown.phpt
+++ b/ext/gmp/tests/gmp_pown.phpt
@@ -75,11 +75,11 @@ string(3) "171"
 string(3) "371"
 Modulo by zero
 Modulo by zero
-gmp_powm(): Argument #1 ($base) must be of type GMP|string|int, array given
-gmp_powm(): Argument #2 ($exp) must be of type GMP|string|int, array given
-gmp_powm(): Argument #2 ($exp) must be of type GMP|string|int, TypeError given
-gmp_powm(): Argument #1 ($base) must be of type GMP|string|int, array given
-gmp_powm(): Argument #2 ($exp) must be greater than or equal to 0
+gmp_powm(): Argument #1 ($num) must be of type GMP|string|int, array given
+gmp_powm(): Argument #2 ($exponent) must be of type GMP|string|int, array given
+gmp_powm(): Argument #2 ($exponent) must be of type GMP|string|int, TypeError given
+gmp_powm(): Argument #1 ($num) must be of type GMP|string|int, array given
+gmp_powm(): Argument #2 ($exponent) must be greater than or equal to 0
 object(GMP)#6 (1) {
   ["num"]=>
   string(1) "1"