Fix scalar type change not detected as dirty in MongoDB models

Co-authored-by: Hamid Alaei <halaei@users.noreply.github.com>
Co-authored-by: divine <divine@users.noreply.github.com>

Author: 3 people

src/Eloquent/DocumentModel.php

@@ -20,6 +20,7 @@
 use Illuminate\Support\Str;
 use MongoDB\BSON\Binary;
 use MongoDB\BSON\Decimal128;
+use MongoDB\BSON\Document;
 use MongoDB\BSON\ObjectID;
 use MongoDB\BSON\Type;
 use MongoDB\BSON\UTCDateTime;
@@ -39,15 +40,13 @@
 use function func_get_args;
 use function in_array;
 use function is_array;
-use function is_numeric;
-use function is_object;
+use function is_scalar;
 use function is_string;
 use function ltrim;
 use function method_exists;
 use function sprintf;
 use function str_contains;
 use function str_starts_with;
-use function strcmp;
 use function strlen;
 use function trigger_error;
 use function var_export;
@@ -393,26 +392,11 @@ public function originalIsEquivalent($key)
             return false;
         }
 
-        if ($this->isDateAttribute($key)) {
-            $attribute = $attribute instanceof UTCDateTime ? $this->asDateTime($attribute) : $attribute;
-            $original  = $original instanceof UTCDateTime ? $this->asDateTime($original) : $original;
-
-            // Comparison on DateTimeInterface values
-            // phpcs:disable SlevomatCodingStandard.Operators.DisallowEqualOperators.DisallowedEqualOperator
-            return $attribute == $original;
-        }
-
-        if ($this->hasCast($key, static::$primitiveCastTypes)) {
-            return $this->castAttribute($key, $attribute) ===
-                $this->castAttribute($key, $original);
-        }
-
-        if ($this->isClassCastable($key)) {
-            return ! is_object($attribute) ? $attribute === $original : $attribute == $original;
+        if (is_scalar($attribute) || is_scalar($original)) {
+            return false;
         }
 
-        return is_numeric($attribute) && is_numeric($original)
-            && strcmp((string) $attribute, (string) $original) === 0;
+        return (string) Document::fromPHP(['v' => $attribute]) === (string) Document::fromPHP(['v' => $original]);
     }
 
     /** @inheritdoc */

tests/ModelTest.php

@@ -1059,7 +1059,9 @@ public function testMultipleLevelDotNotation(): void
     public function testGetDirtyDates(): void
     {
         $user = new User();
-        $user->setRawAttributes(['name' => 'John Doe', 'birthday' => new DateTime('19 august 1989')], true);
+        $user->name = 'John Doe';
+        $user->birthday = new DateTime('19 august 1989');
+        $user->syncOriginal();
         $this->assertEmpty($user->getDirty());
 
         $user->birthday = new DateTime('19 august 1989');
@@ -1082,6 +1084,42 @@ public function testGetDirtyObjects(): void
         $this->assertEmpty($user->getDirty());
     }
 
+    public function testGetDirtyScalarTypeChange(): void
+    {
+        // Changing a scalar value from one type to another must be considered dirty
+        // because MongoDB stores types as-is (int 1 and string '1' are different).
+        $user = new User();
+        $user->name = 'John Doe';
+        $user->age = 25;
+        $user->syncOriginal();
+
+        $this->assertEmpty($user->getDirty());
+
+        // Same value, same type: not dirty
+        $user->age = 25;
+        $this->assertEmpty($user->getDirty());
+
+        // Same numeric value, different type: dirty
+        $user->age = '25';
+        $this->assertTrue($user->isDirty('age'));
+    }
+
+    public function testGetDirtyEmbeddedDocument(): void
+    {
+        $user = User::create(['name' => 'John Doe', 'address' => ['city' => 'Paris', 'country' => 'France']]);
+
+        $user = User::find($user->id);
+        $this->assertFalse($user->isDirty());
+
+        // Setting the same array value: not dirty
+        $user->address = ['city' => 'Paris', 'country' => 'France'];
+        $this->assertFalse($user->isDirty());
+
+        // Changing a nested value: dirty
+        $user->address = ['city' => 'Lyon', 'country' => 'France'];
+        $this->assertTrue($user->isDirty('address'));
+    }
+
     public function testChunkById(): void
     {
         User::create(['name' => 'fork', 'tags' => ['sharp', 'pointy']]);