Add macro check when populate relations

greabock · Jul 15, 2021 · 04bba38 · 04bba38
1 parent cf2dbf7
commit 04bba38
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/src/Populator.php b/src/Populator.php
@@ -126,14 +126,7 @@ protected function fillRelations(Model $model, array $data): void
 
             $relation = Str::camel($relation);
 
-            if (method_exists($model, $relation) && call_user_func([$model, $relation]) instanceof Relation) {
-
-//                if (is_string($relationData) || is_bool($relationData)) {
-//                    dump(get_class($model));
-//                    dump($relation);
-//                    dump($relationData);
-//                    dd();
-//                }
+            if ((method_exists($model, $relation) || $model::hasMacro($relation)) && $model->$relation() instanceof Relation) {
 
                 $this->populateRelation($model, $relation, $relationData);
             }