fix tests

36 files changed, 457 insertions, 221 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 51f0fb18a5..0417197b0d 100644
--- a/ext/gmp/tests/005.phpt
+++ b/ext/gmp/tests/005.phpt
@@ -32,15 +32,19 @@ var_dump(gmp_strval(new stdclass, 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,22 +64,26 @@ Warning: gmp_strval(): Bad base for conversion: 100000 in %s on line %d
 bool(false)
 string(8) "-3373333"
 
-Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
-bool(false)
+Warning: gmp_strval() expects parameter 2 to be long, array 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)
+Warning: gmp_strval() expects parameter 2 to be long, object given in %s on line %d
+NULL
 Done
 --UEXPECTF--
-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, Unicode 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, Unicode 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)
 unicode(7) "9765456"
@@ -95,9 +103,9 @@ Warning: gmp_strval(): Bad base for conversion: 100000 in %s on line %d
 bool(false)
 unicode(8) "-3373333"
 
-Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
-bool(false)
+Warning: gmp_strval() expects parameter 2 to be long, array 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)
+Warning: gmp_strval() expects parameter 2 to be long, object given in %s on line %d
+NULL
 Done
diff --git a/ext/gmp/tests/006.phpt b/ext/gmp/tests/006.phpt
index 0b94bf7eab..a685caede3 100644
--- a/ext/gmp/tests/006.phpt
+++ b/ext/gmp/tests/006.phpt
@@ -23,28 +23,54 @@ 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)
-%s(2) "-1"
+string(2) "-1"
 resource(%d) of type (GMP integer)
-%s(5) "10001"
+string(5) "10001"
 
 Warning: gmp_sub(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
-%s(1) "0"
+string(1) "0"
 
 Warning: gmp_sub(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
-%s(1) "0"
+string(1) "0"
+Done
+--UEXPECTF--
+Warning: gmp_sub() expects exactly 2 parameters, 0 given in %s on line %d
+NULL
+
+Warning: gmp_sub() expects exactly 2 parameters, 1 given in %s on line %d
+NULL
+bool(false)
+
+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)
+unicode(2) "-1"
+resource(%d) of type (GMP integer)
+unicode(5) "10001"
+
+Warning: gmp_sub(): Unable to convert variable to GMP - wrong type in %s on line %d
+bool(false)
+unicode(1) "0"
+
+Warning: gmp_sub(): Unable to convert variable to GMP - wrong type in %s on line %d
+bool(false)
+unicode(1) "0"
 Done
diff --git a/ext/gmp/tests/007.phpt b/ext/gmp/tests/007.phpt
index adcb88b246..ea99e56780 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]=>
@@ -56,8 +56,8 @@ array(2) {
   [1]=>
   resource(%d) of type (GMP integer)
 }
-%s(1) "0"
-%s(1) "0"
+string(1) "0"
+string(1) "0"
 
 Warning: gmp_div_qr(): Zero operand not allowed in %s on line %d
 bool(false)
@@ -67,8 +67,8 @@ array(2) {
   [1]=>
   resource(%d) of type (GMP integer)
 }
-%s(1) "0"
-%s(5) "12653"
+string(1) "0"
+string(5) "12653"
 NULL
 
 Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
@@ -82,48 +82,135 @@ array(2) {
   [1]=>
   resource(%d) of type (GMP integer)
 }
-%s(4) "9131"
-%s(2) "10"
+string(4) "9131"
+string(2) "10"
 array(2) {
   [0]=>
   resource(%d) of type (GMP integer)
   [1]=>
   resource(%d) of type (GMP integer)
 }
-%s(4) "9132"
-%s(4) "-113"
+string(4) "9132"
+string(4) "-113"
 array(2) {
   [0]=>
   resource(%d) of type (GMP integer)
   [1]=>
   resource(%d) of type (GMP integer)
 }
-%s(4) "9131"
-%s(2) "10"
+string(4) "9131"
+string(2) "10"
 array(2) {
   [0]=>
   resource(%d) of type (GMP integer)
   [1]=>
   resource(%d) of type (GMP integer)
 }
-%s(4) "9131"
-%s(2) "10"
+string(4) "9131"
+string(2) "10"
 array(2) {
   [0]=>
   resource(%d) of type (GMP integer)
   [1]=>
   resource(%d) of type (GMP integer)
 }
