tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '4.11' into 4.12-release

This commit is contained in:
Guy Sartorelli 2022-11-30 10:54:02 +13:00
parent cb76f312a4 b107622400
commit 8bb712a461
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
4 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ORM/FieldType/DBDecimal.php
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;
}

2
src/View/SSViewer_DataPresenter.php
View File

@ -355,7 +355,7 @@ class SSViewer_DataPresenter extends SSViewer_Scope
// Check if the method to-be-called exists on the target object - if so, don't check any further
// injection locations
$on = $this->itemIterator ? $this->itemIterator->current() : $this->item;
if (isset($on->$property) || method_exists($on, $property ?? '')) {
if ($on && (isset($on->$property) || method_exists($on, $property ?? ''))) {
return null;
}

29
tests/php/ORM/DecimalTest.php
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 */

7
tests/php/ORM/DecimalTest/TestObject.php
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,
];
}