Updated has query to property nest where statements, based on scope logic

Author: wleona3

src/Illuminate/Database/Eloquent/Builder.php

@@ -822,7 +822,7 @@ public function has($relation, $operator = '>=', $count = 1, $boolean = 'and', C
         $query = $relation->{$queryType}($relation->getRelated()->newQuery(), $this);
 
         if ($callback) {
-            call_user_func($callback, $query);
+            $this->applyCallback($callback, [$query], $query->getQuery());
         }
 
         return $this->addHasWhere(
@@ -1137,14 +1137,27 @@ protected function callScope($scope, $parameters)
     {
         array_unshift($parameters, $this);
 
-        $query = $this->getQuery();
+        return $this->applyCallback([$this->model, $scope], $parameters);
+    }
+
+    /**
+     * Apply the given callback to a supplied (or the current) builder instance.
+     *
+     * @param  callable $callback
+     * @param  array $parameters
+     * @param  \Illuminate\Database\Query\Builder $query
+     * @return mixed
+     */
+    protected function applyCallback(callable $callback, $parameters = [], $query = null)
+    {
+        $query = $query ?: $this->getQuery();
 
         // We will keep track of how many wheres are on the query before running the
         // scope so that we can properly group the added scope constraints in the
         // query as their own isolated nested where statement and avoid issues.
         $originalWhereCount = count($query->wheres);
 
-        $result = call_user_func_array([$this->model, $scope], $parameters) ?: $this;
+        $result = call_user_func_array($callback, $parameters) ?: $this;
 
         if ($this->shouldNestWheresForScope($query, $originalWhereCount)) {
             $this->nestWheresForScope($query, $originalWhereCount);
@@ -1239,7 +1252,7 @@ protected function nestWheresForScope(QueryBuilder $query, $whereCounts)
         // collection (0 and total where count) while also flattening the array
         // and extracting unique values, ensuring that all wheres are sliced.
         $whereOffsets = collect([0, $whereCounts, count($allWheres)])
-                    ->flatten()->unique();
+            ->flatten()->unique();
 
         $sliceFrom = $whereOffsets->shift();
 

tests/Database/DatabaseEloquentBuilderTest.php

@@ -526,6 +526,21 @@ public function testHasWithContraintsAndHavingInSubquery()
         $this->assertEquals(['baz', 'qux', 'quuux'], $builder->getBindings());
     }
 
+    public function testHasWithContraintsWithOrWhereAndHavingInSubquery()
+    {
+        $model = new EloquentBuilderTestModelParentStub;
+
+        $builder = $model->where('name', 'larry');
+        $builder->whereHas('address', function ($q) {
+            $q->where('zipcode', '90210');
+            $q->orWhere('zipcode', '90220');
+            $q->having('street', '=', 'fooside dr');
+        })->where('age', 29);
+
+        $this->assertEquals('select * from "eloquent_builder_test_model_parent_stubs" where "name" = ? and exists (select * from "eloquent_builder_test_model_close_related_stubs" where "eloquent_builder_test_model_parent_stubs"."foo_id" = "eloquent_builder_test_model_close_related_stubs"."id" and ("zipcode" = ? or "zipcode" = ?) having "street" = ?) and "age" = ?', $builder->toSql());
+        $this->assertEquals(['larry', '90210', '90220', 'fooside dr', 29], $builder->getBindings());
+    }
+
     public function testHasWithContraintsAndJoinAndHavingInSubquery()
     {
         $model = new EloquentBuilderTestModelParentStub;
@@ -711,6 +726,11 @@ public function foo()
         return $this->belongsTo('EloquentBuilderTestModelCloseRelatedStub');
     }
 
+    public function address()
+    {
+        return $this->belongsTo('EloquentBuilderTestModelCloseRelatedStub', 'foo_id');
+    }
+
     public function activeFoo()
     {
         return $this->belongsTo('EloquentBuilderTestModelCloseRelatedStub', 'foo_id')->where('active', true);