-%s(4) "9132"
-%s(4) "-113"
+string(4) "9132"
+string(4) "-113"
 array(2) {
   [0]=>
   resource(%d) of type (GMP integer)
   [1]=>
   resource(%d) of type (GMP integer)
 }
-%s(4) "9131"
-%s(2) "10"
+string(4) "9131"
+string(2) "10"
+
+Warning: gmp_div_qr(): supplied resource is not a valid GMP integer resource in %s on line %d
+bool(false)
+
+Warning: gmp_div_qr(): Unable to convert variable to GMP - wrong type in %s on line %d
+bool(false)
+Done
+--UEXPECTF--
+Warning: gmp_div_qr() expects at least 2 parameters, 0 given in %s on line %d
+NULL
+
+Warning: gmp_div_qr() expects at least 2 parameters, 1 given in %s on line %d
+NULL
+array(2) {
+  [0]=>
+  resource(%d) of type (GMP integer)
+  [1]=>
+  resource(%d) of type (GMP integer)
+}
+unicode(1) "0"
+unicode(1) "0"
+
+Warning: gmp_div_qr(): Zero operand not allowed in %s on line %d
+bool(false)
+array(2) {
+  [0]=>
+  resource(%d) of type (GMP integer)
+  [1]=>
+  resource(%d) of type (GMP integer)
+}
+unicode(1) "0"
+unicode(5) "12653"
+NULL
+
+Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
+bool(false)
+
+Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
+bool(false)
+array(2) {
+  [0]=>
+  resource(%d) of type (GMP integer)
+  [1]=>
+  resource(%d) of type (GMP integer)
+}
+unicode(4) "9131"
+unicode(2) "10"
+array(2) {
+  [0]=>
+  resource(%d) of type (GMP integer)
+  [1]=>
+  resource(%d) of type (GMP integer)
+}
+unicode(4) "9132"
+unicode(4) "-113"
+array(2) {
+  [0]=>
+  resource(%d) of type (GMP integer)
+  [1]=>
+  resource(%d) of type (GMP integer)
+}
+unicode(4) "9131"
+unicode(2) "10"
+array(2) {
+  [0]=>
+  resource(%d) of type (GMP integer)
+  [1]=>
+  resource(%d) of type (GMP integer)
+}
+unicode(4) "9131"
+unicode(2) "10"
+array(2) {
+  [0]=>
+  resource(%d) of type (GMP integer)
+  [1]=>
+  resource(%d) of type (GMP integer)
+}
+unicode(4) "9132"
+unicode(4) "-113"
+array(2) {
+  [0]=>
+  resource(%d) of type (GMP integer)
+  [1]=>
+  resource(%d) of type (GMP integer)
+}
+unicode(4) "9131"
+unicode(2) "10"
 
 Warning: gmp_div_qr(): supplied resource is not a valid GMP integer resource in %s on line %d
 bool(false)
diff --git a/ext/gmp/tests/008.phpt b/ext/gmp/tests/008.phpt
index ebd17794d3..b6a74fabe7 100644
--- a/ext/gmp/tests/008.phpt
+++ b/ext/gmp/tests/008.phpt
@@ -36,34 +36,70 @@ 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)
-%s(1) "0"
+string(1) "0"
 
 Warning: gmp_div_r(): Zero operand not allowed in %s on line %d
 bool(false)
 int(12653)
-%s(5) "12653"
+string(5) "12653"
 NULL
 
 Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 int(10)
-%s(2) "10"
+string(2) "10"
 int(113)
-%s(3) "113"
+string(3) "113"
 int(10)
-%s(2) "10"
+string(2) "10"
 int(10)
-%s(2) "10"
+string(2) "10"
 int(113)
-%s(3) "113"
+string(3) "113"
 int(10)
