Fix resolveRouteBindingQuery

leMaur · Oct 18, 2023 · 1dd528a · 1dd528a
1 parent 2858cf6
commit 1dd528a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Concerns/HasHuids.php b/src/Concerns/HasHuids.php
@@ -2,6 +2,7 @@
 
 namespace Lemaur\HumanId\Concerns;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\Relations\Relation;
@@ -67,11 +68,11 @@ public function newUniqueId(): string
      * @param  Model|Relation  $query
      * @param  mixed  $value
      * @param  string|null  $field
-     * @return Relation
+     * @return Relation|Builder
      *
      * @throws ModelNotFoundException
      */
-    public function resolveRouteBindingQuery($query, $value, $field = null): Relation
+    public function resolveRouteBindingQuery($query, $value, $field = null): Relation|Builder
     {
         if ($field && ! Str::isHuid($value) && in_array($field, $this->uniqueIds(), true)) {
             throw (new ModelNotFoundException)->setModel(get_class($this), $value);
@@ -81,6 +82,10 @@ public function resolveRouteBindingQuery($query, $value, $field = null): Relatio
             throw (new ModelNotFoundException)->setModel(get_class($this), $value);
         }
 
+        if ($field === null && Str::isHuid($value)) {
+            $field = (string) config('human-id.field', 'huid');
+        }
+
         return parent::resolveRouteBindingQuery($query, $value, $field);
     }