Fix binding resolution for whereIn queries

Author: mikebronner

src/CacheKey.php

@@ -225,7 +225,7 @@ protected function getInAndNotInClauses(array $where) : string
         $type = strtolower($where["type"]);
         $subquery = $this->getValuesFromWhere($where);
         $values = collect($this->query->bindings["where"][$this->currentBinding] ?? []);
-        $this->currentBinding++;
+        $this->currentBinding += count($where["values"]);
         $subquery = collect(vsprintf(str_replace("?", "%s", $subquery), $values->toArray()));
         $values = $this->recursiveImplode($subquery->toArray(), "_");
 

tests/Integration/CachedBuilder/WhereInTest.php

@@ -78,4 +78,26 @@ public function testBindingsAreCorrectWithMultipleWhereInClauses()
         $this->assertEquals($liveResults->pluck("id"), $authors->pluck("id"));
         $this->assertEquals($liveResults->pluck("id"), $cachedResults->pluck("id"));
     }
+
+    /** @group test */
+    public function testWhereInUsesCorrectBindings()
+    {
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-id_in_1_2_3_4_5-id_between_1_99999');
+        $tags = ['genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor'];
+
+        $authors = (new Author)
+            ->whereIn('id', [1,2,3,4,5])
+            ->whereBetween('id', [1, 99999])
+            ->get();
+        $cachedResults = $this->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+        $liveResults = (new UncachedAuthor)
+            ->whereIn('id', [1,2,3,4,5])
+            ->whereBetween('id', [1, 99999])
+            ->get();
+
+        $this->assertEmpty($authors->diffKeys($cachedResults));
+        $this->assertEmpty($liveResults->diffKeys($cachedResults));
+    }
 }

tests/Integration/CachedBuilder/WhereTest.php

@@ -116,4 +116,29 @@ public function testTwoWhereClausesAfterEachOther()
         $this->assertEmpty($authors->diffKeys($cachedResults));
         $this->assertEmpty($liveResults->diffKeys($cachedResults));
     }
+
+    public function testWhereUsesCorrectBinding()
+    {
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-id_>_5-name_like_B%');
+        $tags = ['genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor'];
+
+        $authors = (new Author)
+            ->where("id", ">", 2)
+            ->where("name", "LIKE", "A%")
+            ->get();
+        $authors = (new Author)
+            ->where("id", ">", 5)
+            ->where("name", "LIKE", "B%")
+            ->get();
+        $cachedResults = $this->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+        $liveResults = (new UncachedAuthor)
+            ->where("id", ">", 5)
+            ->where("name", "LIKE", "B%")
+            ->get();
+
+        $this->assertEmpty($authors->diffKeys($cachedResults));
+        $this->assertEmpty($liveResults->diffKeys($cachedResults));
+    }
 }