Remove SqlParser\Utils\Query::getAll() stub

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-09-28 12:57:03 -03:00 · 2023-09-28 12:57:03 -03:00 · b338c1851d
commit b338c1851d
parent ed3c95bc4f
5 changed files with 80 additions and 75 deletions
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@ -13120,11 +13120,41 @@ parameters:
 			count: 2
 			path: src/Operations.php

+		-
+			message: "#^Cannot access offset 0 on mixed\\.$#"
+			count: 4
+			path: src/ParseAnalyze.php
+
+		-
+			message: "#^Cannot access offset 1 on mixed\\.$#"
+			count: 2
+			path: src/ParseAnalyze.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/ParseAnalyze.php

+		-
+			message: "#^Offset 'select_tables' on array\\{distinct\\?\\: bool, drop_database\\?\\: bool, group\\?\\: bool, having\\?\\: bool, is_affected\\?\\: bool, is_analyse\\?\\: bool, is_count\\?\\: bool, is_delete\\?\\: bool, \\.\\.\\.\\}&array\\{select_expr\\?\\: array\\<string\\|null\\>, select_tables\\?\\: array\\<array\\{string, string\\|null\\}\\>, statement\\?\\: PhpMyAdmin\\\\SqlParser\\\\Statement\\|null, parser\\?\\: PhpMyAdmin\\\\SqlParser\\\\Parser\\} in empty\\(\\) does not exist\\.$#"
+			count: 1
+			path: src/ParseAnalyze.php
+
+		-
+			message: "#^Parameter \\#1 \\$info of static method PhpMyAdmin\\\\StatementInfo\\:\\:fromArray\\(\\) expects array\\{distinct\\: bool, drop_database\\: bool, group\\: bool, having\\: bool, is_affected\\: bool, is_analyse\\: bool, is_count\\: bool, is_delete\\: bool, \\.\\.\\.\\}, array\\{distinct\\?\\: bool, drop_database\\?\\: bool, group\\?\\: bool, having\\?\\: bool, is_affected\\?\\: bool, is_analyse\\?\\: bool, is_count\\?\\: bool, is_delete\\?\\: bool, \\.\\.\\.\\}&array\\{select_expr\\?\\: array\\<string\\|null\\>, select_tables\\?\\: array\\<array\\{string, string\\|null\\}\\>, statement\\?\\: PhpMyAdmin\\\\SqlParser\\\\Statement\\|null, parser\\?\\: PhpMyAdmin\\\\SqlParser\\\\Parser\\} given\\.$#"
+			count: 1
+			path: src/ParseAnalyze.php
+
+		-
+			message: "#^Parameter \\#1 \\$string1 of function strcasecmp expects string, mixed given\\.$#"
+			count: 1
+			path: src/ParseAnalyze.php
+
+		-
+			message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, mixed given\\.$#"
+			count: 1
+			path: src/ParseAnalyze.php
+
 		-
 			message: "#^Cannot access offset 'Table' on mixed\\.$#"
 			count: 4
@ -17955,6 +17985,11 @@ parameters:
 			count: 1
 			path: src/Sql.php

+		-
+			message: "#^Parameter \\#1 \\$info of static method PhpMyAdmin\\\\StatementInfo\\:\\:fromArray\\(\\) expects array\\{distinct\\: bool, drop_database\\: bool, group\\: bool, having\\: bool, is_affected\\: bool, is_analyse\\: bool, is_count\\: bool, is_delete\\: bool, \\.\\.\\.\\}, array\\{distinct\\?\\: bool, drop_database\\?\\: bool, group\\?\\: bool, having\\?\\: bool, is_affected\\?\\: bool, is_analyse\\?\\: bool, is_count\\?\\: bool, is_delete\\?\\: bool, \\.\\.\\.\\}&array\\{select_expr\\?\\: array\\<string\\|null\\>, select_tables\\?\\: array\\<array\\{string, string\\|null\\}\\>, statement\\?\\: PhpMyAdmin\\\\SqlParser\\\\Statement\\|null, parser\\?\\: PhpMyAdmin\\\\SqlParser\\\\Parser\\} given\\.$#"
+			count: 1
+			path: src/Sql.php
+
 		-
 			message: "#^Parameter \\#1 \\$rows of static method PhpMyAdmin\\\\Message\\:\\:getMessageForAffectedRows\\(\\) expects int, int\\|string given\\.$#"
 			count: 2
@ -20525,6 +20560,11 @@ parameters:
 			count: 2
 			path: test/classes/Display/ResultsTest.php

