diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php
index 46084bb8b80..c1e6cc88068 100644
--- a/lib/Doctrine/ORM/Configuration.php
+++ b/lib/Doctrine/ORM/Configuration.php
@@ -609,7 +609,7 @@ public function addCustomStringFunction($name, $className)
      *
      * @param string $name
      *
-     * @return string|null
+     * @return string|callable|null
      * @psalm-return class-string<FunctionNode>|callable(string):FunctionNode|null
      */
     public function getCustomStringFunction($name)
@@ -661,8 +661,8 @@ public function addCustomNumericFunction($name, $className)
      *
      * @param string $name
      *
-     * @return string|null
-     * @psalm-return ?class-string
+     * @return string|callable|null
+     * @psalm-return class-string|callable|null
      */
     public function getCustomNumericFunction($name)
     {
@@ -714,8 +714,8 @@ public function addCustomDatetimeFunction($name, $className)
      *
      * @param string $name
      *
-     * @return string|null
-     * @psalm-return ?class-string $name
+     * @return string|callable|null
+     * @psalm-return class-string|callable|null $name
      */
     public function getCustomDatetimeFunction($name)
     {
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 88e8c375137..8cd65a7d815 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -470,11 +470,6 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Query/Expr/Select.php
 
-		-
-			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
-			count: 2
-			path: lib/Doctrine/ORM/Query/Parser.php
-
 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Query\\\\Parser\\:\\:ArithmeticFactor\\(\\) should return Doctrine\\\\ORM\\\\Query\\\\AST\\\\ArithmeticFactor but returns Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node\\|string\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 4b8038060b1..b8cbe74655b 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -2161,10 +2161,6 @@
     <ArgumentTypeCoercion occurrences="1">
       <code>$stringPattern</code>
     </ArgumentTypeCoercion>
-    <DocblockTypeContradiction occurrences="2">
-      <code>$functionClass($functionName)</code>
-      <code>$functionClass($functionName)</code>
-    </DocblockTypeContradiction>
     <InvalidArgument occurrences="1">
       <code>$lookaheadType</code>
     </InvalidArgument>
@@ -2216,7 +2212,9 @@
       <code>$this-&gt;lexer-&gt;token['value']</code>
       <code>$this-&gt;lexer-&gt;token['value']</code>
     </InvalidScalarArgument>
-    <InvalidStringClass occurrences="1">
+    <InvalidStringClass occurrences="3">
+      <code>new $functionClass($functionName)</code>
+      <code>new $functionClass($functionName)</code>
       <code>new $functionClass($functionName)</code>
     </InvalidStringClass>
     <LessSpecificReturnStatement occurrences="4">
@@ -2355,10 +2353,8 @@
     <PossiblyUndefinedVariable occurrences="1">
       <code>$args</code>
     </PossiblyUndefinedVariable>
-    <RedundantConditionGivenDocblockType occurrences="3">
+    <RedundantConditionGivenDocblockType occurrences="1">
       <code>$AST instanceof AST\SelectStatement</code>
-      <code>is_string($functionClass)</code>
-      <code>is_string($functionClass)</code>
     </RedundantConditionGivenDocblockType>
   </file>
   <file src="lib/Doctrine/ORM/Query/ParserResult.php">