[8.x] Make use of specified ownerKey in MorphTo::associate() (attempt #2

) (#36303) * Check ownerKey first, before defaulting to getKeyName. * Fix tests for fetching ownerKey.
laravel · Feb 17, 2021 · 16ab323 · 16ab323
1 parent 918db60
commit 16ab323
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphTo.php b/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
@@ -226,7 +226,7 @@ protected function matchToMorphParents($type, Collection $results)
     public function associate($model)
     {
         $this->parent->setAttribute(
-            $this->foreignKey, $model instanceof Model ? $model->getKey() : null
+            $this->foreignKey, $model instanceof Model ? $model->{$this->ownerKey ?: $model->getKeyName()} : null
         );
 
         $this->parent->setAttribute(

diff --git a/tests/Database/DatabaseEloquentMorphToTest.php b/tests/Database/DatabaseEloquentMorphToTest.php
@@ -132,7 +132,7 @@ public function testAssociateMethodSetsForeignKeyAndTypeOnModel()
         $relation = $this->getRelationAssociate($parent);
 
         $associate = m::mock(Model::class);
-        $associate->shouldReceive('getKey')->once()->andReturn(1);
+        $associate->shouldReceive('getAttribute')->once()->andReturn(1);
         $associate->shouldReceive('getMorphClass')->once()->andReturn('Model');
 
         $parent->shouldReceive('setAttribute')->once()->with('foreign_key', 1);