Merge pull request #2590 from yajra/patch1

yajra · web-flow · commit d90bfaee242d · 2021-03-23T09:29:34.000+08:00
Add method exists check taken from #2587.
diff --git a/src/EloquentDataTable.php b/src/EloquentDataTable.php
@@ -134,7 +134,8 @@ protected function isMorphRelation($relation)
         if ($relation !== null && $relation !== '') {
             $relationParts = explode('.', $relation);
             $firstRelation = array_shift($relationParts);
-            $isMorph       = $this->query->getModel()->$firstRelation() instanceof MorphTo;
+            $model         = $this->query->getModel();
+            $isMorph       = method_exists($model, $firstRelation) && $model->$firstRelation() instanceof MorphTo;
         }
 
         return $isMorph;

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,8 @@ protected function isMorphRelation($relation)`
`134`	`134`	`if ($relation !== null && $relation !== '') {`
`135`	`135`	`$relationParts = explode('.', $relation);`
`136`	`136`	`$firstRelation = array_shift($relationParts);`
`137`		`- $isMorph = $this->query->getModel()->$firstRelation() instanceof MorphTo;`
	`137`	`+ $model = $this->query->getModel();`
	`138`	`+ $isMorph = method_exists($model, $firstRelation) && $model->$firstRelation() instanceof MorphTo;`
`138`	`139`	`}`
`139`	`140`
`140`	`141`	`return $isMorph;`