FIX Improve rounding logic for storing of long decimal numbers (#10593)

Co-authored-by: Michal Kleiner <michal.kleiner@cub3.com>
This commit is contained in:
Michal Kleiner 2022-11-29 15:07:56 +13:00 committed by GitHub
parent f57a77dcdd
commit b107622400
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 3 deletions

View File

@ -126,7 +126,7 @@ class DBDecimal extends DBField
return 0;
}
if (ctype_digit((string) $value)) {
if (abs((float) $value - (int) $value) < PHP_FLOAT_EPSILON) {
return (int)$value;
}

View File

@ -61,6 +61,35 @@ class DecimalTest extends SapphireTest
);
}
public function testLongValueStoredCorrectly()
{
$this->assertEquals(
$this->testDataObject->MyDecimal5,
1.0,
'Long default long decimal value is rounded correctly'
);
$this->assertEqualsWithDelta(
$this->testDataObject->MyDecimal5,
0.99999999999999999999,
PHP_FLOAT_EPSILON,
'Long default long decimal value is correct within float epsilon'
);
$this->assertEquals(
$this->testDataObject->MyDecimal6,
8.0,
'Long decimal value with a default value is rounded correctly'
);
$this->assertEqualsWithDelta(
$this->testDataObject->MyDecimal6,
7.99999999999999999999,
PHP_FLOAT_EPSILON,
'Long decimal value is within epsilon if longer than allowed number of float digits'
);
}
public function testScaffoldFormField()
{
/** @var DBDecimal $decimal */

View File

@ -14,10 +14,13 @@ class TestObject extends DataObject implements TestOnly
'MyDecimal1' => 'Decimal',
'MyDecimal2' => 'Decimal(5,3,2.5)',
'MyDecimal3' => 'Decimal(4,2,"Invalid default value")',
'MyDecimal4' => 'Decimal'
'MyDecimal4' => 'Decimal',
'MyDecimal5' => 'Decimal(20,18,0.99999999999999999999)',
'MyDecimal6' => 'Decimal',
];
private static $defaults = [
'MyDecimal4' => 4
'MyDecimal4' => 4,
'MyDecimal6' => 7.99999999999999999999,
];
}