assert Model type in Reference::getTheirFieldName

atk4 · May 27, 2022 · 53e9746 · 53e9746
1 parent dc7053c
commit 53e9746
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Reference.php b/src/Reference.php
@@ -128,7 +128,7 @@ final protected function getOurFieldValue(Model $ourEntity)
 
     public function getTheirFieldName(): string
     {
-        return $this->their_field ?? $this->model->id_field;
+        return $this->their_field ?? Model::assertInstanceOf($this->model)->id_field;
     }
 
     protected function onHookToOurModel(Model $model, string $spot, \Closure $fx, array $args = [], int $priority = 5): int

diff --git a/src/Reference/HasOneSql.php b/src/Reference/HasOneSql.php
@@ -115,7 +115,7 @@ public function ref(Model $ourModel, array $defaults = []): Model
         $theirModel = parent::ref($ourModel, $defaults);
         $ourModel = $this->getOurModel($ourModel);
 
-        $theirFieldName = $this->their_field ?? $theirModel->id_field; // TODO why not $this->getTheirFieldName() ?
+        $theirFieldName = $this->their_field ?? $theirModel->id_field; // TODO $this->getTheirFieldName() seems wrong
 
         // At this point the reference
         // if our_field is the id_field and is being used in the reference