From ded442366eff08143068260c17dda95c029963e2 Mon Sep 17 00:00:00 2001 From: CasEbb <617080+CasEbb@users.noreply.github.com> Date: Wed, 19 Nov 2025 22:22:42 +0100 Subject: [PATCH 1/2] Allow raw `$count` in `QueriesRelationships` --- .../Concerns/QueriesRelationships.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php b/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php index d51a862f17d2..8a1862994c41 100644 --- a/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php +++ b/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php @@ -29,7 +29,7 @@ trait QueriesRelationships * * @param \Illuminate\Database\Eloquent\Relations\Relation|string $relation * @param string $operator - * @param int $count + * @param int|\Illuminate\Contracts\Database\Query\Expression $count * @param string $boolean * @param (\Closure(\Illuminate\Database\Eloquent\Builder): mixed)|null $callback * @return $this @@ -80,7 +80,7 @@ public function has($relation, $operator = '>=', $count = 1, $boolean = 'and', ? * * @param string $relations * @param string $operator - * @param int $count + * @param int|\Illuminate\Contracts\Database\Query\Expression $count * @param string $boolean * @param (\Closure(\Illuminate\Database\Eloquent\Builder<*>): mixed)|null $callback * @return $this @@ -122,7 +122,7 @@ protected function hasNested($relations, $operator = '>=', $count = 1, $boolean * * @param \Illuminate\Database\Eloquent\Relations\Relation<*, *, *>|string $relation * @param string $operator - * @param int $count + * @param int|\Illuminate\Contracts\Database\Query\Expression $count * @return $this */ public function orHas($relation, $operator = '>=', $count = 1) @@ -164,7 +164,7 @@ public function orDoesntHave($relation) * @param \Illuminate\Database\Eloquent\Relations\Relation|string $relation * @param (\Closure(\Illuminate\Database\Eloquent\Builder): mixed)|null $callback * @param string $operator - * @param int $count + * @param int|\Illuminate\Contracts\Database\Query\Expression $count * @return $this */ public function whereHas($relation, ?Closure $callback = null, $operator = '>=', $count = 1) @@ -180,7 +180,7 @@ public function whereHas($relation, ?Closure $callback = null, $operator = '>=', * @param string $relation * @param (\Closure(\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Eloquent\Relations\Relation<*, *, *>): mixed)|null $callback * @param string $operator - * @param int $count + * @param int|\Illuminate\Contracts\Database\Query\Expression $count * @return $this */ public function withWhereHas($relation, ?Closure $callback = null, $operator = '>=', $count = 1) @@ -197,7 +197,7 @@ public function withWhereHas($relation, ?Closure $callback = null, $operator = ' * @param \Illuminate\Database\Eloquent\Relations\Relation|string $relation * @param (\Closure(\Illuminate\Database\Eloquent\Builder): mixed)|null $callback * @param string $operator - * @param int $count + * @param int|\Illuminate\Contracts\Database\Query\Expression $count * @return $this */ public function orWhereHas($relation, ?Closure $callback = null, $operator = '>=', $count = 1) @@ -241,7 +241,7 @@ public function orWhereDoesntHave($relation, ?Closure $callback = null) * @param \Illuminate\Database\Eloquent\Relations\MorphTo|string $relation * @param string|array $types * @param string $operator - * @param int $count + * @param int|\Illuminate\Contracts\Database\Query\Expression $count * @param string $boolean * @param (\Closure(\Illuminate\Database\Eloquent\Builder, string): mixed)|null $callback * @return $this @@ -325,7 +325,7 @@ protected function getBelongsToRelation(MorphTo $relation, $type) * @param \Illuminate\Database\Eloquent\Relations\MorphTo<*, *>|string $relation * @param string|array $types * @param string $operator - * @param int $count + * @param int|\Illuminate\Contracts\Database\Query\Expression $count * @return $this */ public function orHasMorph($relation, $types, $operator = '>=', $count = 1) @@ -370,7 +370,7 @@ public function orDoesntHaveMorph($relation, $types) * @param string|array $types * @param (\Closure(\Illuminate\Database\Eloquent\Builder, string): mixed)|null $callback * @param string $operator - * @param int $count + * @param int|\Illuminate\Contracts\Database\Query\Expression $count * @return $this */ public function whereHasMorph($relation, $types, ?Closure $callback = null, $operator = '>=', $count = 1) @@ -387,7 +387,7 @@ public function whereHasMorph($relation, $types, ?Closure $callback = null, $ope * @param string|array $types * @param (\Closure(\Illuminate\Database\Eloquent\Builder, string): mixed)|null $callback * @param string $operator - * @param int $count + * @param int|\Illuminate\Contracts\Database\Query\Expression $count * @return $this */ public function orWhereHasMorph($relation, $types, ?Closure $callback = null, $operator = '>=', $count = 1) @@ -1025,7 +1025,7 @@ public function withExists($relation) * @param \Illuminate\Database\Eloquent\Builder<*> $hasQuery * @param \Illuminate\Database\Eloquent\Relations\Relation<*, *, *> $relation * @param string $operator - * @param int $count + * @param int|\Illuminate\Contracts\Database\Query\Expression $count * @param string $boolean * @return $this */ @@ -1089,7 +1089,7 @@ protected function requalifyWhereTables(array $wheres, string $from, string $to) * * @param \Illuminate\Database\Query\Builder $query * @param string $operator - * @param int $count + * @param int|\Illuminate\Contracts\Database\Query\Expression $count * @param string $boolean * @return $this */ @@ -1122,7 +1122,7 @@ protected function getRelationWithoutConstraints($relation) * Check if we can run an "exists" query to optimize performance. * * @param string $operator - * @param int $count + * @param int|\Illuminate\Contracts\Database\Query\Expression $count * @return bool */ protected function canUseExistsForExistenceCheck($operator, $count) From f63085e84d268d93f0904e9428fb56dc9becdb36 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 21 Nov 2025 15:31:52 -0600 Subject: [PATCH 2/2] fix order --- .../Concerns/QueriesRelationships.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php b/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php index 8a1862994c41..c443e7313b06 100644 --- a/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php +++ b/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php @@ -29,7 +29,7 @@ trait QueriesRelationships * * @param \Illuminate\Database\Eloquent\Relations\Relation|string $relation * @param string $operator - * @param int|\Illuminate\Contracts\Database\Query\Expression $count + * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @param string $boolean * @param (\Closure(\Illuminate\Database\Eloquent\Builder): mixed)|null $callback * @return $this @@ -80,7 +80,7 @@ public function has($relation, $operator = '>=', $count = 1, $boolean = 'and', ? * * @param string $relations * @param string $operator - * @param int|\Illuminate\Contracts\Database\Query\Expression $count + * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @param string $boolean * @param (\Closure(\Illuminate\Database\Eloquent\Builder<*>): mixed)|null $callback * @return $this @@ -122,7 +122,7 @@ protected function hasNested($relations, $operator = '>=', $count = 1, $boolean * * @param \Illuminate\Database\Eloquent\Relations\Relation<*, *, *>|string $relation * @param string $operator - * @param int|\Illuminate\Contracts\Database\Query\Expression $count + * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return $this */ public function orHas($relation, $operator = '>=', $count = 1) @@ -164,7 +164,7 @@ public function orDoesntHave($relation) * @param \Illuminate\Database\Eloquent\Relations\Relation|string $relation * @param (\Closure(\Illuminate\Database\Eloquent\Builder): mixed)|null $callback * @param string $operator - * @param int|\Illuminate\Contracts\Database\Query\Expression $count + * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return $this */ public function whereHas($relation, ?Closure $callback = null, $operator = '>=', $count = 1) @@ -180,7 +180,7 @@ public function whereHas($relation, ?Closure $callback = null, $operator = '>=', * @param string $relation * @param (\Closure(\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Eloquent\Relations\Relation<*, *, *>): mixed)|null $callback * @param string $operator - * @param int|\Illuminate\Contracts\Database\Query\Expression $count + * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return $this */ public function withWhereHas($relation, ?Closure $callback = null, $operator = '>=', $count = 1) @@ -197,7 +197,7 @@ public function withWhereHas($relation, ?Closure $callback = null, $operator = ' * @param \Illuminate\Database\Eloquent\Relations\Relation|string $relation * @param (\Closure(\Illuminate\Database\Eloquent\Builder): mixed)|null $callback * @param string $operator - * @param int|\Illuminate\Contracts\Database\Query\Expression $count + * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return $this */ public function orWhereHas($relation, ?Closure $callback = null, $operator = '>=', $count = 1) @@ -241,7 +241,7 @@ public function orWhereDoesntHave($relation, ?Closure $callback = null) * @param \Illuminate\Database\Eloquent\Relations\MorphTo|string $relation * @param string|array $types * @param string $operator - * @param int|\Illuminate\Contracts\Database\Query\Expression $count + * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @param string $boolean * @param (\Closure(\Illuminate\Database\Eloquent\Builder, string): mixed)|null $callback * @return $this @@ -325,7 +325,7 @@ protected function getBelongsToRelation(MorphTo $relation, $type) * @param \Illuminate\Database\Eloquent\Relations\MorphTo<*, *>|string $relation * @param string|array $types * @param string $operator - * @param int|\Illuminate\Contracts\Database\Query\Expression $count + * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return $this */ public function orHasMorph($relation, $types, $operator = '>=', $count = 1) @@ -370,7 +370,7 @@ public function orDoesntHaveMorph($relation, $types) * @param string|array $types * @param (\Closure(\Illuminate\Database\Eloquent\Builder, string): mixed)|null $callback * @param string $operator - * @param int|\Illuminate\Contracts\Database\Query\Expression $count + * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return $this */ public function whereHasMorph($relation, $types, ?Closure $callback = null, $operator = '>=', $count = 1) @@ -387,7 +387,7 @@ public function whereHasMorph($relation, $types, ?Closure $callback = null, $ope * @param string|array $types * @param (\Closure(\Illuminate\Database\Eloquent\Builder, string): mixed)|null $callback * @param string $operator - * @param int|\Illuminate\Contracts\Database\Query\Expression $count + * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return $this */ public function orWhereHasMorph($relation, $types, ?Closure $callback = null, $operator = '>=', $count = 1) @@ -1025,7 +1025,7 @@ public function withExists($relation) * @param \Illuminate\Database\Eloquent\Builder<*> $hasQuery * @param \Illuminate\Database\Eloquent\Relations\Relation<*, *, *> $relation * @param string $operator - * @param int|\Illuminate\Contracts\Database\Query\Expression $count + * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @param string $boolean * @return $this */ @@ -1089,7 +1089,7 @@ protected function requalifyWhereTables(array $wheres, string $from, string $to) * * @param \Illuminate\Database\Query\Builder $query * @param string $operator - * @param int|\Illuminate\Contracts\Database\Query\Expression $count + * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @param string $boolean * @return $this */ @@ -1122,7 +1122,7 @@ protected function getRelationWithoutConstraints($relation) * Check if we can run an "exists" query to optimize performance. * * @param string $operator - * @param int|\Illuminate\Contracts\Database\Query\Expression $count + * @param \Illuminate\Contracts\Database\Query\Expression|int $count * @return bool */ protected function canUseExistsForExistenceCheck($operator, $count)