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

Jump to bottom

[8.x] Fix getDirty method when using AsArrayObject / AsCollection #38869

Merged
merged 6 commits into from
Sep 22, 2021
Merged

[8.x] Fix getDirty method when using AsArrayObject / AsCollection #38869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15d6468
Add failing tests
gdebrauwer Sep 19, 2021
88d0b0d
Fix casts
gdebrauwer Sep 19, 2021
c3fd578
Fix originalIsEquivalent method
gdebrauwer Sep 19, 2021
306c2d0
Fix linting issue
gdebrauwer Sep 19, 2021
e0d9404
Compare json values without recasting
gdebrauwer Sep 22, 2021
1c4855a
Revert cast changes
gdebrauwer Sep 22, 2021
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
4 changes: 4 additions & 0 deletions src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
use Illuminate\Contracts\Database\Eloquent\Castable;
use Illuminate\Contracts\Database\Eloquent\CastsInboundAttributes;
use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Database\Eloquent\Casts\AsArrayObject;
use Illuminate\Database\Eloquent\Casts\AsCollection;
use Illuminate\Database\Eloquent\InvalidCastException;
use Illuminate\Database\Eloquent\JsonEncodingException;
use Illuminate\Database\Eloquent\Relations\Relation;
Expand Down Expand Up @@ -1658,6 +1660,8 @@ public function originalIsEquivalent($key)
} elseif ($this->hasCast($key, static::$primitiveCastTypes)) {
return $this->castAttribute($key, $attribute) ===
$this->castAttribute($key, $original);
} elseif ($this->isClassCastable($key) && in_array($this->getCasts()[$key], [AsArrayObject::class, AsCollection::class])) {
return $this->fromJson($attribute) === $this->fromJson($original);
}

return is_numeric($attribute) && is_numeric($original)
Expand Down
41 changes: 41 additions & 0 deletions tests/Database/DatabaseEloquentModelTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
use Illuminate\Database\ConnectionResolverInterface;
use Illuminate\Database\ConnectionResolverInterface as Resolver;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Casts\ArrayObject;
use Illuminate\Database\Eloquent\Casts\AsArrayObject;
use Illuminate\Database\Eloquent\Casts\AsCollection;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\JsonEncodingException;
use Illuminate\Database\Eloquent\MassAssignmentException;
Expand Down Expand Up @@ -155,6 +158,42 @@ public function testDirtyOnCastedObjects()
$this->assertFalse($model->isDirty('collectionAttribute'));
}

public function testDirtyOnCastedArrayObject()
{
$model = new EloquentModelCastingStub;
$model->setRawAttributes([
'asarrayobjectAttribute' => '{"foo": "bar"}',
]);
$model->syncOriginal();

$this->assertInstanceOf(ArrayObject::class, $model->asarrayobjectAttribute);
$this->assertFalse($model->isDirty('asarrayobjectAttribute'));

$model->asarrayobjectAttribute = ['foo' => 'bar'];
$this->assertFalse($model->isDirty('asarrayobjectAttribute'));

$model->asarrayobjectAttribute = ['foo' => 'baz'];
$this->assertTrue($model->isDirty('asarrayobjectAttribute'));
}

public function testDirtyOnCastedCollection()
{
$model = new EloquentModelCastingStub;
$model->setRawAttributes([
'ascollectionAttribute' => '{"foo": "bar"}',
]);
$model->syncOriginal();

$this->assertInstanceOf(BaseCollection::class, $model->ascollectionAttribute);
$this->assertFalse($model->isDirty('ascollectionAttribute'));

$model->ascollectionAttribute = ['foo' => 'bar'];
$this->assertFalse($model->isDirty('ascollectionAttribute'));

$model->ascollectionAttribute = ['foo' => 'baz'];
$this->assertTrue($model->isDirty('ascollectionAttribute'));
}

public function testCleanAttributes()
{
$model = new EloquentModelStub(['foo' => '1', 'bar' => 2, 'baz' => 3]);
Expand Down Expand Up @@ -2570,6 +2609,8 @@ class EloquentModelCastingStub extends Model
'dateAttribute' => 'date',
'datetimeAttribute' => 'datetime',
'timestampAttribute' => 'timestamp',
'asarrayobjectAttribute' => AsArrayObject::class,
'ascollectionAttribute' => AsCollection::class,
];

public function jsonAttributeValue()
Expand Down