diff --git a/composer.json b/composer.json index 4629a76ba02..6c3857ddcee 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "squizlabs/php_codesniffer": "3.6.2", "symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", - "vimeo/psalm": "4.20.0" + "vimeo/psalm": "4.22.0" }, "conflict": { "doctrine/annotations": "<1.13 || >= 2.0" diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 3fa8ee23057..96043440c4f 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -886,12 +886,12 @@ parameters: 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\\.$#" + message: "#^Method Doctrine\\\\ORM\\\\Query\\\\Parser\\:\\:ArithmeticTerm\\(\\) should return Doctrine\\\\ORM\\\\Query\\\\AST\\\\ArithmeticTerm but returns Doctrine\\\\ORM\\\\Query\\\\AST\\\\ArithmeticFactor\\|int\\|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\\.$#" + message: "#^Method Doctrine\\\\ORM\\\\Query\\\\Parser\\:\\:SimpleArithmeticExpression\\(\\) should return Doctrine\\\\ORM\\\\Query\\\\AST\\\\SimpleArithmeticExpression but returns Doctrine\\\\ORM\\\\Query\\\\AST\\\\ArithmeticTerm\\|int\\|string\\.$#" count: 1 path: lib/Doctrine/ORM/Query/Parser.php diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 4cec76217a0..d9c888c1b35 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + IterableResult @@ -1833,15 +1833,15 @@ + + $parser->getLexer()->token['value'] + $parser->getLexer()->token['value'] $class->associationMappings - - $parser->getLexer()->token['value'] - $fieldMapping $pathExpression @@ -1916,16 +1916,18 @@ - + $value - + $value + $value + + + $lexer->token['value'] + $lexer->lookahead['value'] $lexer->token['value'] - - $lexer->token['value'] - $both $leading @@ -2305,17 +2307,16 @@ $lookaheadType - + SelectStatement|UpdateStatement|DeleteStatement - string - string - string - string - string - + + $aliasIdentVariable $factors[0] + $identVariable $primary + $resultVariable + $resultVariable $terms[0] $this->CollectionMemberExpression() $this->ComparisonExpression() @@ -2325,23 +2326,44 @@ $this->InstanceOfExpression() $this->LikeExpression() $this->NullComparisonExpression() + $this->lexer->token['value'] + $this->lexer->token['value'] - + AST\BetweenExpression| ArithmeticFactor ArithmeticTerm SimpleArithmeticExpression + string + string + string + string + string - + + $field + $field + $functionName + $functionName + $functionName $this->lexer->getLiteral($token) $this->lexer->getLiteral($token) $this->lexer->getLiteral($token) + $this->lexer->token['value'] + $this->lexer->token['value'] + $this->lexer->token['value'] + $this->lexer->token['value'] + $this->lexer->token['value'] - + $function $function $function + $token + + array{value: string, type: int|null|string, position: int}|null + $aliasIdentVariable $factors[0] @@ -2356,41 +2378,33 @@ strrpos($fromClassName, '\\') - + $AST $conditionalExpression $expr $stringExpr $this->ConditionalExpression() $this->ConditionalExpression() + $this->lexer->lookahead['value'] + $this->lexer->lookahead['value'] + $this->lexer->lookahead['value'] + $this->lexer->lookahead['value'] + $this->lexer->token['value'] + $token['value'] + $token['value'] - + $this->ConditionalExpression() $this->ConditionalExpression() + $value - + $aliasIdentVariable $dql - $field $fromClassName - $functionName - $functionName - $functionName $resultVariable - $this->lexer->lookahead['value'] - $this->lexer->lookahead['value'] - $this->lexer->lookahead['value'] - $this->lexer->lookahead['value'] - $this->lexer->token['value'] - $this->lexer->token['value'] - $this->lexer->token['value'] - $this->lexer->token['value'] - $this->lexer->token['value'] - $this->lexer->token['value'] $this->query->getDQL() $token['value'] - $token['value'] - $token['value'] $glimpse['type'] @@ -2468,9 +2482,6 @@ $token['value'] $token['value'] - - $value - getNumberOfRequiredParameters