added the ability to use resolveRelationUsing and still use the package

danilogiacomi · lindyhopchris · commit 12c4116fc0a6 · 2024-06-26T19:41:48.000+01:00
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,

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function fill(Model $model, ?array $identifier): void`
`58`	`58`	`{`
`59`	`59`	`$name = $this->relationName();`
`60`	`60`
`61`		`- assert(method_exists($model, $name), sprintf(`
	`61`	`+ assert(method_exists($model, $name) \|\| $model->relationResolver($model::class, $name), sprintf(`
`62`	`62`	`'Expecting method %s to exist on model %s.',`
`63`	`63`	`$name,`
`64`	`64`	`$model::class,`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ private function getRelation(Model $model): EloquentBelongsToMany`
`150`	`150`	`{`
`151`	`151`	`$name = $this->relationName();`
`152`	`152`
`153`		`- assert(method_exists($model, $name), sprintf(`
	`153`	`+ assert(method_exists($model, $name) \|\| $model->relationResolver($model::class, $name), sprintf(`
`154`	`154`	`'Expecting method %s to exist on model %s.',`
`155`	`155`	`$name,`
`156`	`156`	`$model::class,`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ private function getRelation(Model $model): EloquentHasMany\|EloquentMorphMany`
`159`	`159`	`{`
`160`	`160`	`$name = $this->relationName();`
`161`	`161`
`162`		`- assert(method_exists($model, $name), sprintf(`
	`162`	`+ assert(method_exists($model, $name) \|\| $model->relationResolver($model::class, $name), sprintf(`
`163`	`163`	`'Expecting method %s to exist on model %s.',`
`164`	`164`	`$name,`
`165`	`165`	`$model::class,`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function fill(Model $model, ?array $identifier): void`
`100`	`100`	`{`
`101`	`101`	`$name = $this->relationName();`
`102`	`102`
`103`		`- assert(method_exists($model, $name), sprintf(`
	`103`	`+ assert(method_exists($model, $name) \|\| $model->relationResolver($model::class, $name), sprintf(`
`104`	`104`	`'Expecting method %s to exist on model %s.',`
`105`	`105`	`$name,`
`106`	`106`	`$model::class,`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ private function getRelation(): EloquentRelation`
`152`	`152`	`{`
`153`	`153`	`$name = $this->relation->relationName();`
`154`	`154`
`155`		`- assert(method_exists($this->model, $name), sprintf(`
	`155`	`+ assert(method_exists($this->model, $name) \|\| $this->model->relationResolver($this->model::class, $name), sprintf(`
`156`	`156`	`'Expecting method %s to exist on model %s',`
`157`	`157`	`$name,`
`158`	`158`	`$this->model::class,`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ private function getRelation(): EloquentRelation`
`90`	`90`	`{`
`91`	`91`	`$name = $this->relation->relationName();`
`92`	`92`
`93`		`- assert(method_exists($this->model, $name), sprintf(`
	`93`	`+ assert(method_exists($this->model, $name) \|\| $this->model->relationResolver($this->model::class, $name), sprintf(`
`94`	`94`	`'Expecting method %s to exist on model %s',`
`95`	`95`	`$name,`
`96`	`96`	`$this->model::class,`