-%s(2) "10"
+string(2) "10"
+
+Warning: gmp_div_r(): supplied resource is not a valid GMP integer resource in %s on line %d
+bool(false)
+
+Warning: gmp_div_r(): Unable to convert variable to GMP - wrong type in %s on line %d
+bool(false)
+Done
+--UEXPECTF--
+Warning: gmp_div_r() expects at least 2 parameters, 0 given in %s on line %d
+NULL
+
+Warning: gmp_div_r() expects at least 2 parameters, 1 given in %s on line %d
+NULL
+int(0)
+unicode(1) "0"
+
+Warning: gmp_div_r(): Zero operand not allowed in %s on line %d
+bool(false)
+int(12653)
+unicode(5) "12653"
+NULL
+
+Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
+bool(false)
+int(10)
+unicode(2) "10"
+int(113)
+unicode(3) "113"
+int(10)
+unicode(2) "10"
+int(10)
+unicode(2) "10"
+int(113)
+unicode(3) "113"
+int(10)
+unicode(2) "10"
 
 Warning: gmp_div_r(): supplied resource is not a valid GMP integer resource in %s on line %d
 bool(false)
diff --git a/ext/gmp/tests/009.phpt b/ext/gmp/tests/009.phpt
index b5f782fa80..81087a80a1 100644
--- a/ext/gmp/tests/009.phpt
+++ b/ext/gmp/tests/009.phpt
@@ -36,34 +36,70 @@ 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)
-%s(1) "0"
+string(1) "0"
 
 Warning: gmp_div_q(): Zero operand not allowed in %s on line %d
 bool(false)
 resource(%d) of type (GMP integer)
-%s(1) "0"
+string(1) "0"
 NULL
 
 Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
 resource(%d) of type (GMP integer)
-%s(4) "9131"
+string(4) "9131"
 resource(%d) of type (GMP integer)
-%s(4) "9132"
+string(4) "9132"
 resource(%d) of type (GMP integer)
-%s(4) "9131"
+string(4) "9131"
 resource(%d) of type (GMP integer)
-%s(4) "9131"
+string(4) "9131"
 resource(%d) of type (GMP integer)
-%s(4) "9132"
+string(4) "9132"
 resource(%d) of type (GMP integer)
-%s(4) "9131"
+string(4) "9131"
+
+Warning: gmp_div_q(): supplied resource is not a valid GMP integer resource in %s on line %d
+bool(false)
+
+Warning: gmp_div_q(): Unable to convert variable to GMP - wrong type in %s on line %d
+bool(false)
+Done
+--UEXPECTF--
+Warning: gmp_div_q() expects at least 2 parameters, 0 given in %s on line %d
+NULL
+
+Warning: gmp_div_q() expects at least 2 parameters, 1 given in %s on line %d
+NULL
+resource(%d) of type (GMP integer)
+unicode(1) "0"
+
+Warning: gmp_div_q(): Zero operand not allowed in %s on line %d
+bool(false)
+resource(%d) of type (GMP integer)
+unicode(1) "0"
+NULL
+
+Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
+bool(false)
+resource(%d) of type (GMP integer)
+unicode(4) "9131"
+resource(%d) of type (GMP integer)
+unicode(4) "9132"
+resource(%d) of type (GMP integer)
+unicode(4) "9131"
+resource(%d) of type (GMP integer)
+unicode(4) "9131"
+resource(%d) of type (GMP integer)
+unicode(4) "9132"
+resource(%d) of type (GMP integer)
+unicode(4) "9131"
 
 Warning: gmp_div_q(): supplied resource is not a valid GMP integer resource in %s on line %d
 bool(false)
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 563d4c49a6..e47df03be2 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, 3 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"
 
@@ -55,10 +55,10 @@ string(18) "200000000000000000"
 string(9) "-10000000"
 Done
 --UEXPECTF--
-Warning: Wrong parameter count for gmp_divexact() in %s on line %d
+Warning: gmp_divexact() expects exactly 2 parameters, 3 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
 unicode(1) "0"
 
