[12.x] Add whereHasAny, orWhereHasAny, whereHasAll, and orWhereHasAll Methods to Eloquent Builder

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

@@ -224,6 +224,111 @@ public function orWhereDoesntHave($relation, ?Closure $callback = null)
         return $this->doesntHave($relation, 'or', $callback);
     }
 
+    /**
+     * Add a "whereHas" condition with OR between columns inside relationships.
+     *
+     * @param  array<string,(\Illuminate\Contracts\Database\Query\Expression|string|\Closure)[]|\Closure>  $tuples
+     * @param  mixed  $operator
+     * @param  mixed  $value
+     * @return $this
+     */
+    public function whereHasAny(array $tuples, $operator = null, $value = null)
+    {
+        return $this->hasNestedColumnsGroup($tuples, $operator, $value, 'or', 'and');
+    }
+
+    /**
+     * Add an "orWhereHas" condition with OR between columns inside relationships.
+     *
+     * @param  array<string,(\Illuminate\Contracts\Database\Query\Expression|string|\Closure)[]|\Closure>  $tuples
+     * @param  mixed  $operator
+     * @param  mixed  $value
+     * @return $this
+     */
+    public function orWhereHasAny(array $tuples, $operator = null, $value = null)
+    {
+        return $this->hasNestedColumnsGroup($tuples, $operator, $value, 'or', 'or');
+    }
+
+    /**
+     * Add a "whereHas" condition with AND between columns inside relationships.
+     *
+     * @param  array<string,(\Illuminate\Contracts\Database\Query\Expression|string|\Closure)[]|\Closure>  $tuples
+     * @param  mixed  $operator
+     * @param  mixed  $value
+     * @return $this
+     */
+    public function whereHasAll(array $tuples, $operator = null, $value = null)
+    {
+        return $this->hasNestedColumnsGroup($tuples, $operator, $value, 'and', 'and');
+    }
+
+    /**
+     * Add an "orWhereHas" condition with AND between columns inside relationships.
+     *
+     * @param  array<string,(\Illuminate\Contracts\Database\Query\Expression|string|\Closure)[]|\Closure>  $tuples
+     * @param  mixed  $operator
+     * @param  mixed  $value
+     * @return $this
+     */
+    public function orWhereHasAll(array $tuples, $operator = null, $value = null)
+    {
+        return $this->hasNestedColumnsGroup($tuples, $operator, $value, 'and', 'or');
+    }
+
+    /**
+     * Method to build "has" conditions for relationships,
+     * combining multiple columns with given boolean logic.
+     *
+     * @param  array<string,(\Illuminate\Contracts\Database\Query\Expression|string|\Closure)[]|\Closure>  $tuples
+     * @param  mixed  $operator
+     * @param  mixed  $value
+     * @param  string  $innerBoolean
+     * @param  string  $outerBoolean
+     * @return $this
+     */
+    protected function hasNestedColumnsGroup($tuples, $operator, $value, $innerBoolean, $outerBoolean)
+    {
+        $callback = function (Builder $query) use ($tuples, $operator, $value, $innerBoolean) {
+            foreach ($tuples as $relation => $columns) {
+                $this->hasNestedColumns(
+                    $query, $relation, $columns, $operator, $value, $innerBoolean, 'and'
+                );
+            }
+        };
+
+        return $this->where($callback, boolean: $outerBoolean);
+    }
+
+    /**
+     *  Add nested "where" clauses on relationships for multiple columns with boolean conditions.
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param  string  $relation
+     * @param  (\Illuminate\Contracts\Database\Query\Expression|string|\Closure)[]|\Closure  $columns
+     * @param  mixed  $operator
+     * @param  mixed  $value
+     * @param  string  $innerBoolean
+     * @param  string  $outerBoolean
+     * @return $this
+     */
+    protected function hasNestedColumns($query, $relation, $columns, $operator, $value, $innerBoolean, $outerBoolean)
+    {
+        $callback = fn (Builder $builder) => $builder->query->addNestedWhereColumns(
+            $columns, $operator, $value, $innerBoolean, 'and'
+        );
+
+        if ($columns instanceof Closure) {
+            $callback = $columns;
+        }
+
+        return $query->has(
+            $relation,
+            boolean: $outerBoolean,
+            callback: $callback,
+        );
+    }
+
     /**
      * Add a polymorphic relationship count / exists condition to the query.
      *

src/Illuminate/Database/Query/Builder.php

@@ -904,6 +904,25 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
         return $this;
     }
 
+    /**
+     * Add an "and/or where" clause to the query for multiple columns with "and/or" conditions between them.
+     *
+     * @param  \Illuminate\Contracts\Database\Query\Expression[]|\Closure[]|string[]  $columns
+     * @param  mixed  $operator
+     * @param  mixed  $value
+     * @param  string  $innerBoolean
+     * @param  string  $outerBoolean
+     * @return $this
+     */
+    protected function addNestedWhereColumns($columns, $operator, $value, $innerBoolean, $outerBoolean)
+    {
+        return $this->whereNested(function ($query) use ($columns, $operator, $value, $innerBoolean) {
+            foreach ($columns as $column) {
+                $query->where($column, $operator, $value, $innerBoolean);
+            }
+        }, $outerBoolean);
+    }
+
     /**
      * Add an array of where clauses to the query.
      *
@@ -2275,13 +2294,7 @@ public function whereAll($columns, $operator = null, $value = null, $boolean = '
             $value, $operator, func_num_args() === 2
         );
 
-        $this->whereNested(function ($query) use ($columns, $operator, $value) {
-            foreach ($columns as $column) {
-                $query->where($column, $operator, $value, 'and');
-            }
-        }, $boolean);
-
-        return $this;
+        return $this->addNestedWhereColumns($columns, $operator, $value, 'and', $boolean);
     }
 
     /**
@@ -2312,13 +2325,7 @@ public function whereAny($columns, $operator = null, $value = null, $boolean = '
             $value, $operator, func_num_args() === 2
         );
 
-        $this->whereNested(function ($query) use ($columns, $operator, $value) {
-            foreach ($columns as $column) {
-                $query->where($column, $operator, $value, 'or');
-            }
-        }, $boolean);
-
-        return $this;
+        return $this->addNestedWhereColumns($columns, $operator, $value, 'or', $boolean);
     }
 
     /**