From 1e972b6e0e3468355901a301735d859165490af2 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Wed, 12 Jan 2022 10:06:40 +0100 Subject: [PATCH] Add errors caused by the lexer update to the baselines (#9360) --- phpstan-baseline.neon | 20 ++++++++++++++++++++ psalm-baseline.xml | 33 ++++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 1329633957b..000a029dbe7 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1335,6 +1335,11 @@ parameters: count: 1 path: lib/Doctrine/ORM/Query/AST/Functions/LowerFunction.php + - + message: "#^Property Doctrine\\\\ORM\\\\Query\\\\AST\\\\Functions\\\\TrimFunction\\:\\:\\$trimChar \\(bool\\) does not accept string\\.$#" + count: 1 + path: lib/Doctrine/ORM/Query/AST/Functions/TrimFunction.php + - message: "#^Parameter \\#1 \\$simpleArithmeticExpr of method Doctrine\\\\ORM\\\\Query\\\\SqlWalker\\:\\:walkSimpleArithmeticExpression\\(\\) expects Doctrine\\\\ORM\\\\Query\\\\AST\\\\SimpleArithmeticExpression, Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node given\\.$#" count: 1 @@ -1420,6 +1425,16 @@ parameters: count: 1 path: lib/Doctrine/ORM/Query/Parser.php + - + message: "#^Method Doctrine\\\\ORM\\\\Query\\\\Parser\\:\\:ArithmeticTerm\\(\\) should return Doctrine\\\\ORM\\\\Query\\\\AST\\\\ArithmeticTerm but returns Doctrine\\\\ORM\\\\Query\\\\AST\\\\ArithmeticFactor\\|string\\.$#" + count: 1 + path: lib/Doctrine/ORM/Query/Parser.php + + - + message: "#^Method Doctrine\\\\ORM\\\\Query\\\\Parser\\:\\:SimpleArithmeticExpression\\(\\) should return Doctrine\\\\ORM\\\\Query\\\\AST\\\\SimpleArithmeticExpression but returns Doctrine\\\\ORM\\\\Query\\\\AST\\\\ArithmeticTerm\\|string\\.$#" + count: 1 + path: lib/Doctrine/ORM/Query/Parser.php + - message: """ #^PHPDoc tag @return has invalid value \\(AST\\\\BetweenExpression\\| @@ -1435,6 +1450,11 @@ parameters: count: 1 path: lib/Doctrine/ORM/Query/Parser.php + - + message: "#^Parameter \\#1 \\$tokenType of method Doctrine\\\\ORM\\\\Query\\\\Parser\\:\\:isAggregateFunction\\(\\) expects 1\\|2\\|3\\|4\\|5\\|6\\|7\\|8\\|9\\|10\\|11\\|12\\|13\\|14\\|15\\|16\\|17\\|18\\|19\\|100\\|101\\|102\\|200\\|201\\|202\\|203\\|204\\|205\\|206\\|207\\|208\\|209\\|210\\|211\\|212\\|213\\|214\\|215\\|216\\|217\\|218\\|219\\|220\\|221\\|222\\|223\\|224\\|225\\|226\\|227\\|228\\|229\\|230\\|231\\|232\\|233\\|234\\|235\\|236\\|237\\|238\\|239\\|240\\|241\\|242\\|243\\|244\\|245\\|246\\|247\\|248\\|249\\|250\\|251\\|252\\|253\\|254\\|255\\|256, int\\|string\\|null given\\.$#" + count: 2 + path: lib/Doctrine/ORM/Query/Parser.php + - message: "#^Parameter \\#2 \\$stringPattern of class Doctrine\\\\ORM\\\\Query\\\\AST\\\\LikeExpression constructor expects Doctrine\\\\ORM\\\\Query\\\\AST\\\\InputParameter, Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node given\\.$#" count: 1 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 04a2d7559c3..75ee588df6f 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -2122,6 +2122,9 @@ $class->associationMappings + + $parser->getLexer()->token['value'] + $fieldMapping $pathExpression @@ -2202,6 +2205,9 @@ + + $lexer->token['value'] + $value @@ -2589,11 +2595,21 @@ call_user_func($functionClass, $functionName) call_user_func($functionClass, $functionName) - + + $lookaheadType + + SelectStatement|UpdateStatement|DeleteStatement + string + string + string + string + string - + + $factors[0] $primary + $terms[0] $this->CollectionMemberExpression() $this->ComparisonExpression() $this->EmptyCollectionComparisonExpression() @@ -2603,9 +2619,11 @@ $this->LikeExpression() $this->NullComparisonExpression() - + AST\BetweenExpression| ArithmeticFactor + ArithmeticTerm + SimpleArithmeticExpression $this->lexer->getLiteral($token) @@ -2643,7 +2661,7 @@ $this->ConditionalExpression() $this->ConditionalExpression() - + $aliasIdentVariable $dql $field @@ -2651,7 +2669,6 @@ $functionName $functionName $functionName - $lookaheadType $resultVariable $this->lexer->lookahead['value'] $this->lexer->lookahead['value'] @@ -2668,7 +2685,7 @@ $token['value'] $token['value'] - + $glimpse['type'] $glimpse['value'] $lookahead['type'] @@ -2739,12 +2756,14 @@ $token['type'] $token['type'] $token['type'] - $token['type'] $token['value'] $token['value'] $token['value'] $token['value'] + + $value + getNumberOfRequiredParameters