Skip to content

Fix incorrect type hint #624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 22, 2025
+13 −232
Merged

Fix incorrect type hint #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af955da
Fix incorrect type hint
kamil-tekiela May 5, 2025
673d98d
Update psalm-baseline.xml
kamil-tekiela May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,12 +1194,6 @@ parameters:
count: 1
path: src/Statements/CallStatement.php

-
message: '#^Binary operation "\.\=" between mixed and string results in an error\.$#'
identifier: assignOp.invalid
count: 1
path: src/Statements/CreateStatement.php

-
message: '#^Cannot access property \$database on PhpMyAdmin\\SqlParser\\Components\\Expression\|null\.$#'
identifier: property.nonObject
Expand Down Expand Up @@ -1710,18 +1704,6 @@ parameters:
count: 1
path: src/Tools/ContextGenerator.php

-
message: '#^Offset 1 might not exist on array\{0\?\: string, 1\?\: non\-empty\-string, 2\?\: numeric\-string\}\.$#'
identifier: offsetAccess.notFound
count: 1
path: src/Tools/ContextGenerator.php

-
message: '#^Offset 2 might not exist on array\{0\?\: string, 1\?\: non\-empty\-string, 2\?\: numeric\-string\}\.$#'
identifier: offsetAccess.notFound
count: 1
path: src/Tools/ContextGenerator.php

-
message: '#^Parameter \#1 \$string of function trim expects string, mixed given\.$#'
identifier: argument.type
Expand Down Expand Up @@ -2910,6 +2892,12 @@ parameters:
count: 2
path: tests/Utils/TableTest.php

-
message: '#^Call to method PhpMyAdmin\\SqlParser\\UtfString\:\:offsetGet\(\) on a separate line has no effect\.$#'
identifier: method.resultUnused
count: 4
path: tests/benchmarks/UtfStringBench.php

