Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ PHP NEWS

- BcMath:
. Fixed bug GH-17049 (Correctly compare 0 and -0). (Saki Takamachi)
. Fixed bug GH-17061 (Now Number::round() does not remove trailing zeros).
(Saki Takamachi)

- Iconv:
. Fixed bug GH-17047 (UAF on iconv filter failure). (nielsdos)
Expand Down
2 changes: 0 additions & 2 deletions ext/bcmath/bcmath.c
Original file line number Diff line number Diff line change
Expand Up @@ -1801,8 +1801,6 @@ PHP_METHOD(BcMath_Number, round)
bc_num ret = NULL;
bc_round(intern->num, precision, rounding_mode, &ret);

bc_rm_trailing_zeros(ret);

bcmath_number_obj_t *new_intern = bcmath_number_new_obj(ret, ret->n_scale);
RETURN_OBJ(&new_intern->std);
}
Expand Down
72 changes: 72 additions & 0 deletions ext/bcmath/tests/number/methods/round_has_trailing_zeros.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
--TEST--
BcMath\Number round() - has trailing zeros
--EXTENSIONS--
bcmath
--FILE--
<?php
foreach (RoundingMode::cases() as $mode) {
echo "========== {$mode->name} ==========\n";
foreach ([
['0.00', 1],
['0.1', 5],
['-0.300', 5],
['1.995', 2],
] as [$value, $precision]) {
$number = new BcMath\Number($value);
$output = 'value is ';
$output .= str_pad($value, 6, ' ', STR_PAD_RIGHT) . ', ';
$output .= "precision is {$precision}: ";
$output .= $number->round($precision, $mode) . "\n";
echo $output;
}
echo "\n";
}
?>
--EXPECT--
========== HalfAwayFromZero ==========
value is 0.00 , precision is 1: 0.0
value is 0.1 , precision is 5: 0.10000
value is -0.300, precision is 5: -0.30000
value is 1.995 , precision is 2: 2.00

========== HalfTowardsZero ==========
value is 0.00 , precision is 1: 0.0
value is 0.1 , precision is 5: 0.10000
value is -0.300, precision is 5: -0.30000
value is 1.995 , precision is 2: 1.99

========== HalfEven ==========
value is 0.00 , precision is 1: 0.0
value is 0.1 , precision is 5: 0.10000
value is -0.300, precision is 5: -0.30000
value is 1.995 , precision is 2: 2.00

========== HalfOdd ==========
value is 0.00 , precision is 1: 0.0
value is 0.1 , precision is 5: 0.10000
value is -0.300, precision is 5: -0.30000
value is 1.995 , precision is 2: 1.99

========== TowardsZero ==========
value is 0.00 , precision is 1: 0.0
value is 0.1 , precision is 5: 0.10000
value is -0.300, precision is 5: -0.30000
value is 1.995 , precision is 2: 1.99

========== AwayFromZero ==========
value is 0.00 , precision is 1: 0.0
value is 0.1 , precision is 5: 0.10000
value is -0.300, precision is 5: -0.30000
value is 1.995 , precision is 2: 2.00

========== NegativeInfinity ==========
value is 0.00 , precision is 1: 0.0
value is 0.1 , precision is 5: 0.10000
value is -0.300, precision is 5: -0.30000
value is 1.995 , precision is 2: 1.99

========== PositiveInfinity ==========
value is 0.00 , precision is 1: 0.0
value is 0.1 , precision is 5: 0.10000
value is -0.300, precision is 5: -0.30000
value is 1.995 , precision is 2: 2.00
Loading