Skip to content

Commit 37aca61

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #624 from kamil-tekiela/Fix-incorrect-type-hint
Fix incorrect type hint
2 parents 8fb3e83 + 673d98d commit 37aca61

File tree

4 files changed

+13
-232
lines changed

4 files changed

+13
-232
lines changed

‎phpstan-baseline.neon

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,12 +1194,6 @@ parameters:
11941194
count: 1
11951195
path: src/Statements/CallStatement.php
11961196

1197-
-
1198-
message: '#^Binary operation "\.\=" between mixed and string results in an error\.$#'
1199-
identifier: assignOp.invalid
1200-
count: 1
1201-
path: src/Statements/CreateStatement.php
1202-
12031197
-
12041198
message: '#^Cannot access property \$database on PhpMyAdmin\\SqlParser\\Components\\Expression\|null\.$#'
12051199
identifier: property.nonObject
@@ -1710,18 +1704,6 @@ parameters:
17101704
count: 1
17111705
path: src/Tools/ContextGenerator.php
17121706

1713-
-
1714-
message: '#^Offset 1 might not exist on array\{0\?\: string, 1\?\: non\-empty\-string, 2\?\: numeric\-string\}\.$#'
1715-
identifier: offsetAccess.notFound
1716-
count: 1
1717-
path: src/Tools/ContextGenerator.php
1718-
1719-
-
1720-
message: '#^Offset 2 might not exist on array\{0\?\: string, 1\?\: non\-empty\-string, 2\?\: numeric\-string\}\.$#'
1721-
identifier: offsetAccess.notFound
1722-
count: 1
1723-
path: src/Tools/ContextGenerator.php
1724-
17251707
-
17261708
message: '#^Parameter \#1 \$string of function trim expects string, mixed given\.$#'
17271709
identifier: argument.type
@@ -2910,6 +2892,12 @@ parameters:
29102892
count: 2
29112893
path: tests/Utils/TableTest.php
29122894

2895+
-
2896+
message: '#^Call to method PhpMyAdmin\\SqlParser\\UtfString\:\:offsetGet\(\) on a separate line has no effect\.$#'
2897+
identifier: method.resultUnused
2898+
count: 4
2899+
path: tests/benchmarks/UtfStringBench.php
2900+
29132901
-
29142902
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
29152903
identifier: empty.notAllowed

‎psalm-baseline.xml

