Visitar URL original
Merge pull request #544 from MauricioFauth/sa-tests · phpmyadmin/sql-parser@d70677e · GitHub
Skip to content

Commit d70677e

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #544 from MauricioFauth/sa-tests
Fix issues in test files found by SA tools
2 parents 8b6d770 + b2502bd commit d70677e

35 files changed

Lines changed: 164 additions & 384 deletions

‎phpstan-baseline.neon‎

Lines changed: 3 additions & 158 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,6 @@ parameters:
2020
count: 1
2121
path: src/Components/GroupKeyword.php
2222

23-
-
24-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\JoinKeyword\\:\\:\\$expr \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
25-
count: 1
26-
path: src/Components/JoinKeyword.php
27-
28-
-
29-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\JoinKeyword\\:\\:\\$on \\(array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\Condition\\>\\) does not accept array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\Condition\\>\\|null\\.$#"
30-
count: 1
31-
path: src/Components/JoinKeyword.php
32-
33-
-
34-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\JoinKeyword\\:\\:\\$type \\(string\\) does not accept string\\|null\\.$#"
35-
count: 1
36-
path: src/Components/JoinKeyword.php
37-
38-
-
39-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\JoinKeyword\\:\\:\\$using \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\|null\\.$#"
40-
count: 1
41-
path: src/Components/JoinKeyword.php
42-
43-
-
44-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\JoinKeyword\\:\\:\\$using \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\) in empty\\(\\) is not falsy\\.$#"
45-
count: 1
46-
path: src/Components/JoinKeyword.php
47-
48-
-
49-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Key\\:\\:\\$name \\(string\\) does not accept string\\|null\\.$#"
50-
count: 1
51-
path: src/Components/Key.php
52-
53-
-
54-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Key\\:\\:\\$type \\(string\\) does not accept string\\|null\\.$#"
55-
count: 1
56-
path: src/Components/Key.php
57-
5823
-
5924
message: "#^Parameter \\#2 \\$string2 of function strcasecmp expects string, mixed given\\.$#"
6025
count: 2
@@ -296,12 +261,7 @@ parameters:
296261
path: src/Parsers/IntoKeywords.php
297262

298263
-
299-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\JoinKeyword\\:\\:\\$expr \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
300-
count: 1
301-
path: src/Parsers/JoinKeywords.php
302-
303-
-
304-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\JoinKeyword\\:\\:\\$using \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\) does not accept array\\<PhpMyAdmin\\\\SqlParser\\\\Component\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
264+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\JoinKeyword\\:\\:\\$using \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\|null\\) does not accept array\\<PhpMyAdmin\\\\SqlParser\\\\Component\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
305265
count: 1
306266
path: src/Parsers/JoinKeywords.php
307267

@@ -311,12 +271,12 @@ parameters:
311271
path: src/Parsers/Keys.php
312272

313273
-
314-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Key\\:\\:\\$name \\(string\\) does not accept mixed\\.$#"
274+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Key\\:\\:\\$name \\(string\\|null\\) does not accept mixed\\.$#"
315275
count: 1
316276
path: src/Parsers/Keys.php
317277

318278
-
319-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Key\\:\\:\\$type \\(string\\) does not accept mixed\\.$#"
279+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Key\\:\\:\\$type \\(string\\|null\\) does not accept mixed\\.$#"
320280
count: 1
321281
path: src/Parsers/Keys.php
322282

@@ -930,118 +890,3 @@ parameters:
930890
count: 2
931891
path: src/Utils/Table.php
932892

