php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Now Number::round() does not remove trailing zeros (#17063)

Browse Source 
Fixes #17061
Closes #17063
This commit is contained in:
Saki Takamachi
2024-12-07 02:00:04 +09:00
parent 063c3c8522
commit b88dcc9f3e
3 changed files with 74 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -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)

2
ext/bcmath/bcmath.c
View File

@@ -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);
}

72
ext/bcmath/tests/number/methods/round_has_trailing_zeros.phpt Normal file
View File

@@ -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