-
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
identifier: empty.notAllowed
Expand Down
214 changes: 4 additions & 210 deletions psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="6.1.0@827971f8bc7a28bb4f842f34bf8901521de1cea3">
<files psalm-version="6.10.3@90b5b9f5e7c8e441b191d3c82c58214753d7c7c1">
<file src="src/Components/AlterOperation.php">
<PossiblyNullReference>
<code><![CDATA[has]]></code>
Expand Down Expand Up @@ -1155,78 +1155,13 @@
<code><![CDATA[empty($statement->fields)]]></code>
</RiskyTruthyFalsyComparison>
</file>
<file src="tests/Builder/AlterStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[provideBuilderForAlterRoutine]]></code>
<code><![CDATA[provideBuilderForRenameColumn]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Builder/CreateStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[partitionQueriesProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Builder/StatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[getAliasesProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Components/ArrayObjTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[parseProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Components/ExpressionTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[mysqlCommandsProvider]]></code>
<code><![CDATA[parseErrProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Components/GroupKeywordTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[provideExpressions]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Components/LimitTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[parseProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Components/LockExpressionTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[parseErrProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Lexer/ContextTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[contextClassesProvider]]></code>
<code><![CDATA[contextLoadingProvider]]></code>
<code><![CDATA[contextNamesProvider]]></code>
<code><![CDATA[providerForTestMode]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Lexer/LexerTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[lexProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Lexer/TokensListTest.php">
<InvalidArgument>
<code><![CDATA[$list]]></code>
<code><![CDATA[$list]]></code>
<code><![CDATA[$list]]></code>
</InvalidArgument>
</file>
<file src="tests/Misc/BugsTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[bugProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Misc/ParameterTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[parameterProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Misc/TranslatorTest.php">
<PossiblyFalseOperand>
<code><![CDATA[realpath(__DIR__ . '/../../src/')]]></code>
Expand All @@ -1238,120 +1173,11 @@
<code><![CDATA[$str]]></code>
<code><![CDATA[$str]]></code>
</InvalidArgument>
<PossiblyUnusedMethod>
<code><![CDATA[utf8StringsProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/AlterStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[alterProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/AnalyzeStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[analyzeProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/CallStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[callProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/CreateStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[createProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/DeleteStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[deleteProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/DropStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[dropProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/ExplainStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[explainProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/InsertStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[insertProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/KillStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[buildKillProvider]]></code>
<code><![CDATA[killProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/LoadStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[loadProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/LockStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[lockProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/ParserLongExportsTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[exportFileProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/ParserTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[parseProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/PurgeStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[purgeProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/RenameStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[renameProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/ReplaceStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[replaceProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/RestoreStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[restoreProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/SelectStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[selectProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/SetStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[setProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/TransactionStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[transactionProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/UpdateStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[updateProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Parser/WithStatementTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[parseWith]]></code>
</PossiblyUnusedMethod>
<InvalidArgument>
<code><![CDATA[testBuildKill]]></code>
</InvalidArgument>
</file>
<file src="tests/TestCase.php">
<InvalidReturnStatement>
Expand Down Expand Up @@ -1379,42 +1205,10 @@
<code><![CDATA[unserialize]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Utils/BufferedQueryTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[extractProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Utils/CLITest.php">
<PossiblyUnusedMethod>
<code><![CDATA[highlightParamsProvider]]></code>
<code><![CDATA[highlightParamsStdInProvider]]></code>
<code><![CDATA[lintParamsProvider]]></code>
<code><![CDATA[lintParamsStdInProvider]]></code>
<code><![CDATA[stdinParamsProvider]]></code>
<code><![CDATA[tokenizeParamsProvider]]></code>
<code><![CDATA[tokenizeParamsStdInProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Utils/FormatterTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[formatQueriesProviders]]></code>
<code><![CDATA[mergeFormatsProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Utils/QueryTest.php">
<PossiblyNullArgument>
<code><![CDATA[$parser->list]]></code>
</PossiblyNullArgument>
<PossiblyUnusedMethod>
<code><![CDATA[getFlagsProvider]]></code>
<code><![CDATA[getTablesProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tests/Utils/TableTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[getFieldsProvider]]></code>
<code><![CDATA[getForeignKeysProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="tools/TestGenerator.php">
<RiskyTruthyFalsyComparison>
Expand Down
3 changes: 1 addition & 2 deletions src/Components/Key.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@
/**
* The key columns
*
* @var array<int, array<string, int|string>>
* @phpstan-var array{name?: string, length?: int, order?: string}[]
* @var array{name?: string, length?: int, order?: string}[]
*/
public array $columns;

Check failure on line 30 in src/Components/Key.php

View workflow job for this annotation

GitHub Actions / lint-docs 

The hint on "columns" at @var is invalid: "array{name?: string, length?: int, order?: string}[]" on "PhpMyAdmin\SqlParser\Components\Key::$columns"

/**
* The type of this key.
Expand Down Expand Up @@ -79,7 +78,7 @@
foreach ($this->columns as $column) {
$tmp = '';
if (isset($column['name'])) {
$tmp .= Context::escape($column['name']);

Check warning on line 81 in src/Components/Key.php

View workflow job for this annotation

GitHub Actions / Mutation tests with PHP 8.2 

Escaped Mutant for Mutator "Assignment":

--- Original
+++ New
@@ @@
         foreach ($this->columns as $column) {
             $tmp = '';
             if (isset($column['name'])) {
-                $tmp .= Context::escape($column['name']);
+                $tmp = Context::escape($column['name']);
             }
             if (isset($column['length'])) {
                 $tmp .= '(' . $column['length'] . ')';
}

if (isset($column['length'])) {
Expand Down
4 changes: 2 additions & 2 deletions src/Utils/ForeignKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
final class ForeignKey
{
/**
* @param (int|string)[] $indexList
* @param string[] $refIndexList
* @param string[] $indexList
* @param string[] $refIndexList
*/
public function __construct(
public string|null $constraint = null,
Expand Down
Loading