[pull] master from php:master

ext/gmp/php_gmp.h

@@ -32,6 +32,7 @@ ZEND_MODULE_INFO_D(gmp);
 ZEND_BEGIN_MODULE_GLOBALS(gmp)
 	bool rand_initialized;
 	gmp_randstate_t rand_state;
+	mpz_t zpp_arg[3];
 ZEND_END_MODULE_GLOBALS(gmp)
 
 #define GMPG(v) ZEND_MODULE_GLOBALS_ACCESSOR(gmp, v)

ext/gmp/tests/bug32773.phpt

@@ -22,5 +22,5 @@ try {
 --EXPECT--
 10 + 0 = 10
 10 + "0" = 10
-Division by zero
-Division by zero
+gmp_div(): Argument #2 ($num2) Division by zero
+gmp_div_qr(): Argument #2 ($num2) Division by zero

ext/gmp/tests/gmp_cmp.phpt

@@ -5,17 +5,27 @@ gmp
 --FILE--
 <?php
 
-var_dump(gmp_cmp(123123,-123123));
-var_dump(gmp_cmp("12345678900987654321","12345678900987654321"));
-var_dump(gmp_cmp("12345678900987654321","123456789009876543211"));
-var_dump(gmp_cmp(0,0));
-var_dump(gmp_cmp(1231222,0));
-var_dump(gmp_cmp(0,345355));
+function cmp_helper($l, $r) {
+    echo 'gmp(', var_export($l, true), ', ', var_export($r, true), '): ';
+    $r = gmp_cmp($l, $r);
+    echo match (true) {
+        $r === 0 => "equals\n",
+        $r < 0 => "right greater than left\n",
+        $r > 0 => "left greater than right\n",
+    };
+}
+
+cmp_helper(123123,-123123);
+cmp_helper("12345678900987654321","12345678900987654321");
+cmp_helper("12345678900987654321","123456789009876543211");
+cmp_helper(0,0);
+cmp_helper(1231222,0);
+cmp_helper(0,345355);
 
 $n = gmp_init("827278512385463739");
 var_dump(gmp_cmp(0,$n) < 0);
 $n1 = gmp_init("827278512385463739");
-var_dump(gmp_cmp($n1,$n));
+var_dump(gmp_cmp($n1,$n) === 0);
 
 try {
     var_dump(gmp_cmp(array(),array()));
@@ -26,13 +36,13 @@ try {
 echo "Done\n";
 ?>
 --EXPECT--
-int(2)
-int(0)
-int(-1)
-int(0)
-int(1)
-int(-1)
+gmp(123123, -123123): left greater than right
+gmp('12345678900987654321', '12345678900987654321'): equals
+gmp('12345678900987654321', '123456789009876543211'): right greater than left
+gmp(0, 0): equals
+gmp(1231222, 0): left greater than right
+gmp(0, 345355): right greater than left
+bool(true)
 bool(true)
-int(0)
 gmp_cmp(): Argument #1 ($num1) must be of type GMP|string|int, array given
 Done

ext/gmp/tests/gmp_div_q.phpt

@@ -46,7 +46,7 @@ object(GMP)#1 (1) {
   ["num"]=>
   string(1) "0"
 }
-Division by zero
+gmp_div_q(): Argument #2 ($num2) Division by zero
 object(GMP)#2 (1) {
   ["num"]=>
   string(1) "0"

ext/gmp/tests/gmp_div_qr.phpt

@@ -60,8 +60,8 @@ array(2) {
     string(1) "0"
   }
 }
-Division by zero
-Division by zero
+gmp_div_qr(): Argument #2 ($num2) Division by zero
+gmp_div_qr(): Argument #2 ($num2) Division by zero
 array(2) {
   [0]=>
   object(GMP)#2 (1) {

ext/gmp/tests/gmp_div_r.phpt

@@ -46,7 +46,7 @@ object(GMP)#1 (1) {
   ["num"]=>
   string(1) "0"
 }
-Division by zero
+gmp_div_r(): Argument #2 ($num2) Division by zero
 object(GMP)#3 (1) {
   ["num"]=>
   string(5) "12653"

ext/gmp/tests/gmp_divexact.phpt

@@ -42,7 +42,7 @@ echo "Done\n";
 ?>
 --EXPECT--
 string(1) "0"
-Division by zero
+gmp_divexact(): Argument #2 ($num2) Division by zero
 string(2) "10"
 string(3) "512"
 string(19) "5000000000000000000"

ext/gmp/tests/gmp_invert.phpt

@@ -6,7 +6,6 @@ gmp
 <?php
 
 var_dump(gmp_strval(gmp_invert(123123,5467624)));
-var_dump(gmp_strval(gmp_invert(123123,"3333334345467624")));
 var_dump(gmp_strval(gmp_invert("12312323213123123",7624)));
 
 try {
@@ -22,9 +21,11 @@ try {
     echo $e->getMessage() . \PHP_EOL;
 }
 
-var_dump(gmp_strval(gmp_invert(0,28347)));
-var_dump(gmp_strval(gmp_invert(-12,456456)));
-var_dump(gmp_strval(gmp_invert(234234,-435345)));
+echo "No inverse modulo\n";
+var_dump(gmp_invert(123123,"3333334345467624"));
+var_dump(gmp_invert(0,28347));
+var_dump(gmp_invert(-12,456456));
+var_dump(gmp_invert(234234,-435345));
 
 $n = gmp_init("349827349623423452345");
 $n1 = gmp_init("3498273496234234523451");
@@ -52,13 +53,14 @@ echo "Done\n";
 ?>
 --EXPECT--
 string(7) "2293131"
-string(1) "0"
 string(4) "5827"
 Division by zero
 Division by zero
-string(1) "0"
-string(1) "0"
-string(1) "0"
+No inverse modulo
+bool(false)
+bool(false)
+bool(false)
+bool(false)
 string(22) "3498273496234234523441"
 string(1) "1"
 gmp_invert(): Argument #1 ($num1) must be of type GMP|string|int, array given

ext/gmp/tests/gmp_mod.phpt

@@ -42,7 +42,7 @@ object(GMP)#2 (1) {
   ["num"]=>
   string(1) "0"
 }
-Modulo by zero
+gmp_mod(): Argument #2 ($num2) Modulo by zero
 gmp_mod(): Argument #1 ($num1) must be of type GMP|string|int, array given
 object(GMP)#4 (1) {
   ["num"]=>

ext/gmp/tests/gmp_strval.phpt

@@ -66,7 +66,7 @@ echo "Done\n";
 ?>
 --EXPECT--
 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 ($num) is not an integer string
 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