Skip to content

Commit e9a72d8

Browse files
committed
For PR #4110 to diff for master branch
1 parent a0ba104 commit e9a72d8

File tree

7 files changed

+142
-2
lines changed

7 files changed

+142
-2
lines changed

ext/bcmath/tests/bcadd.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ bcmath.scale=0
88
<?php
99
echo bcadd("1", "2"),"\n";
1010
echo bcadd("-1", "5", 4),"\n";
11+
echo bcadd("-1", "-5", 4),"\n";
12+
echo bcadd("1", "-5", 4),"\n";
1113
echo bcadd("1928372132132819737213", "8728932001983192837219398127471", 2),"\n";
1214
?>
1315
--EXPECT--
1416
3
1517
4.0000
18+
-6.0000
19+
-4.0000
1620
8728932003911564969352217864684.00

ext/bcmath/tests/bcadd_variation001.phpt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@ bcmath.scale=5
77
--FILE--
88
<?php
99
echo bcadd("2.2", "4.3", "2")."\n";
10+
echo bcadd("2.2", "4.3", 2)."\n";
1011
echo bcadd("2.2", "-7.3", "1")."\n";
11-
echo bcadd("-4.27", "7.3");
12+
echo bcadd("2.2", "-7.3", 1)."\n";
13+
echo bcadd("-4.27", "7.3")."\n";
14+
echo bcadd("-4.27", "-7.3");
1215
?>
1316
--EXPECT--
1417
6.50
18+
6.50
19+
-5.1
1520
-5.1
1621
3.03000
22+
-11.57000
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
--TEST--
2+
bcadd() with non-numeric values
3+
--SKIPIF--
4+
<?php if(!extension_loaded("bcmath")) print "skip"; ?>
5+
--INI--
6+
bcmath.scale=0
7+
--FILE--
8+
<?php
9+
echo bcadd("eeee", "eeeefff")."\n";
10+
echo bcadd("eeee", "%%%$^&&*(*())")."\n";
11+
echo bcadd("eeee", "~!@@##^*()_")."\n";
12+
?>
13+
--EXPECTF--
14+
Warning: bcadd(): bcmath function argument is not well-formed in %s on line %d
15+
16+
Warning: bcadd(): bcmath function argument is not well-formed in %s on line %d
17+
0
18+
19+
Warning: bcadd(): bcmath function argument is not well-formed in %s on line %d
20+
21+
Warning: bcadd(): bcmath function argument is not well-formed in %s on line %d
22+
0
23+
24+
Warning: bcadd(): bcmath function argument is not well-formed in %s on line %d
25+
26+
Warning: bcadd(): bcmath function argument is not well-formed in %s on line %d
27+
0
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
--TEST--
2+
bcadd() with non-numeric values and numeric values
3+
--SKIPIF--
4+
<?php if(!extension_loaded("bcmath")) print "skip"; ?>
5+
--INI--
6+
bcmath.scale=0
7+
--FILE--
8+
<?php
9+
echo bcadd("eeee", "2")."\n";
10+
echo bcadd("eeee", "-2")."\n";
11+
echo bcadd("2", "%%%$^&&*(*())")."\n";
12+
echo bcadd("-2", "%%%$^&&*(*())")."\n";
13+
echo bcadd("2.1", "~!@@##^*()_")."\n";
14+
echo bcadd("-2.1", "~!@@##^*()_")."\n";
15+
echo bcadd("~!@@##^*()_", "2.1")."\n";
16+
echo bcadd("~!@@##^*()_", "-2.1")."\n";
17+
?>
18+
--EXPECTF--
19+
Warning: bcadd(): bcmath function argument is not well-formed in %s on line %d
20+
2
21+
22+
Warning: bcadd(): bcmath function argument is not well-formed in %s on line %d
23+
-2
24+
25+
Warning: bcadd(): bcmath function argument is not well-formed in %s on line %d
26+
2
27+
28+
Warning: bcadd(): bcmath function argument is not well-formed in %s on line %d
29+
-2
30+
31+
Warning: bcadd(): bcmath function argument is not well-formed in %s on line %d
32+
2
33+
34+
Warning: bcadd(): bcmath function argument is not well-formed in %s on line %d
35+
-2
36+
37+
Warning: bcadd(): bcmath function argument is not well-formed in %s on line %d
38+
2
39+
40+
Warning: bcadd(): bcmath function argument is not well-formed in %s on line %d
41+
-2

ext/bcmath/tests/bccomp_variation002.phpt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,15 @@ bcmath.scale=0
88
<?php
99
echo bccomp("-2", "-2")."\n";
1010
echo bccomp("-2", "2", "1")."\n";
11-
echo bccomp("-2.29", "-2.3", "2");
11+
echo bccomp("-2.29", "-2.3", "2")."\n";
12+
echo bccomp("-2.29", "2.3", "2")."\n";
13+
echo bccomp("2.29", "-2.3", "2")."\n";
14+
echo bccomp("-2.29", "-2.3", "1");
1215
?>
1316
--EXPECT--
1417
0
1518
-1
1619
1
20+
-1
21+
1
22+
1
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
--TEST--
2+
bccomp() with non-numeric values
3+
--SKIPIF--
4+
<?php if(!extension_loaded("bcmath")) print "skip"; ?>
5+
--INI--
6+
bcmath.scale=0
7+
--FILE--
8+
<?php
9+
echo bccomp("ssssssssss2", "!@@#$%^&*(()")."\n";
10+
echo bccomp("1@#$%%%^&*", "!@@#$%^&*(()")."\n";
11+
echo bccomp("!@#$%^&*()_+", "!@@#$%^&*(()")."\n";
12+
?>
13+
--EXPECTF--
14+
Warning: bccomp(): bcmath function argument is not well-formed in %s on line %d
15+
16+
Warning: bccomp(): bcmath function argument is not well-formed in %s on line %d
17+
0
18+
19+
Warning: bccomp(): bcmath function argument is not well-formed in %s on line %d
20+
21+
Warning: bccomp(): bcmath function argument is not well-formed in %s on line %d
22+
0
23+
24+
Warning: bccomp(): bcmath function argument is not well-formed in %s on line %d
25+
26+
Warning: bccomp(): bcmath function argument is not well-formed in %s on line %d
27+
0
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
--TEST--
2+
bccomp() with non-numeric values and numeric values
3+
--SKIPIF--
4+
<?php if(!extension_loaded("bcmath")) print "skip"; ?>
5+
--INI--
6+
bcmath.scale=0
7+
--FILE--
8+
<?php
9+
echo bccomp("2", "!@@#$%^&*(()")."\n";
10+
echo bccomp("!@@#$%^&*(()", "2")."\n";
11+
echo bccomp("!@@#$%^&*(()", "-2")."\n";
12+
echo bccomp("1@#$%%%^&*", "2.1")."\n";
13+
echo bccomp("-2.1", "1@#$%%%^&*")."\n";
14+
?>
15+
--EXPECTF--
16+
Warning: bccomp(): bcmath function argument is not well-formed in %s on line %d
17+
1
18+
19+
Warning: bccomp(): bcmath function argument is not well-formed in %s on line %d
20+
-1
21+
22+
Warning: bccomp(): bcmath function argument is not well-formed in %s on line %d
23+
1
24+
25+
Warning: bccomp(): bcmath function argument is not well-formed in %s on line %d
26+
-1
27+
28+
Warning: bccomp(): bcmath function argument is not well-formed in %s on line %d
29+
-1

0 commit comments

Comments
 (0)