Skip to content

Commit afbabc0

Browse files
NickSdotNickSdot
committed
ext/gmp: applied fixers to improve test robustness
1 parent 1a48f90 commit afbabc0

65 files changed

Lines changed: 400 additions & 400 deletions

Some content is hidden

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

‎ext/gmp/tests/003.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ gmp
2626
try {
2727
$test[] = gmp_init("4d2");
2828
} catch (\ValueError $e) {
29-
echo $e->getMessage() . \PHP_EOL;
29+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
3030
}
3131
$test[] = gmp_init("4d2", 16);
3232

@@ -35,7 +35,7 @@ gmp
3535
}
3636
?>
3737
--EXPECT--
38-
gmp_init(): Argument #1 ($num) is not an integer string
38+
ValueError: gmp_init(): Argument #1 ($num) is not an integer string
3939
1234
4040
1234
4141
10011010010

‎ext/gmp/tests/bug32773.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ echo '10 + "0" = ', gmp_strval(gmp_add(10, '0')), "\n";
1010
try {
1111
var_dump(gmp_div(10, 0));
1212
} catch (\DivisionByZeroError $e) {
13-
echo $e->getMessage() . \PHP_EOL;
13+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1414
}
1515
try {
1616
var_dump(gmp_div_qr(10, 0));
1717
} catch (\DivisionByZeroError $e) {
18-
echo $e->getMessage() . \PHP_EOL;
18+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1919
}
2020

2121
?>
2222
--EXPECT--
2323
10 + 0 = 10
2424
10 + "0" = 10
25-
gmp_div(): Argument #2 ($num2) Division by zero
26-
gmp_div_qr(): Argument #2 ($num2) Division by zero
25+
DivisionByZeroError: gmp_div(): Argument #2 ($num2) Division by zero
26+
DivisionByZeroError: gmp_div_qr(): Argument #2 ($num2) Division by zero

‎ext/gmp/tests/bug50283.phpt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,34 @@ printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,36));
1010
try {
1111
printf("Decimal: %s, -1-based: %s\n", gmp_strval($a), gmp_strval($a,-1));
1212
} catch (\ValueError $e) {
13-
echo $e->getMessage() . \PHP_EOL;
13+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1414
}
1515
try {
1616
printf("Decimal: %s, 1-based: %s\n", gmp_strval($a), gmp_strval($a,1));
1717
} catch (\ValueError $e) {
18-
echo $e->getMessage() . \PHP_EOL;
18+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1919
}
2020
try {
2121
printf("Decimal: %s, -37-based: %s\n", gmp_strval($a), gmp_strval($a,-37));
2222
} catch (\ValueError $e) {
23-
echo $e->getMessage() . \PHP_EOL;
23+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
2424
}
2525
printf("Decimal: %s, 37-based: %s\n", gmp_strval($a), gmp_strval($a,37));
2626
printf("Decimal: %s, 62-based: %s\n", gmp_strval($a), gmp_strval($a,62));
2727
try {
2828
printf("Decimal: %s, 63-based: %s\n\n", gmp_strval($a), gmp_strval($a,63));
2929
} catch (\ValueError $e) {
30-
echo $e->getMessage() . \PHP_EOL;
30+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
3131
}
3232
printf("Base 32 and 62-based: %s\n", gmp_strval(gmp_init("gh82179fbf5", 32), 62));
3333
?>
3434
--EXPECT--
3535
Decimal: 71915494046709, -36-based: PHPISCOOL
3636
Decimal: 71915494046709, 36-based: phpiscool
37-
gmp_strval(): Argument #2 ($base) must be between 2 and 62, or -2 and -36
38-
gmp_strval(): Argument #2 ($base) must be between 2 and 62, or -2 and -36
39-
gmp_strval(): Argument #2 ($base) must be between 2 and 62, or -2 and -36
37+
ValueError: gmp_strval(): Argument #2 ($base) must be between 2 and 62, or -2 and -36
38+
ValueError: gmp_strval(): Argument #2 ($base) must be between 2 and 62, or -2 and -36
39+
ValueError: gmp_strval(): Argument #2 ($base) must be between 2 and 62, or -2 and -36
4040
Decimal: 71915494046709, 37-based: KHKATELJF
4141
Decimal: 71915494046709, 62-based: KQ6yq741
42-
gmp_strval(): Argument #2 ($base) must be between 2 and 62, or -2 and -36
42+
ValueError: gmp_strval(): Argument #2 ($base) must be between 2 and 62, or -2 and -36
4343
Base 32 and 62-based: 1NHkAcdIiD

‎ext/gmp/tests/bug66872.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ gmp
88
try {
99
var_dump(gmp_testbit("abc", 1));
1010
} catch (\ValueError $e) {
11-
echo $e->getMessage() . \PHP_EOL;
11+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1212
}
1313

1414
?>
1515
--EXPECT--
16-
gmp_testbit(): Argument #1 ($num) is not an integer string
16+
ValueError: gmp_testbit(): Argument #1 ($num) is not an integer string

‎ext/gmp/tests/bug80560.phpt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,24 +72,24 @@ echo 'Hexadecimal', \PHP_EOL;
7272
try {
7373
var_dump(gmp_init('0X', 16));
7474
} catch (\ValueError $e) {
75-
echo $e->getMessage(), \PHP_EOL;
75+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
7676
}
7777
try {
7878
var_dump(gmp_init('0x', 16));
7979
} catch (\ValueError $e) {
80-
echo $e->getMessage(), \PHP_EOL;
80+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
8181
}
8282

