Merge 5.4 into 5.x (#3434)

Author: mongodb-php-bot

src/Eloquent/Builder.php

@@ -325,6 +325,10 @@ protected function addUpdatedAtColumn(array $values)
         }
 
         $column = $this->model->getUpdatedAtColumn();
+        if (isset($values['$set'][$column])) {
+            return $values;
+        }
+
         $values = array_replace(
             [$column => $this->model->freshTimestampString()],
             $values,

tests/ModelTest.php

@@ -169,6 +169,21 @@ public function testUpdate(): void
         $this->assertEquals('Hans Thomas', $check->fullname);
     }
 
+    public function testUpdateTroughSetUpdatedAt(): void
+    {
+        $user        = new User();
+        $user->name  = 'John Doe';
+        $user->title = 'admin';
+        $user->age   = 35;
+        $user->save();
+
+        $updatedAt = Carbon::yesterday();
+        User::query()->update(['$set' => ['updated_at' => new UTCDateTime($updatedAt)]]);
+
+        $user->refresh();
+        $this->assertEquals($updatedAt, $user->updated_at);
+    }
+
     public function testUpsert()
     {
         $result = User::upsert([