Skip to content

Commit a353ed3

Browse files
committed
Avoid upgrading zumba/json-serializer to 3.1.0
It has a bug that causes the tests to fail. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent e93d945 commit a353ed3

File tree

3 files changed

+9
-27
lines changed

3 files changed

+9
-27
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
3838
"psalm/plugin-phpunit": "^0.16.1",
3939
"vimeo/psalm": "^4.11",
40-
"zumba/json-serializer": "^3.0"
40+
"zumba/json-serializer": "~3.0.2"
4141
},
4242
"conflict": {
4343
"phpmyadmin/motranslator": "<3.0"

phpstan-baseline.neon

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -900,6 +900,11 @@ parameters:
900900
count: 1
901901
path: src/Utils/Formatter.php
902902

903+
-
904+
message: "#^Binary operation \"&\" between int and int\\|string results in an error\\.$#"
905+
count: 1
906+
path: src/Utils/Formatter.php
907+
903908
-
904909
message: "#^Binary operation \"&\\=\" between array\\<int, array\\<string, int\\|string\\>\\>\\|bool\\|string\\|null and array\\<int, array\\<string, int\\|string\\>\\>\\|bool\\|string\\|null results in an error\\.$#"
905910
count: 1
@@ -926,12 +931,12 @@ parameters:
926931
path: src/Utils/Formatter.php
927932

928933
-
929-
message: "#^Access to an undefined property object\\:\\:\\$alias\\.$#"
934+
message: "#^Trying to invoke int\\<min, \\-1\\>\\|int\\<1, max\\>\\|non\\-falsy\\-string but it might not be a callable\\.$#"
930935
count: 1
931-
path: src/Utils/Query.php
936+
path: src/Utils/Formatter.php
932937

933938
-
934-
message: "#^Access to an undefined property object\\:\\:\\$expr\\.$#"
939+
message: "#^Argument of an invalid type array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string\\|null\\>\\|null supplied for foreach, only iterables are supported\\.$#"
935940
count: 1
936941
path: src/Utils/Query.php
937942

@@ -940,11 +945,6 @@ parameters:
940945
count: 1
941946
path: src/Utils/Query.php
942947

943-
-
944-
message: "#^Argument of an invalid type array\\|null supplied for foreach, only iterables are supported\\.$#"
945-
count: 1
946-
path: src/Utils/Query.php
947-
948948
-
949949
message: "#^Cannot access property \\$dest on PhpMyAdmin\\\\SqlParser\\\\Components\\\\IntoKeyword\\|null\\.$#"
950950
count: 1
@@ -965,11 +965,6 @@ parameters:
965965
count: 1
966966
path: src/Utils/Query.php
967967

968-
-
969-
message: "#^Parameter \\#1 \\$component of static method PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\:\\:build\\(\\) expects array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression, object given\\.$#"
970-
count: 1
971-
path: src/Utils/Query.php
972-
973968
-
974969
message: "#^Cannot access offset 'value' on mixed\\.$#"
975970
count: 3
@@ -1125,16 +1120,6 @@ parameters:
11251120
count: 1
11261121
path: tests/Components/RenameOperationTest.php
11271122

1128-
-
1129-
message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) with 2 and PhpMyAdmin\\\\SqlParser\\\\TokensList will always evaluate to false\\.$#"
1130-
count: 1
1131-
path: tests/Lexer/TokensListTest.php
1132-
1133-
-
1134-
message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) with 112 and PhpMyAdmin\\\\SqlParser\\\\UtfString will always evaluate to false\\.$#"
1135-
count: 1
1136-
path: tests/Misc/UtfStringTest.php
1137-
11381123
-
11391124
message: "#^Cannot call method has\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#"
11401125
count: 1

psalm-baseline.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
<InvalidScalarArgument occurrences="1">
1313
<code>$arrayKey</code>
1414
</InvalidScalarArgument>
15-
<MixedArrayOffset occurrences="1">
16-
<code>Parser::$STATEMENT_PARSERS[$token-&gt;value]</code>
17-
</MixedArrayOffset>
1815
<MoreSpecificImplementedParamType occurrences="1">
1916
<code>$component</code>
2017
</MoreSpecificImplementedParamType>

0 commit comments

Comments
 (0)