933-
-
934-
message: "#^Cannot call method __toString\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
935-
count: 2
936-
path: tests/Builder/CreateStatementTest.php
937-
938-
-
939-
message: "#^Cannot call method __toString\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#"
940-
count: 4
941-
path: tests/Builder/CreateStatementTest.php
942-
943-
-
944-
message: "#^Cannot call method isEmpty\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#"
945-
count: 4
946-
path: tests/Builder/CreateStatementTest.php
947-
948-
-
949-
message: "#^Cannot access offset 0 on array\\<PhpMyAdmin\\\\SqlParser\\\\Component\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
950-
count: 1
951-
path: tests/Components/ArrayObjTest.php
952-
953-
-
954-
message: "#^Cannot access property \\$name on PhpMyAdmin\\\\SqlParser\\\\Components\\\\DataType\\|null\\.$#"
955-
count: 1
956-
path: tests/Components/CreateDefinitionTest.php
957-
958-
-
959-
message: "#^Cannot access property \\$name on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Key\\|null\\.$#"
960-
count: 1
961-
path: tests/Components/CreateDefinitionTest.php
962-
963-
-
964-
message: "#^Cannot access property \\$type on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Key\\|null\\.$#"
965-
count: 1
966-
path: tests/Components/CreateDefinitionTest.php
967-
968-
-
969-
message: "#^Cannot call method has\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#"
970-
count: 2
971-
path: tests/Components/CreateDefinitionTest.php
972-
973-
-
974-
message: "#^Cannot access property \\$alias on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
975-
count: 2
976-
path: tests/Components/ExpressionTest.php
977-
978-
-
979-
message: "#^Cannot access property \\$expr on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
980-
count: 4
981-
path: tests/Components/ExpressionTest.php
982-
983-
-
984-
message: "#^Cannot access property \\$table on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
985-
count: 2
986-
path: tests/Components/ExpressionTest.php
987-
988-
-
989-
message: "#^Cannot cast mixed to string\\.$#"
990-
count: 1
991-
path: tests/Components/OptionsArrayTest.php
992-
993-
-
994-
message: "#^Cannot access property \\$expr on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string\\.$#"
995-
count: 2
996-
path: tests/Components/PartitionDefinitionTest.php
997-
998-
-
999-
message: "#^Cannot call method has\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#"
1000-
count: 1
1001-
path: tests/Parser/LoadStatementTest.php
1002-
1003-
-
1004-
message: "#^Argument of an invalid type array\\<PhpMyAdmin\\\\SqlParser\\\\Statement\\>\\|null supplied for foreach, only iterables are supported\\.$#"
1005-
count: 1
1006-
path: tests/Parser/ParserLongExportsTest.php
1007-
1008-
-
1009-
message: "#^Cannot call method has\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#"
1010-
count: 1
1011-
path: tests/Parser/SelectStatementTest.php
1012-
1013-
-
1014-
message: "#^Parameter \\#2 \\$list of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Query\\:\\:getClause\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\TokensList, PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null given\\.$#"
1015-
count: 9
1016-
path: tests/Utils/QueryTest.php
1017-
1018-
-
1019-
message: "#^Parameter \\#2 \\$list of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Query\\:\\:replaceClause\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\TokensList, PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null given\\.$#"
1020-
count: 4
1021-
path: tests/Utils/QueryTest.php
1022-
1023-
-
1024-
message: "#^Parameter \\#2 \\$list of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Query\\:\\:replaceClauses\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\TokensList, PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null given\\.$#"
1025-
count: 3
1026-
path: tests/Utils/QueryTest.php
1027-
1028-
-
1029-
message: "#^Parameter \\#1 \\$statement of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Routine\\:\\:getParameters\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\Statements\\\\CreateStatement, PhpMyAdmin\\\\SqlParser\\\\Statement given\\.$#"
1030-
count: 1
1031-
path: tests/Utils/RoutineTest.php
1032-
1033-
-
1034-
message: "#^Parameter \\#1 \\$statement of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Table\\:\\:getFields\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\Statements\\\\CreateStatement, PhpMyAdmin\\\\SqlParser\\\\Statement given\\.$#"
1035-
count: 1
1036-
path: tests/Utils/TableTest.php
1037-
1038-
-
1039-
message: "#^Parameter \\#1 \\$statement of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Table\\:\\:getForeignKeys\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\Statements\\\\CreateStatement, PhpMyAdmin\\\\SqlParser\\\\Statement given\\.$#"
1040-
count: 1
1041-
path: tests/Utils/TableTest.php
1042-
1043-
-
1044-
message: "#^Expression \"\\$str1\\[\\$i\\]\" on a separate line does not do anything\\.$#"
1045-
count: 1
1046-
path: tests/benchmarks/UtfStringBench.php
1047-

0 commit comments

Comments
 (0)