fix: wrong version contents with cast attributes.

Author: overtrue

src/Version.php

@@ -114,6 +114,7 @@ public function revert(): bool
     public function revertWithoutSaving(): ?Model
     {
         $original = $this->versionable->getRawOriginal();
+
         switch ($this->versionable->getVersionStrategy()) {
             case VersionStrategy::DIFF:
                 // v1 + ... + vN

src/Versionable.php

@@ -68,6 +68,9 @@ function (Model $model) {
      */
     public function createVersion(array $replacements = [], $time = null): ?Version
     {
+        // get unsaved versionable attributes
+        $replacements = array_merge($this->getDirty(), $replacements);
+
         if ($this->shouldBeVersioning() || ! empty($replacements)) {
             return tap(Version::createForModel($this, $replacements, $time), function () {
                 $this->removeOldVersions($this->getKeepVersionsCount());
@@ -240,14 +243,18 @@ public function getVersionableAttributes(VersionStrategy $strategy, array $repla
     {
         $versionable = $this->getVersionable();
         $dontVersionable = $this->getDontVersionable();
+        $refreshedModel = static::query()->withoutGlobalScopes()->findOrFail($this->getKey());
 
-        $attributes = match ($strategy) {
-            VersionStrategy::DIFF => $this->getDirty(),
+        $keys = match ($strategy) {
+            VersionStrategy::DIFF => array_keys($this->getDirty()),
             // To avoid some attributes are empty (not sync to database)
             // we should get the latest version from database.
-            VersionStrategy::SNAPSHOT => $this->newQueryWithoutScopes()->find($this->getKey())?->attributesToArray() ?? [],
+            VersionStrategy::SNAPSHOT => array_keys($refreshedModel?->attributesToArray() ?? []),
         };
 
+        // get the original attributes to avoid the attributes that are castable.
+        $attributes = Arr::only($refreshedModel->getRawOriginal(), $keys);
+
         if (count($versionable) > 0) {
             $attributes = Arr::only($attributes, $versionable);
         }

tests/FeatureTest.php

@@ -31,11 +31,20 @@ protected function setUp(): void
      */
     public function versions_can_be_created()
     {
-        $post = Post::create(['title' => 'version1', 'content' => 'version1 content']);
+        $post = Post::create(['title' => 'version1', 'content' => 'version1 content', 'extends' => ['foo' => 'bar']]);
 
         $this->assertCount(1, $post->versions);
         $this->assertDatabaseCount('versions', 1);
 
+        $version = $post->lastVersion;
+
+        $this->assertSame($post->title, $version->contents['title']);
+        $this->assertSame($post->content, $version->contents['content']);
+
+        // json cast
+        $this->assertIsString($version->contents['extends']);
+        $this->assertSame($post->getRawOriginal('extends'), $version->contents['extends']);
+
         // version2
         $post->update(['title' => 'version2']);
         $post->refresh();
@@ -119,29 +128,35 @@ public function it_can_create_version_with_snapshot_strategy()
     public function it_can_revert_to_target_version()
     {
         $post = Post::create(['title' => 'version1', 'content' => 'version1 content']);
-        $post->update(['title' => 'version2', 'extends' => ['foo' => 'bar']]);
+        $post->update(['title' => 'version2', 'extends' => ['foo2' => 'bar2']]);
         $post->update(['title' => 'version3', 'content' => 'version3 content', 'extends' => ['name' => 'overtrue']]);
         $post->update(['title' => 'version4', 'content' => 'version4 content']);
 
         // #29
-        $version = $post->firstVersion;
-        $post = $version->revertWithoutSaving();
+        $version1 = $post->firstVersion;
+        $post = $version1->revertWithoutSaving();
 
         $this->assertSame('version1', $post->title);
         $this->assertSame('version1 content', $post->content);
         $this->assertNull($post->extends);
 
         $post->refresh();
 
+
+        $version2 = $post->firstVersion->nextVersion();
+        $this->assertSame('version2', $version2->contents['title']);
+        // only title updated
+        $this->assertNull($version2->contents['content'] ?? null);
+        $this->assertSame(json_encode(['foo2' => 'bar2']), $version2->contents['extends']);
+
         // revert version 2
         $post->revertToVersion($post->firstVersion->nextVersion()->id);
         $post->refresh();
 
         // only title updated
         $this->assertSame('version2', $post->title);
         $this->assertSame('version4 content', $post->content);
-
-        $this->assertSame(['foo' => 'bar'], $post->extends);
+        $this->assertSame(['foo2' => 'bar2'], $post->extends);
 
         // revert version 3
         $post->revertToVersion(3);