Merge branch '7.x'

GrahamCampbell · GrahamCampbell · commit ef7c4209c4ac · 2020-06-03T01:06:08.000+01:00
diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphToMany.php b/src/Illuminate/Database/Eloquent/Relations/MorphToMany.php
@@ -123,8 +123,10 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,
     protected function getCurrentlyAttachedPivots()
     {
         return parent::getCurrentlyAttachedPivots()->map(function ($record) {
-            return $record->setMorphType($this->morphType)
-                          ->setMorphClass($this->morphClass);
+            return $record instanceof MorphPivot
+                            ? $record->setMorphType($this->morphType)
+                                     ->setMorphClass($this->morphClass)
+                            : $record;
         });
     }
 

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,10 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,`
`123`	`123`	`protected function getCurrentlyAttachedPivots()`
`124`	`124`	`{`
`125`	`125`	`return parent::getCurrentlyAttachedPivots()->map(function ($record) {`
`126`		`- return $record->setMorphType($this->morphType)`
`127`		`- ->setMorphClass($this->morphClass);`
	`126`	`+ return $record instanceof MorphPivot`
	`127`	`+ ? $record->setMorphType($this->morphType)`
	`128`	`+ ->setMorphClass($this->morphClass)`
	`129`	`+ : $record;`
`128`	`130`	`});`
`129`	`131`	`}`
`130`	`132`