Skip to content

Update our override of Laravel's attributesToArray() #223

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

Open
mjauvin wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Update our override of Laravel's attributesToArray() #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcba0f9
stay closer to Laravel model
mjauvin Dec 15, 2025
b52bc00
improve code readability
mjauvin Dec 15, 2025
89a8a36
add unit test for date casts
mjauvin Dec 16, 2025
80ca50f
fix for code quality check
mjauvin Dec 16, 2025
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
50 changes: 4 additions & 46 deletions src/Database/Model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,6 +1174,7 @@ public function hasGetMutator($key)
public function attributesToArray()
{
$attributes = $this->getArrayableAttributes();
$mutatedAttributes = $this->getMutatedAttributes();

/*
* Before Event
Expand All @@ -1184,55 +1185,12 @@ public function attributesToArray()
}
}

/*
* Dates
*/
foreach ($this->getDates() as $key) {
if (!isset($attributes[$key])) {
continue;
}

$attributes[$key] = $this->serializeDate(
$this->asDateTime($attributes[$key])
);
}

/*
* Mutate
*/
$mutatedAttributes = $this->getMutatedAttributes();

foreach ($mutatedAttributes as $key) {
if (!array_key_exists($key, $attributes)) {
continue;
}

$attributes[$key] = $this->mutateAttributeForArray(
$key,
$attributes[$key]
);
}
$attributes = $this->addDateAttributesToArray($attributes);

/*
* Casts
*/
foreach ($this->casts as $key => $value) {
if (
!array_key_exists($key, $attributes) ||
in_array($key, $mutatedAttributes)
) {
continue;
}
$attributes = $this->addMutatedAttributesToArray($attributes, $mutatedAttributes);

$attributes[$key] = $this->castAttribute(
$key,
$attributes[$key]
);
}
$attributes = $this->addCastAttributesToArray($attributes, $mutatedAttributes);

/*
* Appends
*/
foreach ($this->getArrayableAppends() as $key) {
$attributes[$key] = $this->mutateAttributeForArray($key, null);
}
Expand Down
29 changes: 29 additions & 0 deletions tests/Database/ModelTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,35 @@ public function testAddCasts()
$this->assertEquals(['id' => 'int', 'foo' => 'int'], $model->getCasts());
}

public function testAddDatesCasts()
{
$model = new TestModelGuarded();
$model->timestamps = false;

$model->addCasts([
'created_at' => 'date:Y/m/d',
'updated_at' => 'datetime:Y_m_d @ H:i',
'deleted_at' => 'date',
]);

$model->created_at = '2025-10-31 22:50:55';
$model->updated_at = '2025-12-31 23:59:59';
$model->deleted_at = '2026-01-01 12:13:14';

$this->assertInstanceOf(\Winter\Storm\Argon\Argon::class, $model->created_at);
$this->assertInstanceOf(\Winter\Storm\Argon\Argon::class, $model->updated_at);
$this->assertInstanceOf(\Winter\Storm\Argon\Argon::class, $model->deleted_at);

$this->assertEquals(
[
'created_at' => '2025/10/31',
'updated_at' => '2025_12_31 @ 23:59',
'deleted_at' => '2026-01-01T00:00:00.000000Z',
],
$model->attributesToArray()
);
}

public function testStringIsTrimmed()
{
$name = "Name";
Expand Down