From 0e3dfb588e480b6221707189ed11f89294eddc4d Mon Sep 17 00:00:00 2001
From: Simon Podlipsky <simon@podlipsky.net>
Date: Mon, 16 Aug 2021 23:06:04 +0200
Subject: [PATCH] Fix return type at
 `EntityManagerInterface::get(Partial)Reference()`

---
 lib/Doctrine/ORM/EntityManagerInterface.php | 9 +++++++--
 psalm-baseline.xml                          | 7 ++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/Doctrine/ORM/EntityManagerInterface.php b/lib/Doctrine/ORM/EntityManagerInterface.php
index fafa33abaf3..e2fbc179c3e 100644
--- a/lib/Doctrine/ORM/EntityManagerInterface.php
+++ b/lib/Doctrine/ORM/EntityManagerInterface.php
@@ -23,6 +23,7 @@
 use BadMethodCallException;
 use DateTimeInterface;
 use Doctrine\Common\EventManager;
+use Doctrine\Common\Proxy\Proxy;
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\Internal\Hydration\AbstractHydrator;
 use Doctrine\ORM\Proxy\ProxyFactory;
@@ -169,7 +170,7 @@ public function createQueryBuilder();
      * @psalm-param class-string<T> $entityName
      *
      * @return object|null The entity reference.
-     * @psalm-return ?T
+     * @psalm-return T|Proxy|null
      *
      * @throws ORMException
      *
@@ -194,8 +195,12 @@ public function getReference($entityName, $id);
      *
      * @param string $entityName The name of the entity type.
      * @param mixed  $identifier The entity identifier.
+     * @psalm-param class-string<T> $entityName
+     *
+     * @return object|null The (partial) entity reference
+     * @psalm-return T|Proxy|null
      *
-     * @return object|null The (partial) entity reference.
+     * @template T
      */
     public function getPartialReference($entityName, $identifier);
 
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index a6ca240b7ca..2a110f0613f 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -481,19 +481,16 @@
       <code>is_object($entity)</code>
       <code>is_object($entity)</code>
     </DocblockTypeContradiction>
-    <InvalidReturnStatement occurrences="7">
-      <code>$entity</code>
+    <InvalidReturnStatement occurrences="5">
       <code>$entity</code>
       <code>$entity</code>
-      <code>$entity instanceof $class-&gt;name ? $entity : null</code>
       <code>$persister-&gt;load($sortedId, null, null, [], $lockMode)</code>
       <code>$persister-&gt;loadById($sortedId)</code>
       <code>$this-&gt;metadataFactory-&gt;getMetadataFor($className)</code>
     </InvalidReturnStatement>
-    <InvalidReturnType occurrences="3">
+    <InvalidReturnType occurrences="2">
       <code>?T</code>
       <code>getClassMetadata</code>
-      <code>getReference</code>
     </InvalidReturnType>
     <InvalidScalarArgument occurrences="2">
       <code>$hydrationMode</code>