Merge branch '5.9.x'

MauricioFauth · MauricioFauth · commit a6d95accd80e · 2023-09-27T12:23:04.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -201,12 +201,12 @@ parameters:
 			path: src/Components/Key.php
 
 		-
-			message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit\\:\\:\\$offset \\(int\\) does not accept mixed\\.$#"
+			message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit\\:\\:\\$offset \\(int\\|string\\) does not accept mixed\\.$#"
 			count: 1
 			path: src/Components/Limit.php
 
 		-
-			message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit\\:\\:\\$rowCount \\(int\\) does not accept mixed\\.$#"
+			message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit\\:\\:\\$rowCount \\(int\\|string\\) does not accept mixed\\.$#"
 			count: 1
 			path: src/Components/Limit.php
 
diff --git a/src/Components/Limit.php b/src/Components/Limit.php
@@ -18,20 +18,20 @@ final class Limit implements Component
     /**
      * The number of rows skipped.
      *
-     * @var int
+     * @var int|string
      */
     public $offset;
 
     /**
      * The number of rows to be returned.
      *
-     * @var int
+     * @var int|string
      */
     public $rowCount;
 
     /**
-     * @param int $rowCount the row count
-     * @param int $offset   the offset
+     * @param int|string $rowCount the row count
+     * @param int|string $offset   the offset
      */
     public function __construct($rowCount = 0, $offset = 0)
     {
@@ -85,8 +85,11 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                 continue;
             }
 
-            // Skip if not a number
-            if (($token->type !== TokenType::Number)) {
+            // Skip if not a number or a bind parameter (?)
+            if (
+                ! ($token->type === TokenType::Number
+                    || ($token->type === TokenType::Symbol && ($token->flags & Token::FLAG_SYMBOL_PARAMETER)))
+            ) {
                 break;
             }
 
diff --git a/tests/Misc/BugsTest.php b/tests/Misc/BugsTest.php
@@ -34,6 +34,7 @@ public static function bugProvider(): array
             ['bugs/gh412'],
             ['bugs/gh478'],
             ['bugs/gh492'],
+            ['bugs/gh498'],
             ['bugs/gh499'],
             ['bugs/gh508'],
             ['bugs/gh511'],
diff --git a/tests/data/bugs/gh498.in b/tests/data/bugs/gh498.in
@@ -0,0 +1,4 @@
+SELECT ?
+FROM uno
+JOIN dos  ON dos.id = uno.id
+LIMIT ? OFFSET ?
diff --git a/tests/data/bugs/gh498.out b/tests/data/bugs/gh498.out

Original file line number	Diff line number	Diff line change
`@@ -201,12 +201,12 @@ parameters:`
`201`	`201`	`path: src/Components/Key.php`
`202`	`202`
`203`	`203`	`-`
`204`		`- message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit\\:\\:\\$offset \\(int\\) does not accept mixed\\.$#"`
	`204`	`+ message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit\\:\\:\\$offset \\(int\\\|string\\) does not accept mixed\\.$#"`
`205`	`205`	`count: 1`
`206`	`206`	`path: src/Components/Limit.php`
`207`	`207`
`208`	`208`	`-`
`209`		`- message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit\\:\\:\\$rowCount \\(int\\) does not accept mixed\\.$#"`
	`209`	`+ message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit\\:\\:\\$rowCount \\(int\\\|string\\) does not accept mixed\\.$#"`
`210`	`210`	`count: 1`
`211`	`211`	`path: src/Components/Limit.php`
`212`	`212`