Properly check if attributes with AsEnumArrayObject or AsEnumCollecti…

…on cast are dirty (#46561)
laravel · Mar 24, 2023 · 5fbbd7e · 5fbbd7e
1 parent 237b242
commit 5fbbd7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
@@ -17,6 +17,8 @@
 use Illuminate\Database\Eloquent\Casts\AsCollection;
 use Illuminate\Database\Eloquent\Casts\AsEncryptedArrayObject;
 use Illuminate\Database\Eloquent\Casts\AsEncryptedCollection;
+use Illuminate\Database\Eloquent\Casts\AsEnumArrayObject;
+use Illuminate\Database\Eloquent\Casts\AsEnumCollection;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\InvalidCastException;
 use Illuminate\Database\Eloquent\JsonEncodingException;
@@ -2042,6 +2044,8 @@ public function originalIsEquivalent($key)
                 $this->castAttribute($key, $original);
         } elseif ($this->isClassCastable($key) && in_array($this->getCasts()[$key], [AsArrayObject::class, AsCollection::class])) {
             return $this->fromJson($attribute) === $this->fromJson($original);
+        } elseif ($this->isClassCastable($key) && Str::startsWith($this->getCasts()[$key], [AsEnumArrayObject::class, AsEnumCollection::class])) {
+            return $this->fromJson($attribute) === $this->fromJson($original);
         } elseif ($this->isClassCastable($key) && $original !== null && in_array($this->getCasts()[$key], [AsEncryptedArrayObject::class, AsEncryptedCollection::class])) {
             return $this->fromEncryptedString($attribute) === $this->fromEncryptedString($original);
         }

diff --git a/tests/Database/DatabaseEloquentModelTest.php b/tests/Database/DatabaseEloquentModelTest.php
@@ -314,7 +314,7 @@ public function testDirtyOnEnumCollectionObject()
     {
         $model = new EloquentModelCastingStub;
         $model->setRawAttributes([
-            'asEnumCollectionAttribute' => json_encode(['draft', 'pending']),
+            'asEnumCollectionAttribute' => '["draft", "pending"]',
         ]);
         $model->syncOriginal();
 
@@ -335,7 +335,7 @@ public function testDirtyOnEnumArrayObject()
     {
         $model = new EloquentModelCastingStub;
         $model->setRawAttributes([
-            'asEnumArrayObjectAttribute' => json_encode(['draft', 'pending']),
+            'asEnumArrayObjectAttribute' => '["draft", "pending"]',
         ]);
         $model->syncOriginal();