Apply syncOriginal for dirty state tracking

composer.json

@@ -25,7 +25,7 @@
     },
     "require": {
         "php": "^8.0",
-        "statamic/cms": "^4.48"
+        "statamic/cms": "^4.51"
     },
     "require-dev": {
         "doctrine/dbal": "^3.3",

src/Assets/Asset.php

@@ -7,13 +7,26 @@
 use Statamic\Assets\Asset as FileAsset;
 use Statamic\Assets\AssetUploader as Uploader;
 use Statamic\Contracts\Assets\Asset as AssetContract;
+use Statamic\Data\HasDirtyState;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Path;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
 class Asset extends FileAsset
 {
+    use HasDirtyState {
+        syncOriginal as traitSyncOriginal;
+    }
+
+    public function syncOriginal()
+    {
+        // FileAsset overrides the trait method in order to add the "pending
+        // data" logic. We don't need it here since everything comes from
+        // the model so we'll just use the original trait method again.
+        return $this->traitSyncOriginal();
+    }
+
     protected $existsOnDisk = false;
     protected $removedData = [];
 
@@ -22,7 +35,8 @@ public static function fromModel(Model $model)
         return (new static())
             ->container($model->container)
             ->path(Str::replace('//', '/', $model->folder.'/'.$model->basename))
-            ->hydrateMeta($model->meta);
+            ->hydrateMeta($model->meta)
+            ->syncOriginal();
     }
 
     public function meta($key = null)

src/Entries/Entry.php

@@ -36,7 +36,7 @@ public static function fromModel(Model $model)
             }
         }
 
-        return $entry;
+        return $entry->syncOriginal();
     }
 
     public function toModel()

src/Taxonomies/Term.php

@@ -35,14 +35,13 @@ public static function fromModel(Model $model)
             unset($data['collection']);
         }
 
-        $term->syncOriginal();
         $term->data($data);
 
         if (config('statamic.system.track_last_update')) {
             $term->set('updated_at', $model->updated_at ?? $model->created_at);
         }
 
-        return $term;
+        return $term->syncOriginal();
     }
 
     public function toModel()

tests/Data/Entries/EntryQueryBuilderTest.php

@@ -39,7 +39,7 @@ public function entry_is_found_within_all_created_entries_using_entry_facade_wit
     public function entry_is_found_within_all_created_entries_and_select_query_columns_are_set_using_entry_facade_with_find_method_with_columns_param()
     {
         $searchedEntry = $this->createDummyCollectionAndEntries();
-        $columns = ['title'];
+        $columns = ['foo', 'collection'];
         $retrievedEntry = Entry::query()->find($searchedEntry->id(), $columns);
 
         $retrievedEntry->model(null);

tests/Entries/EntryTest.php

@@ -19,7 +19,10 @@ class EntryTest extends TestCase
     /** @test */
     public function it_loads_from_entry_model()
     {
+        Collection::make('blog')->title('blog')->save();
+
         $model = new EntryModel([
+            'collection' => 'blog',
             'slug' => 'the-slug',
             'data' => [
                 'foo' => 'bar',