- Fix memory leaks (bug #42509)

- Fix _gmp_binary_opl
- Use modern parameter parsing

36 files changed, 114 insertions, 98 deletions

diff --git a/ext/gmp/tests/004.phpt b/ext/gmp/tests/004.phpt
index d093c04d59..a0fa1cd133 100644
--- a/ext/gmp/tests/004.phpt
+++ b/ext/gmp/tests/004.phpt
@@ -25,7 +25,7 @@ var_dump(gmp_intval($g));
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: Wrong parameter count for gmp_intval() in %s on line %d
+Warning: gmp_intval() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 int(0)
 int(1)
diff --git a/ext/gmp/tests/005.phpt b/ext/gmp/tests/005.phpt
index 482e7217ad..806b5e6e34 100644
--- a/ext/gmp/tests/005.phpt
+++ b/ext/gmp/tests/005.phpt
@@ -28,19 +28,25 @@ var_dump(gmp_strval($g, 10));
 
 var_dump(gmp_strval(array(1,2), array(1,2)));
 var_dump(gmp_strval(new stdclass, new stdclass));
+var_dump(gmp_strval(array(1,2)));
+var_dump(gmp_strval(new stdclass));
 
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: Wrong parameter count for gmp_strval() in %s on line %d
+Warning: gmp_strval() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 bool(false)
-bool(false)
-bool(false)
 
-Warning: gmp_strval(): Bad base for conversion: 0 in %s on line %d
+Warning: gmp_strval() expects parameter 2 to be long, string given in %s on line %d
+NULL
+
+Warning: gmp_strval(): Bad base for conversion: -1 in %s on line %d
 bool(false)
 
+Warning: gmp_strval() expects parameter 2 to be long, string given in %s on line %d
+NULL
+
 Warning: gmp_strval(): supplied resource is not a valid GMP integer resource in %s on line %d
 bool(false)
 string(7) "9765456"
@@ -60,6 +66,12 @@ Warning: gmp_strval(): Bad base for conversion: 100000 in %s on line %d
 bool(false)
 string(8) "-3373333"
 
+Warning: gmp_strval() expects parameter 2 to be long, array given in %s on line %d
+NULL
+
+Warning: gmp_strval() expects parameter 2 to be long, object given in %s on line %d
+NULL
+
 Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 
diff --git a/ext/gmp/tests/006.phpt b/ext/gmp/tests/006.phpt
index 2e207c197b..2178d6732f 100644
--- a/ext/gmp/tests/006.phpt
+++ b/ext/gmp/tests/006.phpt
@@ -23,21 +23,21 @@ var_dump(gmp_strval($g));
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: Wrong parameter count for gmp_sub() in %s on line %d
+Warning: gmp_sub() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_sub() in %s on line %d
+Warning: gmp_sub() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 bool(false)
 
-Warning: Wrong parameter count for gmp_sub() in %s on line %d
+Warning: gmp_sub() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
 Warning: gmp_sub(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
-resource(%d) of type (GMP integer)
+resource(5) of type (GMP integer)
 string(2) "-1"
-resource(%d) of type (GMP integer)
+resource(8) of type (GMP integer)
 string(5) "10001"
 
 Warning: gmp_sub(): Unable to convert variable to GMP - wrong type in %s on line %d
diff --git a/ext/gmp/tests/007.phpt b/ext/gmp/tests/007.phpt
index d699816103..4d4a993a17 100644
--- a/ext/gmp/tests/007.phpt
+++ b/ext/gmp/tests/007.phpt
@@ -45,10 +45,10 @@ var_dump(gmp_div_qr(array(), array()));
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: Wrong parameter count for gmp_div_qr() in %s on line %d
+Warning: gmp_div_qr() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_div_qr() in %s on line %d
+Warning: gmp_div_qr() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 array(2) {
   [0]=>
diff --git a/ext/gmp/tests/008.phpt b/ext/gmp/tests/008.phpt
index 773719ec4d..4e44ec10bf 100644
--- a/ext/gmp/tests/008.phpt
+++ b/ext/gmp/tests/008.phpt
@@ -36,10 +36,10 @@ var_dump(gmp_div_r(array(), array()));
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: Wrong parameter count for gmp_div_r() in %s on line %d
+Warning: gmp_div_r() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_div_r() in %s on line %d
+Warning: gmp_div_r() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 int(0)
 string(1) "0"
diff --git a/ext/gmp/tests/009.phpt b/ext/gmp/tests/009.phpt
index 559cc17f2d..745a4ef638 100644
--- a/ext/gmp/tests/009.phpt
+++ b/ext/gmp/tests/009.phpt
@@ -36,10 +36,10 @@ var_dump(gmp_div_q(array(), array()));
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: Wrong parameter count for gmp_div_q() in %s on line %d
+Warning: gmp_div_q() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_div_q() in %s on line %d
+Warning: gmp_div_q() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 resource(%d) of type (GMP integer)
 string(1) "0"
diff --git a/ext/gmp/tests/010.phpt b/ext/gmp/tests/010.phpt
index 5ddc2c53c9..293a2a0bf2 100644
--- a/ext/gmp/tests/010.phpt
+++ b/ext/gmp/tests/010.phpt
@@ -22,10 +22,10 @@ var_dump(gmp_mod($a, $b));
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: Wrong parameter count for gmp_mod() in %s on line %d
+Warning: gmp_mod() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_mod() in %s on line %d
+Warning: gmp_mod() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 bool(false)
 int(0)
diff --git a/ext/gmp/tests/011.phpt b/ext/gmp/tests/011.phpt
index 0ca3ca3849..b413aa9624 100644
--- a/ext/gmp/tests/011.phpt
+++ b/ext/gmp/tests/011.phpt
@@ -39,10 +39,10 @@ var_dump(gmp_strval($r));
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: Wrong parameter count for gmp_divexact() in %s on line %d
+Warning: gmp_divexact() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_divexact() in %s on line %d
+Warning: gmp_divexact() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 string(1) "0"
 
diff --git a/ext/gmp/tests/012.phpt b/ext/gmp/tests/012.phpt
index a8de915980..8582ba1fd3 100644
--- a/ext/gmp/tests/012.phpt
+++ b/ext/gmp/tests/012.phpt
@@ -33,10 +33,10 @@ int(0)
 int(0)
 string(21) "-12345678901234567890"
 
-Warning: Wrong parameter count for gmp_neg() in %s on line %d
+Warning: gmp_neg() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_neg() in %s on line %d
+Warning: gmp_neg() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
 Warning: gmp_neg(): Unable to convert variable to GMP - wrong type in %s on line %d
diff --git a/ext/gmp/tests/013.phpt b/ext/gmp/tests/013.phpt
index 8d6e1d0d59..06c2d818d5 100644
--- a/ext/gmp/tests/013.phpt
+++ b/ext/gmp/tests/013.phpt
@@ -34,10 +34,10 @@ string(1) "0"
 string(1) "0"
 string(1) "0"
 
-Warning: Wrong parameter count for gmp_abs() in %s on line %d
+Warning: gmp_abs() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_abs() in %s on line %d
+Warning: gmp_abs() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
 Warning: gmp_abs(): Unable to convert variable to GMP - wrong type in %s on line %d
diff --git a/ext/gmp/tests/014.phpt b/ext/gmp/tests/014.phpt
index f52c32cdb3..40e10c6fbe 100644
--- a/ext/gmp/tests/014.phpt
+++ b/ext/gmp/tests/014.phpt
@@ -48,10 +48,10 @@ string(11) "87178291200"
 Warning: gmp_fact(): Number has to be greater than or equal to 0 in %s on line %d
 string(1) "0"
 
-Warning: Wrong parameter count for gmp_fact() in %s on line %d
+Warning: gmp_fact() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_fact() in %s on line %d
+Warning: gmp_fact() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 resource(%d) of type (GMP integer)
 string(1) "1"
diff --git a/ext/gmp/tests/015.phpt b/ext/gmp/tests/015.phpt
index 98ae349b59..b787a21b58 100644
--- a/ext/gmp/tests/015.phpt
+++ b/ext/gmp/tests/015.phpt
@@ -48,13 +48,13 @@ string(1) "0"
 string(14) "10240000000000"
 string(14) "10240000000000"
 
-Warning: Wrong parameter count for gmp_pow() in %s on line %d
+Warning: gmp_pow() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_pow() in %s on line %d
+Warning: gmp_pow() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_pow() in %s on line %d
+Warning: gmp_pow() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 
 Warning: gmp_pow(): Unable to convert variable to GMP - wrong type in %s on line %d
diff --git a/ext/gmp/tests/016.phpt b/ext/gmp/tests/016.phpt
index 6bd3afd070..44360865ca 100644
--- a/ext/gmp/tests/016.phpt
+++ b/ext/gmp/tests/016.phpt
@@ -58,13 +58,13 @@ bool(false)
 Warning: gmp_powm(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 
-Warning: Wrong parameter count for gmp_powm() in %s on line %d
+Warning: gmp_powm() expects exactly 3 parameters, 2 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_powm() in %s on line %d
+Warning: gmp_powm() expects exactly 3 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_powm() in %s on line %d
+Warning: gmp_powm() expects exactly 3 parameters, 0 given in %s on line %d
 NULL
 
 Warning: gmp_powm(): Second parameter cannot be less than 0 in %s on line %d
diff --git a/ext/gmp/tests/017.phpt b/ext/gmp/tests/017.phpt
index 8349862b7d..d90f538213 100644
--- a/ext/gmp/tests/017.phpt
+++ b/ext/gmp/tests/017.phpt
@@ -39,10 +39,10 @@ Warning: gmp_sqrt(): Number has to be greater than or equal to 0 in %s on line %
 string(1) "0"
 string(2) "27"
 
-Warning: Wrong parameter count for gmp_sqrt() in %s on line %d
+Warning: gmp_sqrt() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_sqrt() in %s on line %d
+Warning: gmp_sqrt() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
 Warning: gmp_sqrt(): Unable to convert variable to GMP - wrong type in %s on line %d
diff --git a/ext/gmp/tests/018.phpt b/ext/gmp/tests/018.phpt
index c8146cf95c..2fca463daa 100644
--- a/ext/gmp/tests/018.phpt
+++ b/ext/gmp/tests/018.phpt
@@ -95,6 +95,6 @@ string(1) "1"
 Warning: gmp_sqrtrem(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 
-Warning: Wrong parameter count for gmp_sqrtrem() in %s on line %d
+Warning: gmp_sqrtrem() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 Done
diff --git a/ext/gmp/tests/019.phpt b/ext/gmp/tests/019.phpt
index 10bca880b8..aa596ba9cd 100644
--- a/ext/gmp/tests/019.phpt
+++ b/ext/gmp/tests/019.phpt
@@ -39,7 +39,7 @@ bool(false)
 bool(true)
 bool(false)
 
-Warning: Wrong parameter count for gmp_perfect_square() in %s on line %d
+Warning: gmp_perfect_square() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
 Warning: gmp_perfect_square(): Unable to convert variable to GMP - wrong type in %s on line %d
diff --git a/ext/gmp/tests/020.phpt b/ext/gmp/tests/020.phpt
index c689ec552c..f8f3e6921c 100644
--- a/ext/gmp/tests/020.phpt
+++ b/ext/gmp/tests/020.phpt
@@ -73,7 +73,7 @@ int(0)
 int(0)
 int(0)
 
-Warning: Wrong parameter count for gmp_prob_prime() in %s on line %d
+Warning: gmp_prob_prime() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 
 Warning: gmp_prob_prime(): Unable to convert variable to GMP - wrong type in %s on line %d
diff --git a/ext/gmp/tests/021.phpt b/ext/gmp/tests/021.phpt
index 01b4d1cd68..3ec947d640 100644
--- a/ext/gmp/tests/021.phpt
+++ b/ext/gmp/tests/021.phpt
@@ -40,12 +40,12 @@ string(1) "1"
 string(10) "8127346234"
 string(1) "0"
 
-Warning: Wrong parameter count for gmp_gcd() in %s on line %d
+Warning: gmp_gcd() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_gcd() in %s on line %d
+Warning: gmp_gcd() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_gcd() in %s on line %d
+Warning: gmp_gcd() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 Done
diff --git a/ext/gmp/tests/022.phpt b/ext/gmp/tests/022.phpt
index cfa919bf6f..805c9b6753 100644
--- a/ext/gmp/tests/022.phpt
+++ b/ext/gmp/tests/022.phpt
@@ -74,12 +74,12 @@ bool(false)
 Warning: gmp_gcdext(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 
-Warning: Wrong parameter count for gmp_gcdext() in %s on line %d
+Warning: gmp_gcdext() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_gcdext() in %s on line %d
+Warning: gmp_gcdext() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_gcdext() in %s on line %d
+Warning: gmp_gcdext() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 Done
diff --git a/ext/gmp/tests/023.phpt b/ext/gmp/tests/023.phpt
index a7cc9a7a8f..81a90fe16a 100644
--- a/ext/gmp/tests/023.phpt
+++ b/ext/gmp/tests/023.phpt
@@ -38,10 +38,10 @@ string(1) "0"
 string(22) "3498273496234234523441"
 string(1) "1"
 
-Warning: Wrong parameter count for gmp_invert() in %s on line %d
+Warning: gmp_invert() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_invert() in %s on line %d
+Warning: gmp_invert() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 
 Warning: gmp_invert(): Unable to convert variable to GMP - wrong type in %s on line %d
diff --git a/ext/gmp/tests/024.phpt b/ext/gmp/tests/024.phpt
index 9b46d94837..f7d8d6f777 100644
--- a/ext/gmp/tests/024.phpt
+++ b/ext/gmp/tests/024.phpt
@@ -35,20 +35,19 @@ string(1) "0"
 string(2) "-1"
 string(1) "0"
 string(1) "0"
+string(2) "-1"
 string(1) "0"
 string(1) "0"
+string(2) "-1"
 string(1) "0"
 string(1) "0"
+string(2) "-1"
+string(2) "-1"
 string(1) "0"
 string(1) "0"
+string(2) "-1"
 string(1) "0"
-string(1) "0"
-string(1) "0"
-string(1) "0"
-string(1) "0"
-string(1) "0"
-string(1) "0"
-int(0)
+string(2) "-1"
 
 Warning: gmp_jacobi(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
@@ -56,12 +55,12 @@ bool(false)
 Warning: gmp_jacobi(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 
-Warning: Wrong parameter count for gmp_jacobi() in %s on line %d
+Warning: gmp_jacobi() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_jacobi() in %s on line %d
+Warning: gmp_jacobi() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_jacobi() in %s on line %d
+Warning: gmp_jacobi() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 Done
diff --git a/ext/gmp/tests/025.phpt b/ext/gmp/tests/025.phpt
index 99ac184df8..ec8bb8c24c 100644
--- a/ext/gmp/tests/025.phpt
+++ b/ext/gmp/tests/025.phpt
@@ -35,20 +35,19 @@ string(1) "0"
 string(2) "-1"
 string(1) "0"
 string(1) "0"
+string(2) "-1"
 string(1) "0"
 string(1) "0"
+string(2) "-1"
 string(1) "0"
 string(1) "0"
+string(2) "-1"
+string(2) "-1"
 string(1) "0"
 string(1) "0"
+string(2) "-1"
 string(1) "0"
-string(1) "0"
-string(1) "0"
-string(1) "0"
-string(1) "0"
-string(1) "0"
-string(1) "0"
-int(0)
+string(2) "-1"
 
 Warning: gmp_legendre(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
@@ -56,12 +55,12 @@ bool(false)
 Warning: gmp_legendre(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 
-Warning: Wrong parameter count for gmp_legendre() in %s on line %d
+Warning: gmp_legendre() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_legendre() in %s on line %d
+Warning: gmp_legendre() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_legendre() in %s on line %d
+Warning: gmp_legendre() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 Done
diff --git a/ext/gmp/tests/026.phpt b/ext/gmp/tests/026.phpt
index d952622875..3c7cce8ae5 100644
--- a/ext/gmp/tests/026.phpt
+++ b/ext/gmp/tests/026.phpt
@@ -34,15 +34,15 @@ int(-1)
 int(-2)
 int(0)
 
-Warning: Wrong parameter count for gmp_cmp() in %s on line %d
+Warning: gmp_cmp() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
 Warning: gmp_cmp(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 
-Warning: Wrong parameter count for gmp_cmp() in %s on line %d
+Warning: gmp_cmp() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_cmp() in %s on line %d
+Warning: gmp_cmp() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 Done
diff --git a/ext/gmp/tests/027.phpt b/ext/gmp/tests/027.phpt
index d4fee571f7..71204db98b 100644
--- a/ext/gmp/tests/027.phpt
+++ b/ext/gmp/tests/027.phpt
@@ -28,12 +28,12 @@ int(-1)
 bool(false)
 int(0)
 
-Warning: Wrong parameter count for gmp_sign() in %s on line %d
+Warning: gmp_sign() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
 Warning: gmp_sign(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 
-Warning: Wrong parameter count for gmp_sign() in %s on line %d
+Warning: gmp_sign() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 Done
diff --git a/ext/gmp/tests/028.phpt b/ext/gmp/tests/028.phpt
index a61a39a07d..3a876aa60c 100644
--- a/ext/gmp/tests/028.phpt
+++ b/ext/gmp/tests/028.phpt
@@ -26,10 +26,16 @@ string(1) "%d"
 string(%d) "%d"
 string(%d) "%d"
 string(%d) "%d"
-resource(%d) of type (GMP integer)
 
-Warning: Wrong parameter count for gmp_random() in %s on line %d
+Warning: gmp_random() expects parameter 1 to be long, array given in %s on line %d
+NULL
+
+Warning: gmp_random() expects at most 1 parameter, 2 given in %s on line %d
+NULL
+
+Warning: gmp_random() expects parameter 1 to be long, string given in %s on line %d
+NULL
+
+Warning: gmp_random() expects parameter 1 to be long, string given in %s on line %d
 NULL
-resource(%d) of type (GMP integer)
-resource(%d) of type (GMP integer)
 Done
diff --git a/ext/gmp/tests/029.phpt b/ext/gmp/tests/029.phpt
index 0846ad1356..1b86e47fd9 100644
--- a/ext/gmp/tests/029.phpt
+++ b/ext/gmp/tests/029.phpt
@@ -35,10 +35,10 @@ string(1) "0"
 string(4) "1536"
 string(15) "424703623692768"
 
-Warning: Wrong parameter count for gmp_and() in %s on line %d
+Warning: gmp_and() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_and() in %s on line %d
+Warning: gmp_and() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 
 Warning: gmp_and(): Unable to convert variable to GMP - wrong type in %s on line %d
diff --git a/ext/gmp/tests/030.phpt b/ext/gmp/tests/030.phpt
index 86c5caeea4..633af41e6f 100644
--- a/ext/gmp/tests/030.phpt
+++ b/ext/gmp/tests/030.phpt
@@ -35,10 +35,10 @@ string(1) "0"
 string(15) "987657876576252"
 string(21) "987658441719689394144"
 
-Warning: Wrong parameter count for gmp_or() in %s on line %d
+Warning: gmp_or() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_or() in %s on line %d
+Warning: gmp_or() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 
 Warning: gmp_or(): Unable to convert variable to GMP - wrong type in %s on line %d
diff --git a/ext/gmp/tests/031.phpt b/ext/gmp/tests/031.phpt
index 80a7ff89cb..90ce1759da 100644
--- a/ext/gmp/tests/031.phpt
+++ b/ext/gmp/tests/031.phpt
@@ -37,7 +37,7 @@ string(12) "-98765463338"
 Warning: gmp_com(): Unable to convert variable to GMP - wrong type in %s on line %d
 string(1) "0"
 
-Warning: Wrong parameter count for gmp_com() in %s on line %d
+Warning: gmp_com() expects exactly 1 parameter, 0 given in %s on line %d
 
 Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
diff --git a/ext/gmp/tests/032.phpt b/ext/gmp/tests/032.phpt
index 4f426aac16..327c979da6 100644
--- a/ext/gmp/tests/032.phpt
+++ b/ext/gmp/tests/032.phpt
@@ -35,10 +35,10 @@ string(1) "0"
 string(15) "987657876574716"
 string(21) "987658017016065701376"
 
-Warning: Wrong parameter count for gmp_xor() in %s on line %d
+Warning: gmp_xor() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_xor() in %s on line %d
+Warning: gmp_xor() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 
 Warning: gmp_xor(): Unable to convert variable to GMP - wrong type in %s on line %d
diff --git a/ext/gmp/tests/033.phpt b/ext/gmp/tests/033.phpt
index ea5cc5da7c..38ff5be5bf 100644
--- a/ext/gmp/tests/033.phpt
+++ b/ext/gmp/tests/033.phpt
@@ -54,11 +54,11 @@ string(12) "100000000008"
 
 Warning: gmp_setbit(): supplied argument is not a valid GMP integer resource in %s on line %d
 
-Warning: Wrong parameter count for gmp_setbit() in %s on line %d
+Warning: gmp_setbit() expects at least 2 parameters, 1 given in %s on line %d
 
-Warning: Wrong parameter count for gmp_setbit() in %s on line %d
+Warning: gmp_setbit() expects at most 3 parameters, 4 given in %s on line %d
 
-Warning: gmp_setbit(): supplied argument is not a valid GMP integer resource in %s on line %d
+Warning: gmp_setbit() expects parameter 2 to be long, array given in %s on line %d
 
-Warning: gmp_setbit(): supplied argument is not a valid GMP integer resource in %s on line %d
+Warning: gmp_setbit() expects parameter 2 to be long, array given in %s on line %d
 Done
diff --git a/ext/gmp/tests/034.phpt b/ext/gmp/tests/034.phpt
index 1614c00160..6011029905 100644
--- a/ext/gmp/tests/034.phpt
+++ b/ext/gmp/tests/034.phpt
@@ -48,9 +48,9 @@ string(30) "238462734628347239571822592658"
 
 Warning: gmp_clrbit(): supplied argument is not a valid GMP integer resource in %s on line %d
 
-Warning: Wrong parameter count for gmp_clrbit() in %s on line %d
+Warning: gmp_clrbit() expects exactly 2 parameters, 3 given in %s on line %d
 
-Warning: Wrong parameter count for gmp_clrbit() in %s on line %d
+Warning: gmp_clrbit() expects exactly 2 parameters, 1 given in %s on line %d
 
-Warning: Wrong parameter count for gmp_clrbit() in %s on line %d
+Warning: gmp_clrbit() expects exactly 2 parameters, 0 given in %s on line %d
 Done
diff --git a/ext/gmp/tests/035.phpt b/ext/gmp/tests/035.phpt
index a9b0c1a332..4b45a04481 100644
--- a/ext/gmp/tests/035.phpt
+++ b/ext/gmp/tests/035.phpt
@@ -28,6 +28,6 @@ int(20)
 Warning: gmp_popcount(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 
-Warning: Wrong parameter count for gmp_popcount() in %s on line %d
+Warning: gmp_popcount() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 Done
diff --git a/ext/gmp/tests/036.phpt b/ext/gmp/tests/036.phpt
index fa2d67c822..c21e03ccb2 100644
--- a/ext/gmp/tests/036.phpt
+++ b/ext/gmp/tests/036.phpt
@@ -33,7 +33,7 @@ int(43)
 int(0)
 int(26)
 
-Warning: Wrong parameter count for gmp_hamdist() in %s on line %d
+Warning: gmp_hamdist() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
 Warning: gmp_hamdist(): Unable to convert variable to GMP - wrong type in %s on line %d
@@ -45,6 +45,6 @@ bool(false)
 Warning: gmp_hamdist(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 
-Warning: Wrong parameter count for gmp_hamdist() in %s on line %d
+Warning: gmp_hamdist() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 Done
diff --git a/ext/gmp/tests/037.phpt b/ext/gmp/tests/037.phpt
index 4789043029..2a87a968a2 100644
--- a/ext/gmp/tests/037.phpt
+++ b/ext/gmp/tests/037.phpt
@@ -32,9 +32,9 @@ int(13)
 Warning: gmp_scan0(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 
-Warning: Wrong parameter count for gmp_scan0() in %s on line %d
+Warning: gmp_scan0() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_scan0() in %s on line %d
+Warning: gmp_scan0() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 Done
diff --git a/ext/gmp/tests/038.phpt b/ext/gmp/tests/038.phpt
index b278c2586c..7ebce9be7d 100644
--- a/ext/gmp/tests/038.phpt
+++ b/ext/gmp/tests/038.phpt
@@ -32,9 +32,9 @@ int(10)
 Warning: gmp_scan1(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 
-Warning: Wrong parameter count for gmp_scan1() in %s on line %d
+Warning: gmp_scan1() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_scan1() in %s on line %d
+Warning: gmp_scan1() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 Done
diff --git a/ext/gmp/tests/039.phpt b/ext/gmp/tests/039.phpt
index 3f373a84fc..9864cde4cc 100644
--- a/ext/gmp/tests/039.phpt
+++ b/ext/gmp/tests/039.phpt
@@ -21,15 +21,15 @@ echo "Done\n";
 resource(%d) of type (GMP integer)
 string(8) "98765678"
 
-Warning: Wrong parameter count for gmp_init() in %s on line %d
+Warning: gmp_init() expects at least 1 parameter, 0 given in %s on line %d
 
 Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 
-Warning: Wrong parameter count for gmp_init() in %s on line %d
+Warning: gmp_init() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for gmp_init() in %s on line %d
+Warning: gmp_init() expects at most 2 parameters, 4 given in %s on line %d
 NULL
 
 Warning: gmp_init(): Bad base for conversion: -1 (should be between 2 and 36) in %s on line %d