diff --git a/ext/gmp/tests/012.phpt b/ext/gmp/tests/012.phpt
index c7843020ce..3bf0d0a75f 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
@@ -52,10 +52,29 @@ int(0)
 int(0)
 unicode(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
+bool(false)
+Done
+--UEXPECTF--
+int(0)
+int(-1)
+int(1)
+int(1)
+int(0)
+int(0)
+int(0)
+unicode(21) "-12345678901234567890"
+
+Warning: gmp_neg() expects exactly 1 parameter, 2 given in %s on line %d
+NULL
+
+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 b99853eec9..2bfdbb4c61 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
@@ -56,10 +56,10 @@ unicode(1) "0"
 unicode(1) "0"
 unicode(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 c0d8b36e17..cf883ad2bd 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"
@@ -76,10 +76,10 @@ unicode(11) "87178291200"
 Warning: gmp_fact(): Number has to be greater than or equal to 0 in %s on line %d
 unicode(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)
 unicode(1) "1"
diff --git a/ext/gmp/tests/015.phpt b/ext/gmp/tests/015.phpt
index 57e7af27d3..39327f0d1c 100644
--- a/ext/gmp/tests/015.phpt
+++ b/ext/gmp/tests/015.phpt
@@ -48,18 +48,20 @@ 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
-bool(false)
-resource(%d) of type (GMP integer)
+Warning: gmp_pow() expects parameter 2 to be long, array given in %s on line %d
+NULL
+
+Warning: gmp_pow() expects parameter 2 to be long, array given in %s on line %d
+NULL
 
 Warning: gmp_pow(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
@@ -82,18 +84,20 @@ unicode(1) "0"
 unicode(14) "10240000000000"
 unicode(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
-bool(false)
-resource(%d) of type (GMP integer)
+Warning: gmp_pow() expects parameter 2 to be long, array given in %s on line %d
+NULL
+
+Warning: gmp_pow() expects parameter 2 to be long, array given in %s on line %d
+NULL
 
 Warning: gmp_pow(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
diff --git a/ext/gmp/tests/016.phpt b/ext/gmp/tests/016.phpt
index 409ca8d717..0f5271a0cb 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
@@ -94,16 +94,16 @@ 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
 bool(false)
-resource(%d) of type (GMP integer)
+resource(35) of type (GMP integer)
 Done
diff --git a/ext/gmp/tests/017.phpt b/ext/gmp/tests/017.phpt
index 3d568892cb..5204622d61 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
@@ -63,10 +63,10 @@ Warning: gmp_sqrt(): Number has to be greater than or equal to 0 in %s on line %
 unicode(1) "0"
 unicode(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 cbcb1c02b5..72f1304e1e 100644
--- a/ext/gmp/tests/018.phpt
+++ b/ext/gmp/tests/018.phpt
@@ -95,7 +95,7 @@ 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
 --UEXPECTF--
@@ -136,6 +136,6 @@ unicode(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 2d7d9af47a..72ff573f63 100644
--- a/ext/gmp/tests/021.phpt
+++ b/ext/gmp/tests/021.phpt
@@ -38,15 +38,15 @@ string(1) "1"
 string(1) "2"
 string(1) "1"
 string(10) "8127346234"
-string(1) "0"
+string(10) "8127346234"
 
-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
 --UEXPECTF--
@@ -60,14 +60,14 @@ unicode(1) "1"
 unicode(1) "2"
 unicode(1) "1"
 unicode(10) "8127346234"
-unicode(1) "0"
+unicode(10) "8127346234"
 
-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 fe66f95597..3cf4447345 100644
--- a/ext/gmp/tests/022.phpt
+++ b/ext/gmp/tests/022.phpt
@@ -74,13 +74,13 @@ 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
 --UEXPECTF--
@@ -121,12 +121,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 794f8a2237..e26739de38 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
@@ -64,10 +64,10 @@ unicode(1) "0"
 unicode(22) "3498273496234234523441"
 unicode(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 0285f02b8d..9f718c10dd 100644
--- a/ext/gmp/tests/024.phpt
+++ b/ext/gmp/tests/024.phpt
@@ -35,20 +35,22 @@ 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)
 
 Warning: gmp_jacobi(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
@@ -56,13 +58,13 @@ 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
 --UEXPECTF--
@@ -70,20 +72,22 @@ unicode(1) "0"
 unicode(2) "-1"
 unicode(1) "0"
 unicode(1) "0"
+unicode(2) "-1"
 unicode(1) "0"
 unicode(1) "0"
+unicode(2) "-1"
 unicode(1) "0"
 unicode(1) "0"
+unicode(2) "-1"
+unicode(2) "-1"
 unicode(1) "0"
 unicode(1) "0"
+unicode(2) "-1"
 unicode(1) "0"
-unicode(1) "0"
-unicode(1) "0"
-unicode(1) "0"
-unicode(1) "0"
-unicode(1) "0"
-unicode(1) "0"
-int(0)
+unicode(2) "-1"
+
+Warning: gmp_jacobi(): Unable to convert variable to GMP - wrong type in %s on line %d
+bool(false)
 
 Warning: gmp_jacobi(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
@@ -91,12 +95,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 1b3fd033af..747121aee1 100644
--- a/ext/gmp/tests/025.phpt
+++ b/ext/gmp/tests/025.phpt
@@ -35,20 +35,22 @@ 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)
 
 Warning: gmp_legendre(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
@@ -56,13 +58,13 @@ 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
 --UEXPECTF--
@@ -70,20 +72,22 @@ unicode(1) "0"
 unicode(2) "-1"
 unicode(1) "0"
 unicode(1) "0"
+unicode(2) "-1"
 unicode(1) "0"
 unicode(1) "0"
+unicode(2) "-1"
 unicode(1) "0"
 unicode(1) "0"
+unicode(2) "-1"
+unicode(2) "-1"
 unicode(1) "0"
 unicode(1) "0"
+unicode(2) "-1"
 unicode(1) "0"
-unicode(1) "0"
-unicode(1) "0"
-unicode(1) "0"
-unicode(1) "0"
-unicode(1) "0"
-unicode(1) "0"
-int(0)
+unicode(2) "-1"
+
+Warning: gmp_legendre(): Unable to convert variable to GMP - wrong type in %s on line %d
+bool(false)
 
 Warning: gmp_legendre(): Unable to convert variable to GMP - wrong type in %s on line %d
 bool(false)
@@ -91,12 +95,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..e09766c8e0 100644
--- a/ext/gmp/tests/026.phpt
+++ b/ext/gmp/tests/026.phpt
@@ -31,18 +31,18 @@ int(-1)
 int(0)
 int(1)
 int(-1)
-int(-2)
+int(-1)
 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 346cc27994..ba4e0a9bdd 100644
--- a/ext/gmp/tests/028.phpt
+++ b/ext/gmp/tests/028.phpt
@@ -22,16 +22,22 @@ echo "Done\n";
 --EXPECTF--	
 string(%d) "%d"
 string(%d) "%d"
-string(1) "%d"
+string(1) "0"
 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
 --UEXPECTF--
 unicode(%d) "%d"
@@ -40,10 +46,16 @@ unicode(1) "0"
 unicode(%d) "%d"
 unicode(%d) "%d"
 unicode(%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, Unicode string given in %s on line %d
+NULL
+
+Warning: gmp_random() expects parameter 1 to be long, Unicode 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 1ee906b6d8..3a4260c4e0 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
@@ -60,10 +60,10 @@ unicode(1) "0"
 unicode(4) "1536"
 unicode(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 af762a6b15..0944a34add 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
@@ -60,10 +60,10 @@ unicode(1) "0"
 unicode(15) "987657876576252"
 unicode(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 4bf36def9b..dda6ced6c6 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)
@@ -56,7 +56,7 @@ unicode(12) "-98765463338"
 Warning: gmp_com(): Unable to convert variable to GMP - wrong type in %s on line %d
 unicode(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 5753fa2d46..ea9ed3277a 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
@@ -60,10 +60,10 @@ unicode(1) "0"
 unicode(15) "987657876574716"
 unicode(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 a41d848c4a..e696e23c58 100644
--- a/ext/gmp/tests/033.phpt
+++ b/ext/gmp/tests/033.phpt
@@ -54,13 +54,13 @@ 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
 --UEXPECTF--
 unicode(2) "-1"
@@ -75,11 +75,11 @@ unicode(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 4ba5697b5f..509aaed70e 100644
--- a/ext/gmp/tests/034.phpt
+++ b/ext/gmp/tests/034.phpt
@@ -48,11 +48,11 @@ 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
 --UEXPECTF--
 unicode(1) "0"
@@ -67,9 +67,9 @@ unicode(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/040.phpt b/ext/gmp/tests/040.phpt
index 61b7d4945b..4ea6b15ef3 100644
--- a/ext/gmp/tests/040.phpt
+++ b/ext/gmp/tests/040.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
@@ -42,15 +42,15 @@ Done
 resource(%d) of type (GMP integer)
 unicode(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