+		-
+			message: "#^Parameter \\#1 \\$info of static method PhpMyAdmin\\\\StatementInfo\\:\\:fromArray\\(\\) expects array\\{distinct\\: bool, drop_database\\: bool, group\\: bool, having\\: bool, is_affected\\: bool, is_analyse\\: bool, is_count\\: bool, is_delete\\: bool, \\.\\.\\.\\}, array\\{distinct\\?\\: bool, drop_database\\?\\: bool, group\\?\\: bool, having\\?\\: bool, is_affected\\?\\: bool, is_analyse\\?\\: bool, is_count\\?\\: bool, is_delete\\?\\: bool, \\.\\.\\.\\}&array\\{select_expr\\?\\: array\\<string\\|null\\>, select_tables\\?\\: array\\<array\\{string, string\\|null\\}\\>, statement\\?\\: PhpMyAdmin\\\\SqlParser\\\\Statement\\|null, parser\\?\\: PhpMyAdmin\\\\SqlParser\\\\Parser\\} given\\.$#"
+			count: 3
+			path: test/classes/Display/ResultsTest.php
+
 		-
 			message: "#^Parameter \\#1 \\$string of function htmlspecialchars_decode expects string, mixed given\\.$#"
 			count: 1
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@ -13,7 +13,6 @@ parameters:
    bootstrapFiles:
        - test/phpstan-constants.php
    stubFiles:
