[12.x] Fixed an issue when calling hasNested with a first relationship of type morphTo.

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

@@ -89,14 +89,23 @@ protected function hasNested($relations, $operator = '>=', $count = 1, $boolean
     {
         $relations = explode('.', $relations);
 
+        $initialRelations = [...$relations];
+
         $doesntHave = $operator === '<' && $count === 1;
 
         if ($doesntHave) {
             $operator = '>=';
             $count = 1;
         }
 
-        $closure = function ($q) use (&$closure, &$relations, $operator, $count, $callback) {
+        $closure = function ($q) use (&$closure, &$relations, $operator, $count, $callback, $initialRelations) {
+            // If the same closure is called multiple times, reset the relation array to loop through them again...
+            if ($count === 1 && empty($relations)) {
+                $relations = [...$initialRelations];
+
+                array_shift($relations);
+            }
+
             // In order to nest "has", we need to add count relation constraints on the
             // callback Closure. We'll do this by simply passing the Closure its own
             // reference to itself so it calls itself recursively on each segment.

tests/Database/DatabaseEloquentBuilderTest.php

@@ -1727,6 +1727,64 @@ public function testHasNested()
         $this->assertEquals($builder->toSql(), $result);
     }
 
+    public function testHasNestedWithMorphTo()
+    {
+        $model = new EloquentBuilderTestModelParentStub;
+        $connection = $this->mockConnectionForModel($model, '');
+
+        $morphToKey = $model->morph()->getMorphType();
+
+        $connection->shouldReceive('select')->once()->andReturn([
+            [$morphToKey => EloquentBuilderTestModelFarRelatedStub::class],
+            [$morphToKey => EloquentBuilderTestModelOtherFarRelatedStub::class],
+        ]);
+
+        $builder = $model->orWhereHasMorph('morph', [EloquentBuilderTestModelFarRelatedStub::class], function ($q) {
+            $q->has('baz');
+        })->orWhereHasMorph('morph', [EloquentBuilderTestModelOtherFarRelatedStub::class], function ($q) {
+            $q->has('baz');
+        });
+
+        $results = $model->has('morph.baz')->toSql();
+
+        // we need to adjust the expected builder because some parathesis are added,
+        // which doesn't impact the behavior of the test.
+
+        $builderSql = $builder->toSql();
+        $builderSql = str_replace(')))) or ((', '))) or (', $builderSql);
+
+        $this->assertSame($builderSql, $results);
+    }
+
+    public function testHasNestedWithMorphToAndMultipleSubRelations()
+    {
+        $model = new EloquentBuilderTestModelParentStub;
+        $connection = $this->mockConnectionForModel($model, '');
+
+        $morphToKey = $model->morph()->getMorphType();
+
+        $connection->shouldReceive('select')->once()->andReturn([
+            [$morphToKey => EloquentBuilderTestModelFarRelatedStub::class],
+            [$morphToKey => EloquentBuilderTestModelOtherFarRelatedStub::class],
+        ]);
+
+        $builder = $model->orWhereHasMorph('morph', [EloquentBuilderTestModelFarRelatedStub::class], function ($q) {
+            $q->has('baz.bam');
+        })->orWhereHasMorph('morph', [EloquentBuilderTestModelOtherFarRelatedStub::class], function ($q) {
+            $q->has('baz.bam');
+        });
+
+        $results = $model->has('morph.baz.bam')->toSql();
+
+        // we need to adjust the expected builder because some parathesis are added,
+        // which doesn't impact the behavior of the test.
+
+        $builderSql = $builder->toSql();
+        $builderSql = str_replace(')))) or ((', '))) or (', $builderSql);
+
+        $this->assertSame($builderSql, $results);
+    }
+
     public function testOrHasNested()
     {
         $model = new EloquentBuilderTestModelParentStub;
@@ -2683,6 +2741,8 @@ protected function mockConnectionForModel($model, $database)
         $resolver = m::mock(ConnectionResolverInterface::class, ['connection' => $connection]);
         $class = get_class($model);
         $class::setConnectionResolver($resolver);
+
+        return $connection;
     }
 
     protected function getBuilder()
@@ -2835,6 +2895,11 @@ public function baz()
     {
         return $this->hasMany(EloquentBuilderTestModelFarRelatedStub::class);
     }
+
+    public function bam()
+    {
+        return $this->hasMany(EloquentBuilderTestModelOtherFarRelatedStub::class);
+    }
 }
 
 class EloquentBuilderTestModelFarRelatedStub extends Model
@@ -2848,6 +2913,29 @@ public function roles()
             'self_id',
         );
     }
+
+    public function baz()
+    {
+        return $this->belongsTo(EloquentBuilderTestModelCloseRelatedStub::class);
+    }
+}
+
+class EloquentBuilderTestModelOtherFarRelatedStub extends Model
+{
+    public function roles()
+    {
+        return $this->belongsToMany(
+            EloquentBuilderTestModelParentStub::class,
+            'user_role',
+            'related_id',
+            'self_id',
+        );
+    }
+
+    public function baz()
+    {
+        return $this->belongsTo(EloquentBuilderTestModelCloseRelatedStub::class);
+    }
 }
 
 class EloquentBuilderTestModelSelfRelatedStub extends Model