Fix query flags for lower-case functions

Signed-off-by: Maximilian Krög <[email protected]>
phpmyadmin · Jul 3, 2024 · a4f7166 · a4f7166
1 parent f136374
commit a4f7166
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -955,6 +955,11 @@ parameters:
 			count: 1
 			path: src/Utils/Query.php
 
+		-
+			message: "#^Parameter \\#1 \\$string of function strtoupper expects string, mixed given\\.$#"
+			count: 1
+			path: src/Utils/Query.php
+
 		-
 			message: "#^Cannot access offset 'value' on mixed\\.$#"
 			count: 3

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1342,8 +1342,9 @@
     <InvalidNullableReturnType occurrences="1">
       <code>int</code>
     </InvalidNullableReturnType>
-    <MixedArgument occurrences="1">
+    <MixedArgument occurrences="2">
       <code>$expr</code>
+      <code>$expr-&gt;function</code>
     </MixedArgument>
     <MixedArrayOffset occurrences="2">
       <code>$clauses[$token-&gt;keyword]</code>

diff --git a/src/Utils/Query.php b/src/Utils/Query.php
@@ -36,6 +36,7 @@
 use function count;
 use function in_array;
 use function is_string;
+use function strtoupper;
 use function trim;
 
 /**
@@ -317,9 +318,10 @@ private static function getFlagsSelect($statement, $flags)
 
         foreach ($expressions as $expr) {
             if (! empty($expr->function)) {
-                if ($expr->function === 'COUNT') {
+                $function = strtoupper($expr->function);
+                if ($function === 'COUNT') {
                     $flags['is_count'] = true;
-                } elseif (in_array($expr->function, static::$FUNCTIONS)) {
+                } elseif (in_array($function, static::$FUNCTIONS, true)) {
                     $flags['is_func'] = true;
                 }
             }

diff --git a/tests/Utils/QueryTest.php b/tests/Utils/QueryTest.php
@@ -181,6 +181,24 @@ public function getFlagsProvider(): array
                     'querytype' => 'SELECT',
                 ],
             ],
+            [
+                'SELECT count(*) FROM tbl',
+                [
+                    'is_count' => true,
+                    'is_select' => true,
+                    'select_from' => true,
+                    'querytype' => 'SELECT',
+                ],
+            ],
+            [
+                'SELECT sum(*) FROM tbl',
+                [
+                    'is_func' => true,
+                    'is_select' => true,
+                    'select_from' => true,
+                    'querytype' => 'SELECT',
+                ],
+            ],
             [
                 'SELECT (SELECT "foo")',
                 [