Lines changed: 4 additions & 210 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="6.1.0@827971f8bc7a28bb4f842f34bf8901521de1cea3">
2+
<files psalm-version="6.10.3@90b5b9f5e7c8e441b191d3c82c58214753d7c7c1">
33
<file src="src/Components/AlterOperation.php">
44
<PossiblyNullReference>
55
<code><![CDATA[has]]></code>
@@ -1155,78 +1155,13 @@
11551155
<code><![CDATA[empty($statement->fields)]]></code>
11561156
</RiskyTruthyFalsyComparison>
11571157
</file>
1158-
<file src="tests/Builder/AlterStatementTest.php">
1159-
<PossiblyUnusedMethod>
1160-
<code><![CDATA[provideBuilderForAlterRoutine]]></code>
1161-
<code><![CDATA[provideBuilderForRenameColumn]]></code>
1162-
</PossiblyUnusedMethod>
1163-
</file>
1164-
<file src="tests/Builder/CreateStatementTest.php">
1165-
<PossiblyUnusedMethod>
1166-
<code><![CDATA[partitionQueriesProvider]]></code>
1167-
</PossiblyUnusedMethod>
1168-
</file>
1169-
<file src="tests/Builder/StatementTest.php">
1170-
<PossiblyUnusedMethod>
1171-
<code><![CDATA[getAliasesProvider]]></code>
1172-
</PossiblyUnusedMethod>
1173-
</file>
1174-
<file src="tests/Components/ArrayObjTest.php">
1175-
<PossiblyUnusedMethod>
1176-
<code><![CDATA[parseProvider]]></code>
1177-
</PossiblyUnusedMethod>
1178-
</file>
1179-
<file src="tests/Components/ExpressionTest.php">
1180-
<PossiblyUnusedMethod>
1181-
<code><![CDATA[mysqlCommandsProvider]]></code>
1182-
<code><![CDATA[parseErrProvider]]></code>
1183-
</PossiblyUnusedMethod>
1184-
</file>
1185-
<file src="tests/Components/GroupKeywordTest.php">
1186-
<PossiblyUnusedMethod>
1187-
<code><![CDATA[provideExpressions]]></code>
1188-
</PossiblyUnusedMethod>
1189-
</file>
1190-
<file src="tests/Components/LimitTest.php">
1191-
<PossiblyUnusedMethod>
1192-
<code><![CDATA[parseProvider]]></code>
1193-
</PossiblyUnusedMethod>
1194-
</file>
1195-
<file src="tests/Components/LockExpressionTest.php">
1196-
<PossiblyUnusedMethod>
1197-
<code><![CDATA[parseErrProvider]]></code>
1198-
</PossiblyUnusedMethod>
1199-
</file>
1200-
<file src="tests/Lexer/ContextTest.php">
1201-
<PossiblyUnusedMethod>
1202-
<code><![CDATA[contextClassesProvider]]></code>
1203-
<code><![CDATA[contextLoadingProvider]]></code>
1204-
<code><![CDATA[contextNamesProvider]]></code>
1205-
<code><![CDATA[providerForTestMode]]></code>
1206-
</PossiblyUnusedMethod>
1207-
</file>
1208-
<file src="tests/Lexer/LexerTest.php">
1209-
<PossiblyUnusedMethod>
1210-
<code><![CDATA[lexProvider]]></code>
1211-
</PossiblyUnusedMethod>
1212-
</file>
12131158
<file src="tests/Lexer/TokensListTest.php">
12141159
<InvalidArgument>
12151160
<code><![CDATA[$list]]></code>
12161161
<code><![CDATA[$list]]></code>
12171162
<code><![CDATA[$list]]></code>
12181163
</InvalidArgument>
12191164
</file>
1220-
<file src="tests/Misc/BugsTest.php">
1221-
<PossiblyUnusedMethod>
1222-
<code><![CDATA[bugProvider]]></code>
1223-
</PossiblyUnusedMethod>
1224-
</file>
1225-
<file src="tests/Misc/ParameterTest.php">
1226-
<PossiblyUnusedMethod>
1227-
<code><![CDATA[parameterProvider]]></code>
1228-
</PossiblyUnusedMethod>
1229-
</file>
12301165
<file src="tests/Misc/TranslatorTest.php">
12311166
<PossiblyFalseOperand>
12321167
<code><![CDATA[realpath(__DIR__ . '/../../src/')]]></code>
@@ -1238,120 +1173,11 @@
12381173
<code><![CDATA[$str]]></code>
12391174
<code><![CDATA[$str]]></code>
12401175
</InvalidArgument>
1241-
<PossiblyUnusedMethod>
1242-
<code><![CDATA[utf8StringsProvider]]></code>
1243-
</PossiblyUnusedMethod>
1244-
</file>
1245-
<file src="tests/Parser/AlterStatementTest.php">
1246-
<PossiblyUnusedMethod>
1247-
<code><![CDATA[alterProvider]]></code>
1248-
</PossiblyUnusedMethod>
1249-
</file>
1250-
<file src="tests/Parser/AnalyzeStatementTest.php">
1251-
<PossiblyUnusedMethod>
1252-
<code><![CDATA[analyzeProvider]]></code>
1253-
</PossiblyUnusedMethod>
1254-
</file>
1255-
<file src="tests/Parser/CallStatementTest.php">
1256-
<PossiblyUnusedMethod>
1257-
<code><![CDATA[callProvider]]></code>
1258-
</PossiblyUnusedMethod>
1259-
</file>
1260-
<file src="tests/Parser/CreateStatementTest.php">
1261-
<PossiblyUnusedMethod>
1262-
<code><![CDATA[createProvider]]></code>
1263-
</PossiblyUnusedMethod>
1264-
</file>
1265-
<file src="tests/Parser/DeleteStatementTest.php">
1266-
<PossiblyUnusedMethod>
1267-
<code><![CDATA[deleteProvider]]></code>
1268-
</PossiblyUnusedMethod>
1269-
</file>
1270-
<file src="tests/Parser/DropStatementTest.php">
1271-
<PossiblyUnusedMethod>
1272-
<code><![CDATA[dropProvider]]></code>
1273-
</PossiblyUnusedMethod>
1274-
</file>
1275-
<file src="tests/Parser/ExplainStatementTest.php">
1276-
<PossiblyUnusedMethod>
1277-
<code><![CDATA[explainProvider]]></code>
1278-
</PossiblyUnusedMethod>
1279-
</file>
1280-
<file src="tests/Parser/InsertStatementTest.php">
1281-
<PossiblyUnusedMethod>
1282-
<code><![CDATA[insertProvider]]></code>
1283-
</PossiblyUnusedMethod>
12841176
</file>
12851177
<file src="tests/Parser/KillStatementTest.php">
1286-
<PossiblyUnusedMethod>
1287-
<code><![CDATA[buildKillProvider]]></code>
1288-
<code><![CDATA[killProvider]]></code>
1289-
</PossiblyUnusedMethod>
1290-
</file>
1291-
<file src="tests/Parser/LoadStatementTest.php">
1292-
<PossiblyUnusedMethod>
1293-
<code><![CDATA[loadProvider]]></code>
1294-
</PossiblyUnusedMethod>
1295-
</file>
1296-
<file src="tests/Parser/LockStatementTest.php">
1297-
<PossiblyUnusedMethod>
1298-
<code><![CDATA[lockProvider]]></code>
1299-
</PossiblyUnusedMethod>
1300-
</file>
1301-
<file src="tests/Parser/ParserLongExportsTest.php">
1302-
<PossiblyUnusedMethod>
1303-
<code><![CDATA[exportFileProvider]]></code>
1304-
</PossiblyUnusedMethod>
1305-
</file>
1306-
<file src="tests/Parser/ParserTest.php">
1307-
<PossiblyUnusedMethod>
1308-
<code><![CDATA[parseProvider]]></code>
1309-
</PossiblyUnusedMethod>
1310-
</file>
1311-
<file src="tests/Parser/PurgeStatementTest.php">
1312-
<PossiblyUnusedMethod>
1313-
<code><![CDATA[purgeProvider]]></code>
1314-
</PossiblyUnusedMethod>
1315-
</file>
1316-
<file src="tests/Parser/RenameStatementTest.php">
1317-
<PossiblyUnusedMethod>
1318-
<code><![CDATA[renameProvider]]></code>
1319-
</PossiblyUnusedMethod>
1320-
</file>
1321-
<file src="tests/Parser/ReplaceStatementTest.php">
1322-
<PossiblyUnusedMethod>
1323-
<code><![CDATA[replaceProvider]]></code>
1324-
</PossiblyUnusedMethod>
1325-
</file>
1326-
<file src="tests/Parser/RestoreStatementTest.php">
1327-
<PossiblyUnusedMethod>
1328-
<code><![CDATA[restoreProvider]]></code>
1329-
</PossiblyUnusedMethod>
1330-
</file>
1331-
<file src="tests/Parser/SelectStatementTest.php">
1332-
<PossiblyUnusedMethod>
1333-
<code><![CDATA[selectProvider]]></code>
1334-
</PossiblyUnusedMethod>
1335-
</file>
1336-
<file src="tests/Parser/SetStatementTest.php">
1337-
<PossiblyUnusedMethod>
1338-
<code><![CDATA[setProvider]]></code>
1339-
</PossiblyUnusedMethod>
1340-
</file>
1341-
<file src="tests/Parser/TransactionStatementTest.php">
1342-
<PossiblyUnusedMethod>
1343-
<code><![CDATA[transactionProvider]]></code>
1344-
</PossiblyUnusedMethod>
1345-
</file>
1346-
<file src="tests/Parser/UpdateStatementTest.php">
1347-
<PossiblyUnusedMethod>
1348-
<code><![CDATA[updateProvider]]></code>
1349-
</PossiblyUnusedMethod>
1350-
</file>
1351-
<file src="tests/Parser/WithStatementTest.php">
1352-
<PossiblyUnusedMethod>
1353-
<code><![CDATA[parseWith]]></code>
1354-
</PossiblyUnusedMethod>
1178+
<InvalidArgument>
1179+
<code><![CDATA[testBuildKill]]></code>
1180+
</InvalidArgument>
13551181
</file>
13561182
<file src="tests/TestCase.php">
13571183
<InvalidReturnStatement>
@@ -1379,42 +1205,10 @@
13791205
<code><![CDATA[unserialize]]></code>
13801206
</PossiblyUnusedMethod>
13811207
</file>
1382-
<file src="tests/Utils/BufferedQueryTest.php">
1383-
<PossiblyUnusedMethod>
1384-
<code><![CDATA[extractProvider]]></code>
1385-
</PossiblyUnusedMethod>
1386-
</file>
1387-
<file src="tests/Utils/CLITest.php">
1388-
<PossiblyUnusedMethod>
1389-
<code><![CDATA[highlightParamsProvider]]></code>
1390-
<code><![CDATA[highlightParamsStdInProvider]]></code>
1391-
<code><![CDATA[lintParamsProvider]]></code>
1392-
<code><![CDATA[lintParamsStdInProvider]]></code>
1393-
<code><![CDATA[stdinParamsProvider]]></code>
1394-
<code><![CDATA[tokenizeParamsProvider]]></code>
1395-
<code><![CDATA[tokenizeParamsStdInProvider]]></code>
1396-
</PossiblyUnusedMethod>
1397-
</file>
1398-
<file src="tests/Utils/FormatterTest.php">
1399-
<PossiblyUnusedMethod>
1400-
<code><![CDATA[formatQueriesProviders]]></code>
1401-
<code><![CDATA[mergeFormatsProvider]]></code>
1402-
</PossiblyUnusedMethod>
1403-
</file>
14041208
<file src="tests/Utils/QueryTest.php">
14051209
<PossiblyNullArgument>
14061210
<code><![CDATA[$parser->list]]></code>
14071211
</PossiblyNullArgument>
1408-
<PossiblyUnusedMethod>
1409-
<code><![CDATA[getFlagsProvider]]></code>
1410-
<code><![CDATA[getTablesProvider]]></code>
1411-
</PossiblyUnusedMethod>
1412-
</file>
1413-
<file src="tests/Utils/TableTest.php">
1414-
<PossiblyUnusedMethod>
1415-
<code><![CDATA[getFieldsProvider]]></code>
1416-
<code><![CDATA[getForeignKeysProvider]]></code>
1417-
</PossiblyUnusedMethod>
14181212
</file>
14191213
<file src="tools/TestGenerator.php">
14201214
<RiskyTruthyFalsyComparison>

‎src/Components/Key.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ final class Key implements Component
2525
/**
2626
* The key columns
2727
*
28-
* @var array<int, array<string, int|string>>
29-
* @phpstan-var array{name?: string, length?: int, order?: string}[]
28+
* @var array{name?: string, length?: int, order?: string}[]
3029
*/
3130
public array $columns;
3231

‎src/Utils/ForeignKey.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
final class ForeignKey
88
{
99
/**
10-
* @param (int|string)[] $indexList
11-
* @param string[] $refIndexList
10+
* @param string[] $indexList
11+
* @param string[] $refIndexList
1212
*/
1313
public function __construct(
1414
public string|null $constraint = null,

0 commit comments

Comments
 (0)