fix: incorrect columns qualification in whereMorphedTo

Author: EriBloo

src/Contracts/Snapshot.php

@@ -17,7 +17,7 @@ public function subject(): MorphTo;
     /**
      * Returns subject model filled with snapshotted attributes.
      *
-     * @param bool $fillExcludedAttributes if true excluded attributes will be filled with subjects current values
+     * @param  bool  $fillExcludedAttributes if true excluded attributes will be filled with subjects current values
      */
     public function toModel(bool $fillExcludedAttributes = false): Model;
 

src/Models/Snapshot.php

@@ -66,7 +66,7 @@ public function toModel(bool $fillExcludedAttributes = false): Model
         if ($fillExcludedAttributes) {
             /** @var Model $model */
             $model = ($this->relationLoaded('subject')
-                ? $this->getRelation('subject') : $this->subject()->firstOrFail()
+            ? $this->getRelation('subject') : $this->subject()->firstOrFail()
             )->replicate();
         } else {
             /** @var Model $model */
@@ -87,7 +87,7 @@ public function revert(): Model
             $model->save();
 
             $this->newQuery()
-                ->whereMorphedTo($this->subject(), $model->getMorphClass())
+                ->where($this->subject()->getMorphType(), $model->getMorphClass())
                 ->where(self::CREATED_AT, '>', $this->getAttribute(self::CREATED_AT))
                 ->each(function (self $snapshot) {
                     $snapshot->delete();
@@ -106,13 +106,13 @@ public function branch(): Model
         /** @var Model $model */
         $model = DB::transaction(function () {
             $model = ($this->relationLoaded('subject')
-                ? $this->getRelation('subject') : $this->subject()->firstOrFail()
+            ? $this->getRelation('subject') : $this->subject()->firstOrFail()
             )->replicate();
             $model->setRawAttributes($this->getAttribute('stored_attributes'));
             $model->save();
 
             $this->newQuery()
-                ->whereMorphedTo($this->subject(), $model->getMorphClass())
+                ->where($this->subject()->getMorphType(), $model->getMorphClass())
                 ->where(self::CREATED_AT, '<=', $this->getAttribute(self::CREATED_AT))
                 ->each(function (self $snapshot) use ($model) {
                     $replicate = $snapshot->replicate();
@@ -131,7 +131,7 @@ public function branch(): Model
     public function fork(): Model
     {
         $model = ($this->relationLoaded('subject')
-            ? $this->getRelation('subject') : $this->subject()->firstOrFail()
+        ? $this->getRelation('subject') : $this->subject()->firstOrFail()
         )->replicate();
         $model->setRawAttributes($this->getAttribute('stored_attributes'));
         $model->save();

src/Snapshotter.php

@@ -70,7 +70,8 @@ protected function setSnapshotVersion(): void
         $latestSnapshot = $this->getLatestSnapshot();
         $versionist = $this->options->versionist;
 
-        if ($latestSnapshot
+        if (
+            $latestSnapshot
             && ($previous = data_get($latestSnapshot->getAttribute('options'), 'versionist')) !== $versionist::class
         ) {
             throw IncompatibleVersionist::make(
@@ -95,7 +96,8 @@ protected function getLatestSnapshot(): SnapshotContract|null
         /** @var SnapshotContract|null $snapshot */
         $snapshot = $this->snapshot
             ->newQuery()
-            ->whereMorphedTo($this->snapshot->subject(), $this->model->getMorphClass())
+            ->where($this->snapshot->subject()->getMorphType(), $this->model->getMorphClass())
+            ->where($this->snapshot->subject()->getForeignKeyName(), $this->model->getKey())
             ->latest()
             ->first();
 
@@ -107,7 +109,7 @@ protected function findMatchingSnapshot(): SnapshotContract|null
         /** @var SnapshotContract|null $snapshot */
         $snapshot = $this->snapshot
             ->newQuery()
-            ->whereMorphedTo($this->snapshot->subject(), $this->model->getMorphClass())
+            ->where($this->snapshot->subject()->getMorphType(), $this->model->getMorphClass())
             ->where('stored_attributes', $this->snapshot->getAttribute('stored_attributes'))
             ->first();