-        - test/stubs/Query.stub
        - test/stubs/uploadprogress.stub
    excludePaths:
        - libraries/cache/*
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@ -7959,6 +7959,11 @@
      <code><![CDATA['data']]></code>
    </TypeDoesNotContainNull>
  </file>
+  <file src="src/ParseAnalyze.php">
+    <ArgumentTypeCoercion>
+      <code>$info</code>
+    </ArgumentTypeCoercion>
+  </file>
  <file src="src/Partitioning/Maintenance.php">
    <MixedArrayAccess>
      <code><![CDATA[$row['Table']]]></code>
@ -9628,13 +9633,6 @@
    </PossiblyUnusedReturnValue>
  </file>
  <file src="src/Plugins/Import/ImportShp.php">
-    <DeprecatedMethod>
-      <code>Config::getInstance()</code>
-      <code>DatabaseInterface::getInstance()</code>
-    </DeprecatedMethod>
-    <InvalidArgument>
-      <code>$sqlStatements</code>
-    </InvalidArgument>
    <InvalidArrayOffset>
      <code><![CDATA[$GLOBALS['buffer']]]></code>
      <code><![CDATA[$GLOBALS['eof']]]></code>
@ -9645,16 +9643,22 @@
      <code><![CDATA[$GLOBALS['buffer']]]></code>
      <code><![CDATA[$GLOBALS['buffer']]]></code>
      <code><![CDATA[$GLOBALS['importHandle']]]></code>
+      <code>$dbfFileName</code>
      <code>$dbfFilePath</code>
      <code>$dbfFilePath</code>
-      <code>$gisType</code>
+      <code>$extracted</code>
+      <code>$result</code>
+      <code><![CDATA[$shp->getDBFHeader()]]></code>
    </MixedArgument>
    <MixedArrayAccess>
      <code>$c[0]</code>
+      <code>$dbfHeader[$n]</code>
      <code>$dbfHeader[$n][0]</code>
    </MixedArrayAccess>
    <MixedArrayAssignment>
+      <code>$analyses[$tableNo][Import::FORMATTEDSQL]</code>
      <code>$analyses[$tableNo][Import::FORMATTEDSQL][$spatialCol]</code>
+      <code>$analyses[$tableNo][Import::TYPES]</code>
      <code>$analyses[$tableNo][Import::TYPES][$spatialCol]</code>
    </MixedArrayAssignment>
    <MixedArrayOffset>
@ -9665,29 +9669,38 @@
      <code><![CDATA[$GLOBALS['eof']]]></code>
      <code><![CDATA[$GLOBALS['importHandle']]]></code>
      <code><![CDATA[$GLOBALS['local_import_file']]]></code>
+      <code><![CDATA[$GLOBALS['message']]]></code>
+      <code><![CDATA[$GLOBALS['message']]]></code>
+      <code><![CDATA[$GLOBALS['message']]]></code>
+      <code>$analyses[]</code>
      <code>$c</code>
      <code>$colNames[]</code>
+      <code>$config</code>
+      <code>$dbfFileName</code>
+      <code>$dbfFileName</code>
+      <code>$dbfHeader</code>
+      <code>$extracted</code>
+      <code>$result</code>
+      <code>$temp</code>
    </MixedAssignment>
    <MixedOperand>
      <code><![CDATA[$GLOBALS['buffer']]]></code>
-      <code><![CDATA[$gisObj->getShape($record->shpData)]]></code>
+      <code>$dbfFileName</code>
+      <code>$temp</code>
    </MixedOperand>
-    <PossiblyInvalidArrayAssignment>
-      <code>$analyses[$tableNo][Import::FORMATTEDSQL]</code>
-      <code>$analyses[$tableNo][Import::TYPES]</code>
-    </PossiblyInvalidArrayAssignment>
+    <MixedPropertyFetch>
+      <code><![CDATA[$config->settings]]></code>
+    </MixedPropertyFetch>
+    <MixedReturnTypeCoercion>
+      <code>$sqlStatements</code>
+      <code>string[]</code>
+    </MixedReturnTypeCoercion>
    <PossiblyNullArgument>
      <code><![CDATA[$GLOBALS['buffer']]]></code>
      <code><![CDATA[$GLOBALS['buffer']]]></code>
      <code><![CDATA[$GLOBALS['import_file']]]></code>
      <code><![CDATA[$GLOBALS['import_file']]]></code>
-      <code><![CDATA[$GLOBALS['import_file']]]></code>
-      <code><![CDATA[$GLOBALS['import_file']]]></code>
-      <code><![CDATA[$shp->getDBFHeader()]]></code>
    </PossiblyNullArgument>
-    <PossiblyNullIterator>
-      <code><![CDATA[$shp->getDBFHeader()]]></code>
-    </PossiblyNullIterator>
    <PossiblyUnusedReturnValue>
      <code>string[]</code>
    </PossiblyUnusedReturnValue>
@ -11749,6 +11762,9 @@
    </MixedAssignment>
  </file>
  <file src="src/Sql.php">
+    <ArgumentTypeCoercion>
+      <code>Query::getAll($fullSqlQuery)</code>
+    </ArgumentTypeCoercion>
    <DeprecatedMethod>
      <code>Config::getInstance()</code>
      <code>Config::getInstance()</code>
@ -14472,6 +14488,11 @@
    </PossiblyUnusedMethod>
  </file>
  <file src="test/classes/Display/ResultsTest.php">
+    <ArgumentTypeCoercion>
+      <code>Query::getAll($query)</code>
+      <code>Query::getAll($query)</code>
+      <code><![CDATA[Query::getAll('SELECT * FROM pma')]]></code>
+    </ArgumentTypeCoercion>
    <DeprecatedMethod>
      <code>Config::getInstance()</code>
      <code>Config::getInstance()</code>
@ -15527,7 +15548,6 @@
    </InvalidArrayOffset>
    <MixedArgument>
      <code><![CDATA[$GLOBALS['import_notice']]]></code>
-      <code><![CDATA[$GLOBALS['import_notice']]]></code>
    </MixedArgument>
    <RedundantCondition>
      <code>assertFalse</code>
--- a/psalm.xml
+++ b/psalm.xml
@ -30,7 +30,6 @@
    </projectFiles>

    <stubs>
-        <file name="test/stubs/Query.stub"/>
        <file name="test/stubs/uploadprogress.stub"/>
    </stubs>

--- a/test/stubs/Query.stub
+++ b/test/stubs/Query.stub
@ -1,53 +0,0 @@
-<?php
-
-namespace PhpMyAdmin\SqlParser;
-
-class Core {}
-class Parser extends Core {}
-abstract class Statement {}
-
-namespace PhpMyAdmin\SqlParser\Utils;
-
-use PhpMyAdmin\SqlParser\Parser;
-use PhpMyAdmin\SqlParser\Statement;
-
-class Query
-{
-    /**
-     * @param string $query
-     * @return array{
-     *   distinct: bool,
-     *   drop_database: bool,
-     *   group: bool,
-     *   having: bool,
-     *   is_affected: bool,
-     *   is_analyse: bool,
-     *   is_count: bool,
-     *   is_delete: bool,
-     *   is_explain: bool,
-     *   is_export: bool,
-     *   is_func: bool,
-     *   is_group: bool,
-     *   is_insert: bool,
-     *   is_maint: bool,
-     *   is_procedure: bool,
-     *   is_replace: bool,
-     *   is_select: bool,
-     *   is_show: bool,
-     *   is_subquery: bool,
-     *   join: bool,
-     *   limit: bool,
-     *   offset: bool,
-     *   order: bool,
-     *   querytype: ('ALTER'|'ANALYZE'|'CALL'|'CHECK'|'CHECKSUM'|'CREATE'|'DELETE'|'DROP'|'EXPLAIN'|'INSERT'|'LOAD'|'OPTIMIZE'|'REPAIR'|'REPLACE'|'SELECT'|'SET'|'SHOW'|'UPDATE'|false),
-     *   reload: bool,
-     *   select_from: bool,
-     *   union: bool,
-     *   parser?: Parser,
-     *   statement?: Statement,
-     *   select_tables?: list<array{string|null, string|null}>,
-     *   select_expr?: list<string|null>
-     * }
-     */
-    public static function getAll($query);
-}