Skip to content

Commit

Permalink
Avoid upgrading zumba/json-serializer to 3.1.0
Browse files Browse the repository at this point in the history
It has a bug that causes the tests to fail.

Signed-off-by: Maurício Meneghini Fauth <[email protected]>
  • Loading branch information
MauricioFauth committed Sep 15, 2023
1 parent e93d945 commit a353ed3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 27 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"psalm/plugin-phpunit": "^0.16.1",
"vimeo/psalm": "^4.11",
"zumba/json-serializer": "^3.0"
"zumba/json-serializer": "~3.0.2"
},
"conflict": {
"phpmyadmin/motranslator": "<3.0"
Expand Down
31 changes: 8 additions & 23 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,11 @@ parameters:
count: 1
path: src/Utils/Formatter.php

-
message: "#^Binary operation \"&\" between int and int\\|string results in an error\\.$#"
count: 1
path: src/Utils/Formatter.php

-
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\\.$#"
count: 1
Expand All @@ -926,12 +931,12 @@ parameters:
path: src/Utils/Formatter.php

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

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

Expand All @@ -940,11 +945,6 @@ parameters:
count: 1
path: src/Utils/Query.php

-
message: "#^Argument of an invalid type array\\|null supplied for foreach, only iterables are supported\\.$#"
count: 1
path: src/Utils/Query.php

-
message: "#^Cannot access property \\$dest on PhpMyAdmin\\\\SqlParser\\\\Components\\\\IntoKeyword\\|null\\.$#"
count: 1
Expand All @@ -965,11 +965,6 @@ parameters:
count: 1
path: src/Utils/Query.php

-
message: "#^Parameter \\#1 \\$component of static method PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\:\\:build\\(\\) expects array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression, object given\\.$#"
count: 1
path: src/Utils/Query.php

-
message: "#^Cannot access offset 'value' on mixed\\.$#"
count: 3
Expand Down Expand Up @@ -1125,16 +1120,6 @@ parameters:
count: 1
path: tests/Components/RenameOperationTest.php

-
message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) with 2 and PhpMyAdmin\\\\SqlParser\\\\TokensList will always evaluate to false\\.$#"
count: 1
path: tests/Lexer/TokensListTest.php

-
message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) with 112 and PhpMyAdmin\\\\SqlParser\\\\UtfString will always evaluate to false\\.$#"
count: 1
path: tests/Misc/UtfStringTest.php

-
message: "#^Cannot call method has\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#"
count: 1
Expand Down
3 changes: 0 additions & 3 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
<InvalidScalarArgument occurrences="1">
<code>$arrayKey</code>
</InvalidScalarArgument>
<MixedArrayOffset occurrences="1">
<code>Parser::$STATEMENT_PARSERS[$token-&gt;value]</code>
</MixedArrayOffset>
<MoreSpecificImplementedParamType occurrences="1">
<code>$component</code>
</MoreSpecificImplementedParamType>
Expand Down

0 comments on commit a353ed3

Please sign in to comment.