From 098afd95e6d6aa6ccb103a85e714dbd8d061461f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20JEAN?= Date: Wed, 31 Jul 2024 12:42:11 +0200 Subject: [PATCH 1/2] Add compatible query type to Model::resolveRouteBindingQuery --- src/Illuminate/Database/Eloquent/Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php index 672939b95c4c..8c214a2d5f55 100644 --- a/src/Illuminate/Database/Eloquent/Model.php +++ b/src/Illuminate/Database/Eloquent/Model.php @@ -2123,7 +2123,7 @@ protected function childRouteBindingRelationshipName($childType) /** * Retrieve the model for a bound value. * - * @param \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Relations\Relation $query + * @param \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Relations\Relation|\Illuminate\Contracts\Database\Eloquent\Builder $query * @param mixed $value * @param string|null $field * @return \Illuminate\Database\Eloquent\Relations\Relation From 1aca1623a84746af5dea94e32f8e69dca5f1f69f Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 1 Aug 2024 08:17:33 -0500 Subject: [PATCH 2/2] Update Model.php --- src/Illuminate/Database/Eloquent/Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php index 8c214a2d5f55..48618cbbd61f 100644 --- a/src/Illuminate/Database/Eloquent/Model.php +++ b/src/Illuminate/Database/Eloquent/Model.php @@ -2123,7 +2123,7 @@ protected function childRouteBindingRelationshipName($childType) /** * Retrieve the model for a bound value. * - * @param \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Relations\Relation|\Illuminate\Contracts\Database\Eloquent\Builder $query + * @param \Illuminate\Database\Eloquent\Model|\Illuminate\Contracts\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Relations\Relation $query * @param mixed $value * @param string|null $field * @return \Illuminate\Database\Eloquent\Relations\Relation