feat: correct builder parameter for other non-morph relational queries

Author: Neol3108

src/Extensions/Eloquent/WhereHasBuilderType.php

@@ -28,17 +28,26 @@ final class WhereHasBuilderType implements MethodParameterClosureTypeExtension
 {
     public function isMethodSupported(MethodReflection $method, ParameterReflection $parameter): bool
     {
-        return $method->getName() === 'whereHas'
-            && $parameter->getName() === 'callback'
+        $methods = [
+            'doesntHave',
+            'has',
+            'whereHas',
+            'withWhereHas',
+            'orWhereHas',
+            'whereDoesntHave',
+            'orWhereDoesntHave',
+        ];
+
+        if (!in_array($method->getName(), $methods, true)) {
+            return false;
+        }
+
+        return $parameter->getName() === 'callback'
             && $method->getDeclaringClass()->getName() === 'Illuminate\Database\Eloquent\Builder';
     }
 
     public function getTypeFromMethodCall(MethodReflection $method, MethodCall $methodCall, ParameterReflection $parameter, Scope $scope): ?Type
     {
-        if (count($methodCall->getArgs()) < 2) {
-            return null;
-        }
-
         $firstType = $scope->getType($methodCall->getArgs()[0]->value);
 
         $strings = $firstType->getConstantStrings();

stubs/database/eloquent/concerns/queries-relationships.stub

@@ -9,13 +9,70 @@ use Closure;
  */
 trait QueriesRelationships
 {
+    /**
+     * @template TBuilder of \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model>
+     * @param \Illuminate\Database\Eloquent\Relations\Relation|string $relation
+     * @param string $operator
+     * @param int $count
+     * @param string $boolean
+     * @param \Closure(TBuilder): (void|TBuilder)|null $callback
+     * @return static
+     * @throws \RuntimeException
+     */
+    public function has($relation, $operator = '>=', $count = 1, $boolean = 'and', ?Closure $callback = null);
+
+    /**
+     * @template TBuilder of \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model>
+     * @param string $relation
+     * @param string $boolean
+     * @param \Closure(TBuilder): (void|TBuilder)|null $callback
+     * @return static
+     */
+    public function doesntHave($relation, $boolean = 'and', ?Closure $callback = null);
+
     /**
      * @template TBuilder of \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model>
      * @param string $relation
      * @param \Closure(TBuilder): (void|TBuilder)|null $callback
      * @param string $operator
      * @param int $count
-     * @return \Illuminate\Database\Eloquent\Builder<TModel>
+     * @return static
      */
     public function whereHas($relation, ?Closure $callback = null, $operator = '>=', $count = 1);
+
+    /**
+     * @template TBuilder of \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model>
+     * @param string $relation
+     * @param \Closure(TBuilder): (void|TBuilder)|null $callback
+     * @param string $operator
+     * @param int $count
+     * @return static
+     */
+    public function withWhereHas($relation, ?Closure $callback = null, $operator = '>=', $count = 1);
+
+    /**
+     * @template TBuilder of \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model>
+     * @param string $relation
+     * @param \Closure(TBuilder): (void|TBuilder)|null $callback
+     * @param string $operator
+     * @param int $count
+     * @return static
+     */
+    public function orWhereHas($relation, ?Closure $callback = null, $operator = '>=', $count = 1);
+
+    /**
+     * @template TBuilder of \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model>
+     * @param string $relation
+     * @param \Closure(TBuilder): (void|TBuilder)|null $callback
+     * @return static
+     */
+    public function whereDoesntHave($relation, ?Closure $callback = null);
+
+    /**
+     * @template TBuilder of \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model>
+     * @param string $relation
+     * @param \Closure(TBuilder): (void|TBuilder)|null $callback
+     * @return static
+     */
+    public function orWhereDoesntHave($relation, ?Closure $callback = null);
 }

tests/Types/data/database/eloquent/builder.php

@@ -70,6 +70,12 @@
 assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\User>', $builder->blocked(false));
 
 // QueriesRelationships
+assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\User>', $builder->has('posts', callback: function ($param1) {
+    assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\Post>', $param1);
+}));
+assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\User>', $builder->doesntHave('posts', callback: function ($param1) {
+    assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\Post>', $param1);
+}));
 assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\User>', $builder->whereHas('posts', function ($param1) {
     assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\Post>', $param1);
 }));
@@ -94,3 +100,16 @@
 }));
 
 assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\User>', $builder->whereHas($unionRelation));
+
+assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\User>', $builder->withWhereHas('posts', function ($param1) {
+    assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\Post>', $param1);
+}));
+assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\User>', $builder->orWhereHas('posts', function ($param1) {
+    assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\Post>', $param1);
+}));
+assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\User>', $builder->whereDoesntHave('posts', function ($param1) {
+    assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\Post>', $param1);
+}));
+assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\User>', $builder->orWhereDoesntHave('posts', function ($param1) {
+    assertType('Illuminate\Database\Eloquent\Builder<Tests\Types\Fakes\Post>', $param1);
+}));