[12.x] Improve typehints for QueriesRelationships (#57830)

* Allow raw `$count` in `QueriesRelationships`

* fix order

---------

Co-authored-by: Taylor Otwell <[email protected]>

Author: CasEbb

src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php

@@ -29,7 +29,7 @@ trait QueriesRelationships
      *
      * @param  \Illuminate\Database\Eloquent\Relations\Relation<TRelatedModel, *, *>|string  $relation
      * @param  string  $operator
-     * @param  int  $count
+     * @param  \Illuminate\Contracts\Database\Query\Expression|int  $count
      * @param  string  $boolean
      * @param  (\Closure(\Illuminate\Database\Eloquent\Builder<TRelatedModel>): 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  \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  $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<TRelatedModel, *, *>|string  $relation
      * @param  (\Closure(\Illuminate\Database\Eloquent\Builder<TRelatedModel>): mixed)|null  $callback
      * @param  string  $operator
-     * @param  int  $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  $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<TRelatedModel, *, *>|string  $relation
      * @param  (\Closure(\Illuminate\Database\Eloquent\Builder<TRelatedModel>): mixed)|null  $callback
      * @param  string  $operator
-     * @param  int  $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<TRelatedModel, *>|string  $relation
      * @param  string|array<int, string>  $types
      * @param  string  $operator
-     * @param  int  $count
+     * @param  \Illuminate\Contracts\Database\Query\Expression|int  $count
      * @param  string  $boolean
      * @param  (\Closure(\Illuminate\Database\Eloquent\Builder<TRelatedModel>, 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<int, string>  $types
      * @param  string  $operator
-     * @param  int  $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<int, string>  $types
      * @param  (\Closure(\Illuminate\Database\Eloquent\Builder<TRelatedModel>, string): mixed)|null  $callback
      * @param  string  $operator
-     * @param  int  $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<int, string>  $types
      * @param  (\Closure(\Illuminate\Database\Eloquent\Builder<TRelatedModel>, string): mixed)|null  $callback
      * @param  string  $operator
-     * @param  int  $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  $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  $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  $count
+     * @param  \Illuminate\Contracts\Database\Query\Expression|int  $count
      * @return bool
      */
     protected function canUseExistsForExistenceCheck($operator, $count)