Fix whereIn subquery for Laravel 5.8+

.gitignore

@@ -1,3 +1,4 @@
 /vendor
 /.idea
 composer.lock
+.phpunit.result.cache

src/Database/EloquentBuilder.php

@@ -2,11 +2,13 @@
 
 namespace Weebly\Mutate\Database;
 
-use Illuminate\Database\Eloquent\Builder;
+use Closure;
+use Illuminate\Database\Eloquent\Builder as BaseEloquentBuilder;
+use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Str;
 
-class EloquentBuilder extends Builder
+class EloquentBuilder extends BaseEloquentBuilder
 {
     /**
      * @var \Weebly\Mutate\Database\Model
@@ -83,6 +85,13 @@ public function whereIn($column, $values, $boolean = 'and', $not = false)
 
         parent::whereIn($column, $values, $boolean, $not);
 
+        // For sub-queries in Laravel 6. We don't need to do anything.
+        if ($values instanceof QueryBuilder ||
+            $values instanceof BaseEloquentBuilder ||
+            $values instanceof Closure) {
+            return $this;
+        }
+
         // Remove the last item of the array
         $where = array_pop($this->query->wheres);
 
@@ -96,7 +105,7 @@ public function whereIn($column, $values, $boolean = 'and', $not = false)
         if ($where['type'] === 'InSub' || $where['type'] === 'NotInSub') {
             $this->query->wheres[] = $where;
 
-            return parent::whereIn($column, $values, $boolean, $not);
+            return $this;
         }
 
         // Get the column name

tests/Integration/MutatorTest.php

@@ -132,6 +132,22 @@ public function test_where_in_subquery()
         $this->assertEquals($id2, $p->last()->id);
     }
 
+    public function test_where_in_subquery_with_bindings()
+    {
+        $id = Uuid::uuid1()->toString();
+        $id2 = Uuid::uuid1()->toString();
+        (new TestModel())->create(['id' => $id, 'name' => 'A chair', 'location' => 'One']);
+        (new TestModel())->create(['id' => $id2, 'name' => 'A table', 'location' => 'Two']);
+
+        $query = TestModel::query()->where('name', '!=', 'A lamp')->whereIn('id', function ($query) {
+            $query->select('id')->from('test_model')->where('name', 'A lamp')->orWhere('name', 'A chair');
+        });
+
+        $p = $query->get();
+        $this->assertEquals(1, $p->count());
+        $this->assertEquals($id, $p->first()->id);
+    }
+
     public function test_where_in_wherein_subquery()
     {
         $id = Uuid::uuid1()->toString();