Perform more robust paramter binding.

Author: mikebronner

phpunit.xml

@@ -36,5 +36,6 @@
         <env name="DB_CONNECTION" value="sqlite"/>
         <env name="DB_DATABASE" value=":memory:"/>
         <env name="REDIS_HOST" value="192.168.10.10"/>
+        <env name="PGSQL_HOST" value="192.168.10.10"/>
     </php>
 </phpunit>

phpunit.xml.dist

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    bootstrap="vendor/autoload.php"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    stopOnFailure="true"
+>
+    <testsuites>
+        <testsuite name="Setup">
+            <directory>./tests/AlwaysRunFirstTest.php</directory>
+        </testsuite>
+        <testsuite name="Feature">
+            <directory suffix="Test.php">./tests/Feature</directory>
+        </testsuite>
+        <testsuite name="Integration">
+            <directory suffix="Test.php">./tests/Integration</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="false">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+    <php>
+        <env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
+        <env name="APP_ENV" value="testing"/>
+        <env name="APP_URL" value="http://localhost"/>
+        <env name="CACHE_DRIVER" value="redis"/>
+        <env name="SESSION_DRIVER" value="array"/>
+        <env name="QUEUE_DRIVER" value="sync"/>
+        <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="DB_DATABASE" value=":memory:"/>
+        <env name="REDIS_HOST" value="127.0.0.1"/>
+        <env name="PGSQL_HOST" value="127.0.0.1"/>
+    </php>
+</phpunit>

src/CacheKey.php

@@ -229,7 +229,8 @@ protected function getInAndNotInClauses(array $where) : string
         $subquery = $this->getValuesFromWhere($where);
         $values = collect($this->query->bindings["where"][$this->currentBinding] ?? []);
         $this->currentBinding += count($where["values"]);
-        $subquery = collect(vsprintf(str_replace("?", "%s", $subquery), $values->toArray()));
+        $subquery = preg_replace('/\?(?=(?:[^"]*"[^"]*")*[^"]*\Z)/m', "_??_", $subquery);
+        $subquery = collect(vsprintf(str_replace("_??_", "%s", $subquery), $values->toArray()));
         $values = $this->recursiveImplode($subquery->toArray(), "_");
 
         return "-{$where["column"]}_{$type}{$values}";

tests/Integration/CachedBuilder/WhereJsonContainsTest.php

@@ -14,7 +14,7 @@ protected function getEnvironmentSetUp($app)
         parent::getEnvironmentSetUp($app);
 
         $app['config']->set('database.default', 'pgsql');
-        $app['config']->set('database.connections.pgsql.host', "127.0.0.1");
+        $app['config']->set('database.connections.pgsql.host', env("PGSQL_HOST", "127.0.0.1"));
         $app['config']->set('database.connections.pgsql.database', "testing");
         $app['config']->set('database.connections.pgsql.username', "homestead");
         $app['config']->set('database.connections.pgsql.password', "secret");