Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[9.x] Fix decimal cast precision issue #45456

Merged
merged 2 commits into from
Dec 30, 2022
Merged

[9.x] Fix decimal cast precision issue #45456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01b0838
add failing test for decimal precision
timacdonald Dec 29, 2022
8342b8b
fix decimal cast precision with manual string manipulation
timacdonald Dec 29, 2022
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
11 changes: 10 additions & 1 deletion src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
use ReflectionClass;
use ReflectionMethod;
use ReflectionNamedType;
use TypeError;

trait HasAttributes
{
Expand Down Expand Up @@ -1318,7 +1319,15 @@ public function fromFloat($value)
*/
protected function asDecimal($value, $decimals)
{
return number_format($value, $decimals, '.', '');
$value = (string) $value;

if (! is_numeric($value)) {
throw new TypeError('$value must be numeric.');
}

[$int, $fraction] = explode('.', $value) + [1 => ''];

return $int.'.'.Str::of($fraction)->limit($decimals, '')->padLeft($decimals, '0');
}

/**
Expand Down
62 changes: 62 additions & 0 deletions tests/Integration/Database/EloquentModelDecimalCastingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Illuminate\Tests\Integration\Database\DatabaseTestCase;
use TypeError;

class EloquentModelDecimalCastingTest extends DatabaseTestCase
{
Expand All @@ -18,6 +19,67 @@ protected function defineDatabaseMigrationsAfterDatabaseRefreshed()
});
}

public function testItThrowsOnNonNumericValues()
{
$model = new class extends Model {
public $timestamps = false;

protected $casts = [
'amount' => 'decimal:20',
];
};
$model->amount = 'foo';

$this->expectException(TypeError::class);

$model->amount;
}

public function testItHandlesLargeNumbers()
{
$model = new class extends Model {
public $timestamps = false;

protected $casts = [
'amount' => 'decimal:20',
];
};

$model->amount = '0.89898989898989898989';
$this->assertSame('0.89898989898989898989', $model->amount);

$model->amount = '89898989898989898989';
$this->assertSame('89898989898989898989.00000000000000000000', $model->amount);
}

public function testItTrimsLongValues()
{
$model = new class extends Model {
public $timestamps = false;

protected $casts = [
'amount' => 'decimal:20',
];
};

$model->amount = '0.89898989898989898989898989898989898989898989';
$this->assertSame('0.89898989898989898989', $model->amount);
}

public function testItDoesntRoundNumbers()
{
$model = new class extends Model {
public $timestamps = false;

protected $casts = [
'amount' => 'decimal:1',
];
};

$model->amount = '0.99';
$this->assertSame('0.9', $model->amount);
}

public function testDecimalsAreCastable()
{
$user = TestModel1::create([
Expand Down