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 @@
     <PossiblyNullArrayOffset occurrences="1">
       <code>$class-&gt;associationMappings</code>
     </PossiblyNullArrayOffset>
+    <PossiblyNullPropertyAssignmentValue occurrences="1">
+      <code>$parser-&gt;getLexer()-&gt;token['value']</code>
+    </PossiblyNullPropertyAssignmentValue>
     <PropertyNotSetInConstructor occurrences="2">
       <code>$fieldMapping</code>
       <code>$pathExpression</code>
@@ -2202,6 +2205,9 @@
     </PropertyNotSetInConstructor>
   </file>
   <file src="lib/Doctrine/ORM/Query/AST/Functions/TrimFunction.php">
+    <InvalidPropertyAssignmentValue occurrences="1">
+      <code>$lexer-&gt;token['value']</code>
+    </InvalidPropertyAssignmentValue>
     <PossiblyNullArgument occurrences="1">
       <code>$value</code>
     </PossiblyNullArgument>
@@ -2589,11 +2595,21 @@
       <code>call_user_func($functionClass, $functionName)</code>
       <code>call_user_func($functionClass, $functionName)</code>
     </DocblockTypeContradiction>
-    <InvalidNullableReturnType occurrences="1">
+    <InvalidArgument occurrences="1">
+      <code>$lookaheadType</code>
+    </InvalidArgument>
+    <InvalidNullableReturnType occurrences="6">
       <code>SelectStatement|UpdateStatement|DeleteStatement</code>
+      <code>string</code>
+      <code>string</code>
+      <code>string</code>
+      <code>string</code>
+      <code>string</code>
     </InvalidNullableReturnType>
-    <InvalidReturnStatement occurrences="9">
+    <InvalidReturnStatement occurrences="11">
+      <code>$factors[0]</code>
       <code>$primary</code>
+      <code>$terms[0]</code>
       <code>$this-&gt;CollectionMemberExpression()</code>
       <code>$this-&gt;ComparisonExpression()</code>
       <code>$this-&gt;EmptyCollectionComparisonExpression()</code>
@@ -2603,9 +2619,11 @@
       <code>$this-&gt;LikeExpression()</code>
       <code>$this-&gt;NullComparisonExpression()</code>
     </InvalidReturnStatement>
-    <InvalidReturnType occurrences="2">
+    <InvalidReturnType occurrences="4">
       <code>AST\BetweenExpression|</code>
       <code>ArithmeticFactor</code>
+      <code>ArithmeticTerm</code>
+      <code>SimpleArithmeticExpression</code>
     </InvalidReturnType>
     <InvalidScalarArgument occurrences="3">
       <code>$this-&gt;lexer-&gt;getLiteral($token)</code>
@@ -2643,7 +2661,7 @@
       <code>$this-&gt;ConditionalExpression()</code>
       <code>$this-&gt;ConditionalExpression()</code>
     </PossiblyInvalidPropertyAssignmentValue>
-    <PossiblyNullArgument occurrences="23">
+    <PossiblyNullArgument occurrences="22">
       <code>$aliasIdentVariable</code>
       <code>$dql</code>
       <code>$field</code>
@@ -2651,7 +2669,6 @@
       <code>$functionName</code>
       <code>$functionName</code>
       <code>$functionName</code>
-      <code>$lookaheadType</code>
       <code>$resultVariable</code>
       <code>$this-&gt;lexer-&gt;lookahead['value']</code>
       <code>$this-&gt;lexer-&gt;lookahead['value']</code>
@@ -2668,7 +2685,7 @@
       <code>$token['value']</code>
       <code>$token['value']</code>
     </PossiblyNullArgument>
-    <PossiblyNullArrayAccess occurrences="75">
+    <PossiblyNullArrayAccess occurrences="74">
       <code>$glimpse['type']</code>
       <code>$glimpse['value']</code>
       <code>$lookahead['type']</code>
@@ -2739,12 +2756,14 @@
       <code>$token['type']</code>
       <code>$token['type']</code>
       <code>$token['type']</code>
-      <code>$token['type']</code>
       <code>$token['value']</code>
       <code>$token['value']</code>
       <code>$token['value']</code>
       <code>$token['value']</code>
     </PossiblyNullArrayAccess>
+    <PossiblyNullPropertyAssignmentValue occurrences="1">
+      <code>$value</code>
+    </PossiblyNullPropertyAssignmentValue>
     <PossiblyNullReference occurrences="1">
       <code>getNumberOfRequiredParameters</code>
     </PossiblyNullReference>