Skip to content

Commit 3448a4c

Browse files
nikicnikic
committed
Gmp fixes
1 parent e99ea84 commit 3448a4c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+25
-366
lines changed

‎ext/gmp/tests/gmp_abs.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ var_dump(gmp_strval(gmp_abs("0000")));
1515
var_dump(gmp_strval(gmp_abs("09876543")));
1616
var_dump(gmp_strval(gmp_abs("-099987654")));
1717

18-
var_dump(gmp_abs());
19-
var_dump(gmp_abs(1,2));
2018
var_dump(gmp_abs(array()));
2119

2220
echo "Done\n";
@@ -39,12 +37,6 @@ string(1) "0"
3937
Warning: gmp_abs(): Unable to convert variable to GMP - string is not an integer in %s on line %d
4038
string(1) "0"
4139

42-
Warning: gmp_abs() expects exactly 1 parameter, 0 given in %s on line %d
43-
NULL
44-
45-
Warning: gmp_abs() expects exactly 1 parameter, 2 given in %s on line %d
46-
NULL
47-
4840
Warning: gmp_abs(): Unable to convert variable to GMP - wrong type in %s on line %d
4941
bool(false)
5042
Done

‎ext/gmp/tests/gmp_and.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ var_dump(gmp_strval(gmp_and($n, "34332")));
1717
$n1 = gmp_init("987657878765436543456");
1818
var_dump(gmp_strval(gmp_and($n, $n1)));
1919

20-
var_dump(gmp_and($n, $n1, 1));
21-
var_dump(gmp_and(1));
2220
var_dump(gmp_and(array(), 1));
2321
var_dump(gmp_and(1, array()));
2422
var_dump(gmp_and(array(), array()));
@@ -37,12 +35,6 @@ string(1) "0"
3735
string(4) "1536"
3836
string(15) "424703623692768"
3937

40-
Warning: gmp_and() expects exactly 2 parameters, 3 given in %s on line %d
41-
NULL
42-
43-
Warning: gmp_and() expects exactly 2 parameters, 1 given in %s on line %d
44-
NULL
45-
4638
Warning: gmp_and(): Unable to convert variable to GMP - wrong type in %s on line %d
4739
bool(false)
4840

‎ext/gmp/tests/gmp_clrbit.phpt

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ gmp_clrbit($n, 20);
2828
var_dump(gmp_strval($n));
2929

3030
$n = array();
31-
gmp_clrbit($n, 3);
32-
gmp_clrbit($n, 3, 1);
33-
gmp_clrbit($n);
34-
gmp_clrbit();
31+
try {
32+
gmp_clrbit($n, 3);
33+
} catch (TypeError $e) {
34+
echo $e->getMessage(), "\n";
35+
}
3536

3637
echo "Done\n";
3738
?>
@@ -46,12 +47,5 @@ Warning: gmp_clrbit(): Index must be greater than or equal to zero in %s on line
4647
string(7) "1000000"
4748
string(7) "1000000"
4849
string(30) "238462734628347239571822592658"
49-
50-
Warning: gmp_clrbit() expects parameter 1 to be GMP, array given in %s on line %d
51-
52-
Warning: gmp_clrbit() expects exactly 2 parameters, 3 given in %s on line %d
53-
54-
Warning: gmp_clrbit() expects exactly 2 parameters, 1 given in %s on line %d
55-
56-
Warning: gmp_clrbit() expects exactly 2 parameters, 0 given in %s on line %d
50+
gmp_clrbit() expects parameter 1 to be GMP, array given
5751
Done

‎ext/gmp/tests/gmp_cmp.phpt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ var_dump(gmp_cmp(0,$n) < 0);
1717
$n1 = gmp_init("827278512385463739");
1818
var_dump(gmp_cmp($n1,$n));
1919

20-
var_dump(gmp_cmp($n1,$n,1));
2120
var_dump(gmp_cmp(array(),array()));
22-
var_dump(gmp_cmp(array()));
23-
var_dump(gmp_cmp());
2421

2522
echo "Done\n";
2623
?>
@@ -34,15 +31,6 @@ int(-1)
3431
bool(true)
3532
int(0)
3633

37-
Warning: gmp_cmp() expects exactly 2 parameters, 3 given in %s on line %d
38-
NULL
39-
4034
Warning: gmp_cmp(): Unable to convert variable to GMP - wrong type in %s on line %d
4135
bool(false)
42-
43-
Warning: gmp_cmp() expects exactly 2 parameters, 1 given in %s on line %d
44-
NULL
45-
46-
Warning: gmp_cmp() expects exactly 2 parameters, 0 given in %s on line %d
47-
NULL
4836
Done

‎ext/gmp/tests/gmp_com.phpt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ $n = gmp_init("98765463337");
1919
var_dump(gmp_strval(gmp_com($n)));
2020

2121
var_dump(gmp_strval(gmp_com(array())));
22-
var_dump(gmp_strval(gmp_com()));
2322

