[13.x] Fix scope removal in nested where conditions (laravel#54816)

* Add tests

* Remove any scopes removed in a nested where

* Update tests to expect calls to `removedScopes`

Author: willrowe

src/Illuminate/Database/Eloquent/Builder.php

@@ -326,6 +326,9 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
 
             $this->eagerLoad = array_merge($this->eagerLoad, $query->getEagerLoads());
 
+            $this->withoutGlobalScopes(
+                $query->removedScopes()
+            );
             $this->query->addNestedWhereQuery($query->getQuery(), $boolean);
         } else {
             $this->query->where(...func_get_args());

tests/Database/DatabaseEloquentBuilderTest.php

@@ -1042,6 +1042,7 @@ public function testNestedWhere()
         $nestedRawQuery = $this->getMockQueryBuilder();
         $nestedQuery->shouldReceive('getQuery')->once()->andReturn($nestedRawQuery);
         $nestedQuery->shouldReceive('getEagerLoads')->once()->andReturn([]);
+        $nestedQuery->shouldReceive('removedScopes')->once()->andReturn([]);
         $model = $this->getMockModel()->makePartial();
         $model->shouldReceive('newQueryWithoutRelationships')->once()->andReturn($nestedQuery);
         $builder = $this->getBuilder();
@@ -1104,6 +1105,7 @@ public function testWhereNot()
         $nestedRawQuery = $this->getMockQueryBuilder();
         $nestedQuery->shouldReceive('getQuery')->once()->andReturn($nestedRawQuery);
         $nestedQuery->shouldReceive('getEagerLoads')->once()->andReturn([]);
+        $nestedQuery->shouldReceive('removedScopes')->once()->andReturn([]);
         $model = $this->getMockModel()->makePartial();
         $model->shouldReceive('newQueryWithoutRelationships')->once()->andReturn($nestedQuery);
         $builder = $this->getBuilder();
@@ -1133,6 +1135,7 @@ public function testOrWhereNot()
         $nestedRawQuery = $this->getMockQueryBuilder();
         $nestedQuery->shouldReceive('getQuery')->once()->andReturn($nestedRawQuery);
         $nestedQuery->shouldReceive('getEagerLoads')->once()->andReturn([]);
+        $nestedQuery->shouldReceive('removedScopes')->once()->andReturn([]);
         $model = $this->getMockModel()->makePartial();
         $model->shouldReceive('newQueryWithoutRelationships')->once()->andReturn($nestedQuery);
         $builder = $this->getBuilder();

tests/Database/DatabaseEloquentGlobalScopesTest.php

@@ -147,6 +147,38 @@ public function testHasQueryWhereBothModelsHaveGlobalScopes()
         $this->assertEquals($mainQuery, $query->toSql());
         $this->assertEquals(['bar', 1, 'baz', 1], $query->getBindings());
     }
+
+    public function testRegularScopesThatRemoveGlobalScopes()
+    {
+        $query = EloquentClosureGlobalScopesTestModel::where('foo', 'foo')->approved()->notApproved();
+
+        $this->assertSame('select * from "table" where "foo" = ? and ("approved" = ? or "should_approve" = ?) and ("approved" = ? or "should_approve" = ?) order by "name" asc', $query->toSql());
+        $this->assertEquals(['foo', 1, 0, 0, 1], $query->getBindings());
+    }
+
+    public function testRegularScopesThatRemoveGlobalScopesCalledInNestedWhereCondition()
+    {
+        $query = EloquentClosureGlobalScopesTestModel::where('foo', 'foo')->where(function ($query) {
+            $query->approved();
+            $query->orWhere(function ($query) {
+                $query->notApproved();
+            });
+        });
+
+        $this->assertSame('select * from "table" where "foo" = ? and (("approved" = ? or "should_approve" = ?) or (("approved" = ? or "should_approve" = ?))) order by "name" asc', $query->toSql());
+        $this->assertEquals(['foo', 1, 0, 0, 1], $query->getBindings());
+    }
+
+    public function testRemovingGlobalScopeInNestedWhereCondition()
+    {
+        $query = EloquentClosureGlobalScopesTestModel::where('foo', 'foo')->where(function ($query) {
+            $query->approved();
+            $query->withoutGlobalScope('active_scope');
+        });
+
+        $this->assertSame('select * from "table" where "foo" = ? and (("approved" = ? or "should_approve" = ?)) order by "name" asc', $query->toSql());
+        $this->assertEquals(['foo', 1, 0], $query->getBindings());
+    }
 }
 
 class EloquentClosureGlobalScopesTestModel extends Model
@@ -171,6 +203,11 @@ public function scopeApproved($query)
         return $query->where('approved', 1)->orWhere('should_approve', 0);
     }
 
+    public function scopeNotApproved($query)
+    {
+        return $query->where('approved', 0)->orWhere('should_approve', 1)->withoutGlobalScope('active_scope');
+    }
+
     public function scopeOrApproved($query)
     {
         return $query->orWhere('approved', 1)->orWhere('should_approve', 0);