8383
echo 'Binary', \PHP_EOL;
8484
try {
8585
var_dump(gmp_init('0B', 2));
8686
} catch (\ValueError $e) {
87-
echo $e->getMessage(), \PHP_EOL;
87+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
8888
}
8989
try {
9090
var_dump(gmp_init('0b', 2));
9191
} catch (\ValueError $e) {
92-
echo $e->getMessage(), \PHP_EOL;
92+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
9393
}
9494

9595
echo 'Fuzzing gmp functions:', \PHP_EOL;
@@ -219,10 +219,10 @@ echo "Done\n";
219219
--EXPECT--
220220
Explicit base with gmp_init:
221221
Hexadecimal
222-
gmp_init(): Argument #1 ($num) is not an integer string
223-
gmp_init(): Argument #1 ($num) is not an integer string
222+
ValueError: gmp_init(): Argument #1 ($num) is not an integer string
223+
ValueError: gmp_init(): Argument #1 ($num) is not an integer string
224224
Binary
225-
gmp_init(): Argument #1 ($num) is not an integer string
226-
gmp_init(): Argument #1 ($num) is not an integer string
225+
ValueError: gmp_init(): Argument #1 ($num) is not an integer string
226+
ValueError: gmp_init(): Argument #1 ($num) is not an integer string
227227
Fuzzing gmp functions:
228228
Done

‎ext/gmp/tests/bug81119.phpt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function test($f) {
1010
$f();
1111
echo "No error?\n";
1212
} catch (TypeError|ValueError $e) {
13-
echo $e->getMessage(), "\n";
13+
echo $e::class, ': ', $e->getMessage(), "\n";
1414
}
1515
}
1616
test(fn($WRONG_SCOPE_1 = 0, $WRONG_SCOPE_2 = 0) => gmp_init(1) < "x");
@@ -20,7 +20,7 @@ test(fn($WRONG_SCOPE_1 = 0, $WRONG_SCOPE_2 = 0) => gmp_init(1) + []);
2020

2121
?>
2222
--EXPECT--
23-
Number is not an integer string
24-
Number must be of type GMP|string|int, array given
25-
Number is not an integer string
26-
Number must be of type GMP|string|int, array given
23+
ValueError: Number is not an integer string
24+
TypeError: Number must be of type GMP|string|int, array given
25+
ValueError: Number is not an integer string
26+
TypeError: Number must be of type GMP|string|int, array given

‎ext/gmp/tests/comparison_invalid.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ gmp
88
try {
99
var_dump("hapfegfbu" > gmp_init(0));
1010
} catch (\Error $e) {
11-
echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
11+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1212
}
1313

1414
try {
1515
var_dump((new DateTime()) > gmp_init(0));
1616
} catch (\Error $e) {
17-
echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
17+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1818
}
1919

2020
?>

‎ext/gmp/tests/construct.phpt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ var_dump(new GMP("12", 4));
1212
try {
1313
var_dump(new GMP("12", 999));
1414
} catch (ValueError $e) {
15-
echo $e->getMessage() . "\n";
15+
echo $e::class, ': ', $e->getMessage(), "\n";
1616
}
1717
try {
1818
var_dump(new GMP("", 10));
1919
} catch (ValueError $e) {
20-
echo $e->getMessage() . "\n";
20+
echo $e::class, ': ', $e->getMessage(), "\n";
2121
}
2222
try {
2323
var_dump(new GMP("hello"));
2424
} catch (ValueError $e) {
25-
echo $e->getMessage() . "\n";
25+
echo $e::class, ': ', $e->getMessage(), "\n";
2626
}
2727
?>
2828
--EXPECT--
@@ -46,6 +46,6 @@ object(GMP)#1 (1) {
4646
["num"]=>
4747
string(1) "6"
4848
}
49-
GMP::__construct(): Argument #2 ($base) must be 0 or between 2 and 62
50-
GMP::__construct(): Argument #1 ($num) is not an integer string
51-
GMP::__construct(): Argument #1 ($num) is not an integer string
49+
ValueError: GMP::__construct(): Argument #2 ($base) must be 0 or between 2 and 62
50+
ValueError: GMP::__construct(): Argument #1 ($num) is not an integer string
51+
ValueError: GMP::__construct(): Argument #1 ($num) is not an integer string

‎ext/gmp/tests/gh16501.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ gmp
77
try {
88
gmp_random_bits(PHP_INT_MAX);
99
} catch (\ValueError $e) {
10-
echo $e->getMessage();
10+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1111
}
1212
?>
1313
--EXPECTF--
14-
gmp_random_bits(): Argument #1 ($bits) must be between 1 and %d
14+
ValueError: gmp_random_bits(): Argument #1 ($bits) must be between 1 and %d

‎ext/gmp/tests/gh9308.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ declare(strict_types=1);
1111
try {
1212
$gmp = gmp_init(gmp_init(123));
1313
} catch (\TypeError $e) {
14-
echo $e->getMessage(), \PHP_EOL;
14+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1515
}
1616

1717
?>
1818
--EXPECT--
19-
gmp_init(): Argument #1 ($num) must be of type string|int, GMP given
19+
TypeError: gmp_init(): Argument #1 ($num) must be of type string|int, GMP given

0 commit comments

Comments
 (0)