Support nested quotes (#651)

staabm · May 16, 2024 · 7079671 · 7079671
1 parent d20f0bc
commit 7079671
Show file tree

Hide file tree

Showing 8 changed files with 6,021 additions and 7,373 deletions.
diff --git a/.phpstan-dba-mysqli.cache b/.phpstan-dba-mysqli.cache
diff --git a/.phpstan-dba-pdo-mysql.cache b/.phpstan-dba-pdo-mysql.cache
diff --git a/src/QueryReflection/QueryReflection.php b/src/QueryReflection/QueryReflection.php
@@ -42,9 +42,9 @@ final class QueryReflection
     // see https://github.com/php/php-src/blob/01b3fc03c30c6cb85038250bb5640be3a09c6a32/ext/pdo/pdo_sql_parser.re#L48
     private const NAMED_PATTERN = ':[a-zA-Z0-9_]+';
 
-    private const REGEX_UNNAMED_PLACEHOLDER = '{(["\'])([^"\']*\1)|(' . self::UNNAMED_PATTERN . ')}';
+    private const REGEX_UNNAMED_PLACEHOLDER = '{(["\'])((?:(?!\1).)*\1)|(' . self::UNNAMED_PATTERN . ')}';
 
-    private const REGEX_NAMED_PLACEHOLDER = '{(["\'])([^"\']*\1)|(' . self::NAMED_PATTERN . ')}';
+    private const REGEX_NAMED_PLACEHOLDER = '{(["\'])((?:(?!\1).)*\1)|(' . self::NAMED_PATTERN . ')}';
 
     /**
      * @var QueryReflector|null

diff --git a/tests/rules/SyntaxErrorInQueryFunctionRuleTest.php b/tests/rules/SyntaxErrorInQueryFunctionRuleTest.php
@@ -115,6 +115,10 @@ public function testMysqliExecuteQuery(): void
             self::markTestSkipped('Test requires PHP 8.2.');
         }
 
+        if (MysqliQueryReflector::NAME !== getenv('DBA_REFLECTOR')) {
+            self::markTestSkipped('mysqli test only.');
+        }
+
         $this->analyse([__DIR__ . '/data/mysqli_execute_query.php'], [
             [
                 "Query error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near 'freigabe1u1 FROM ada LIMIT 0' at line 1 (1064).",

diff --git a/tests/rules/SyntaxErrorInQueryMethodRuleTest.php b/tests/rules/SyntaxErrorInQueryMethodRuleTest.php
@@ -292,6 +292,10 @@ public function testMysqliExecuteQuery(): void
             self::markTestSkipped('Test requires PHP 8.2.');
         }
 
+        if (MysqliQueryReflector::NAME !== getenv('DBA_REFLECTOR')) {
+            self::markTestSkipped('mysqli test only.');
+        }
+
         $this->analyse([__DIR__ . '/data/mysqli_execute_query.php'], [
             [
                 "Query error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL/MariaDB server version for the right syntax to use near 'freigabe1u1 FROM ada LIMIT 0' at line 1 (1064).",

diff --git a/tests/rules/config/.phpunit-phpstan-dba-mysqli.cache b/tests/rules/config/.phpunit-phpstan-dba-mysqli.cache
diff --git a/tests/rules/config/.phpunit-phpstan-dba-pdo-mysql.cache b/tests/rules/config/.phpunit-phpstan-dba-pdo-mysql.cache
diff --git a/tests/rules/data/pdo-stmt-execute-error.php b/tests/rules/data/pdo-stmt-execute-error.php
@@ -127,4 +127,13 @@ public function bug422UnnamedPlaceholdersInCommentInsideOfQuery(PDO $pdo)
         $stmt = $pdo->prepare('SELECT email, adaid /* why? ? */ FROM ada /* just ?? :because ?*/ WHERE email = :email -- ?');
         $stmt->execute(['email' => 'a']);
     }
+
+    public function supportNestedQuotes(PDO $pdo)
+    {
+        $stmt = $pdo->prepare(<<<SQL
+SELECT payload ->> '$."dash-separated"' = :value FROM ada WHERE 'foo'
+SQL
+        );
+        $stmt->execute(['value' => 'bar']);
+    }
 }