added the ability to use resolveRelationUsing and still use the package

laravel-json-api · Jun 26, 2024 · 12c4116 · 12c4116
1 parent a448802
commit 12c4116
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/src/Fields/Relations/BelongsTo.php b/src/Fields/Relations/BelongsTo.php
@@ -58,7 +58,7 @@ public function fill(Model $model, ?array $identifier): void
     {
         $name = $this->relationName();
 
-        assert(method_exists($model, $name), sprintf(
+        assert(method_exists($model, $name)  || $model->relationResolver($model::class, $name), sprintf(
             'Expecting method %s to exist on model %s.',
             $name,
             $model::class,

diff --git a/src/Fields/Relations/BelongsToMany.php b/src/Fields/Relations/BelongsToMany.php
@@ -150,7 +150,7 @@ private function getRelation(Model $model): EloquentBelongsToMany
     {
         $name = $this->relationName();
 
-        assert(method_exists($model, $name), sprintf(
+        assert(method_exists($model, $name) || $model->relationResolver($model::class, $name), sprintf(
             'Expecting method %s to exist on model %s.',
             $name,
             $model::class,

diff --git a/src/Fields/Relations/HasMany.php b/src/Fields/Relations/HasMany.php
@@ -159,7 +159,7 @@ private function getRelation(Model $model): EloquentHasMany|EloquentMorphMany
     {
         $name = $this->relationName();
 
-        assert(method_exists($model, $name), sprintf(
+        assert(method_exists($model, $name) || $model->relationResolver($model::class, $name), sprintf(
             'Expecting method %s to exist on model %s.',
             $name,
             $model::class,

diff --git a/src/Fields/Relations/HasOne.php b/src/Fields/Relations/HasOne.php
@@ -100,7 +100,7 @@ public function fill(Model $model, ?array $identifier): void
     {
         $name = $this->relationName();
 
-        assert(method_exists($model, $name), sprintf(
+        assert(method_exists($model, $name) || $model->relationResolver($model::class, $name), sprintf(
             'Expecting method %s to exist on model %s.',
             $name,
             $model::class,

diff --git a/src/QueryToMany.php b/src/QueryToMany.php
@@ -152,7 +152,7 @@ private function getRelation(): EloquentRelation
     {
         $name = $this->relation->relationName();
 
-        assert(method_exists($this->model, $name), sprintf(
+        assert(method_exists($this->model, $name)  || $this->model->relationResolver($this->model::class, $name), sprintf(
             'Expecting method %s to exist on model %s',
             $name,
             $this->model::class,

diff --git a/src/QueryToOne.php b/src/QueryToOne.php
@@ -90,7 +90,7 @@ private function getRelation(): EloquentRelation
     {
         $name = $this->relation->relationName();
 
-        assert(method_exists($this->model, $name), sprintf(
+        assert(method_exists($this->model, $name)  || $this->model->relationResolver($this->model::class, $name), sprintf(
             'Expecting method %s to exist on model %s',
             $name,
             $this->model::class,