From e17bcb21141e8b578b4536ea9c45179b78245424 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Wed, 19 Oct 2022 15:34:31 +0200
Subject: [PATCH] Identity map cannot contain null value

---
 lib/Doctrine/ORM/UnitOfWork.php |  4 ++--
 psalm-baseline.xml              | 14 +-------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index a859ccc46b1..f7f87ca4a97 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -126,7 +126,7 @@ class UnitOfWork implements PropertyChangedListener
      * we always take the root class name of the hierarchy.
      *
      * @var mixed[]
-     * @psalm-var array<class-string, array<string, object|null>>
+     * @psalm-var array<class-string, array<string, object>>
      */
     private $identityMap = [];
 
@@ -3048,7 +3048,7 @@ public function loadCollection(PersistentCollection $collection)
     /**
      * Gets the identity map of the UnitOfWork.
      *
-     * @psalm-return array<class-string, array<string, object|null>>
+     * @psalm-return array<class-string, array<string, object>>
      */
     public function getIdentityMap()
     {
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 4dcb2038a71..c185dacf910 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -2576,10 +2576,6 @@
     </PossiblyUndefinedArrayOffset>
   </file>
   <file src="lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php">
-    <PossiblyNullArgument occurrences="2">
-      <code>$entity</code>
-      <code>$entity</code>
-    </PossiblyNullArgument>
     <RedundantConditionGivenDocblockType occurrences="1">
       <code>$state === UnitOfWork::STATE_DETACHED</code>
     </RedundantConditionGivenDocblockType>
@@ -2865,9 +2861,6 @@
       <code>$collectionToUpdate</code>
       <code>$em-&gt;getMetadataFactory()</code>
     </InvalidArgument>
-    <InvalidNullableReturnType occurrences="1">
-      <code>object</code>
-    </InvalidNullableReturnType>
     <InvalidPropertyAssignmentValue occurrences="2">
       <code>$this-&gt;entityChangeSets</code>
       <code>$this-&gt;entityChangeSets</code>
@@ -2881,16 +2874,13 @@
       <code>$entityState</code>
       <code>$entityState</code>
     </NoValue>
-    <NullableReturnStatement occurrences="1">
-      <code>$this-&gt;identityMap[$rootClassName][$idHash]</code>
-    </NullableReturnStatement>
     <PossiblyInvalidArgument occurrences="1">
       <code>$value</code>
     </PossiblyInvalidArgument>
     <PossiblyInvalidArrayOffset occurrences="1">
       <code>$this-&gt;identityMap[$rootClassName]</code>
     </PossiblyInvalidArrayOffset>
-    <PossiblyNullArgument occurrences="13">
+    <PossiblyNullArgument occurrences="11">
       <code>$assoc</code>
       <code>$assoc</code>
       <code>$assoc</code>
@@ -2901,8 +2891,6 @@
       <code>$collection-&gt;getOwner()</code>
       <code>$collectionToDelete-&gt;getMapping()</code>
       <code>$collectionToUpdate-&gt;getMapping()</code>
-      <code>$entity</code>
-      <code>$entity</code>
       <code>$owner</code>
     </PossiblyNullArgument>
     <PossiblyNullArrayAccess occurrences="2">