2423
echo "Done\n";
2524
?>
@@ -38,9 +37,4 @@ string(12) "-98765463338"
3837

3938
Warning: gmp_com(): Unable to convert variable to GMP - wrong type in %s on line %d
4039
string(1) "0"
41-
42-
Warning: gmp_com() expects exactly 1 parameter, 0 given in %s on line %d
43-
44-
Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
45-
bool(false)
4640
Done

‎ext/gmp/tests/gmp_div_q.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ gmp_div_q() tests
55
--FILE--
66
<?php
77

8-
var_dump(gmp_div_q());
9-
var_dump(gmp_div_q(""));
10-
118
var_dump(gmp_div_q(0,1));
129
var_dump(gmp_div_q(1,0));
1310
var_dump(gmp_div_q(12653,23482734));
@@ -27,11 +24,6 @@ var_dump(gmp_div_q(array(), array()));
2724
echo "Done\n";
2825
?>
2926
--EXPECTF--
30-
Warning: gmp_div_q() expects at least 2 parameters, 0 given in %s on line %d
31-
NULL
32-
33-
Warning: gmp_div_q() expects at least 2 parameters, 1 given in %s on line %d
34-
NULL
3527
object(GMP)#%d (1) {
3628
["num"]=>
3729
string(1) "0"

‎ext/gmp/tests/gmp_div_qr.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ gmp_div_qr() tests
55
--FILE--
66
<?php
77

8-
var_dump(gmp_div_qr());
9-
var_dump(gmp_div_qr(""));
10-
118
var_dump(gmp_div_qr(0,1));
129
var_dump(gmp_div_qr(1,0));
1310
var_dump(gmp_div_qr(gmp_init(1), gmp_init(0)));
@@ -29,11 +26,6 @@ var_dump(gmp_div_qr(array(), array()));
2926
echo "Done\n";
3027
?>
3128
--EXPECTF--
32-
Warning: gmp_div_qr() expects at least 2 parameters, 0 given in %s on line %d
33-
NULL
34-
35-
Warning: gmp_div_qr() expects at least 2 parameters, 1 given in %s on line %d
36-
NULL
3729
array(2) {
3830
[0]=>
3931
object(GMP)#%d (1) {

‎ext/gmp/tests/gmp_div_r.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ gmp_div_r() tests
55
--FILE--
66
<?php
77

8-
var_dump(gmp_div_r());
9-
var_dump(gmp_div_r(""));
10-
118
var_dump($r = gmp_div_r(0,1));
129
var_dump($r = gmp_div_r(1,0));
1310
var_dump($r = gmp_div_r(12653,23482734));
@@ -27,11 +24,6 @@ var_dump(gmp_div_r(array(), array()));
2724
echo "Done\n";
2825
?>
2926
--EXPECTF--
30-
Warning: gmp_div_r() expects at least 2 parameters, 0 given in %s on line %d
31-
NULL
32-
33-
Warning: gmp_div_r() expects at least 2 parameters, 1 given in %s on line %d
34-
NULL
3527
object(GMP)#%d (1) {
3628
["num"]=>
3729
string(1) "0"

‎ext/gmp/tests/gmp_divexact.phpt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ if (!defined('GMP_VERSION') || version_compare("4.2.1", GMP_VERSION, ">=")) {
1010
--FILE--
1111
<?php
1212

13-
var_dump(gmp_divexact(1, 1, 1));
14-
var_dump(gmp_divexact());
15-
1613
$r = gmp_divexact("233", "23345555555555555555555555");
1714
var_dump(gmp_strval($r));
1815

@@ -39,11 +36,6 @@ var_dump(gmp_strval($r));
3936
echo "Done\n";
4037
?>
4138
--EXPECTF--
42-
Warning: gmp_divexact() expects exactly 2 parameters, 3 given in %s on line %d
43-
NULL
44-
45-
Warning: gmp_divexact() expects exactly 2 parameters, 0 given in %s on line %d
46-
NULL
4739
string(1) "0"
4840

4941
Warning: gmp_divexact(): Zero operand not allowed in %s on line %d

‎ext/gmp/tests/gmp_export.phpt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ foreach ($export as $k => $test) {
5050

5151
var_dump($passed);
5252

53-
// Invalid arguments (zpp failure)
54-
var_dump(gmp_export());
55-
5653
// Invalid word sizes
5754
var_dump(gmp_export(123, -1));
5855
var_dump(gmp_export(123, 0));
@@ -63,9 +60,6 @@ var_dump(gmp_export(123, 1, GMP_BIG_ENDIAN | GMP_LITTLE_ENDIAN));
6360
--EXPECTF--
6461
bool(true)
6562

66-
Warning: gmp_export() expects at least 1 parameter, 0 given in %s on line %d
67-
NULL
68-
6963
Warning: gmp_export(): Word size must be positive, -1 given in %s on line %d
7064
bool(false)
7165

0 commit comments

Comments
 (0)