From 686437720665576a1ac91a3ce13976a2a907ef46 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 contains null value

---
 lib/Doctrine/ORM/UnitOfWork.php |  4 ++--
 psalm-baseline.xml              | 36 ++++-----------------------------
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index a3f1794899b..11754f47e43 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -120,7 +120,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 = [];
 
@@ -3017,7 +3017,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 32c84df56a9..39627778da5 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.29.0@7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3">
+<files psalm-version="4.22.0@fc2c6ab4d5fa5d644d8617089f012f3bb84b8703">
   <file src="lib/Doctrine/ORM/AbstractQuery.php">
     <DeprecatedClass occurrences="1">
       <code>IterableResult</code>
@@ -266,19 +266,14 @@
     <MissingReturnType occurrences="1">
       <code>wrapInTransaction</code>
     </MissingReturnType>
-    <MoreSpecificImplementedParamType occurrences="1">
-      <code>$className</code>
-    </MoreSpecificImplementedParamType>
     <TooManyArguments occurrences="2">
       <code>find</code>
       <code>flush</code>
     </TooManyArguments>
   </file>
   <file src="lib/Doctrine/ORM/EntityManager.php">
-    <ArgumentTypeCoercion occurrences="3">
-      <code>$className</code>
+    <ArgumentTypeCoercion occurrences="1">
       <code>$connection</code>
-      <code>$entityName</code>
     </ArgumentTypeCoercion>
     <DeprecatedMethod occurrences="2">
       <code>getMetadataCacheImpl</code>
@@ -590,12 +585,6 @@
       <code>$definition</code>
       <code>$this-&gt;subClasses</code>
     </InvalidPropertyAssignmentValue>
-    <InvalidReturnStatement occurrences="1">
-      <code>$this-&gt;reflClass</code>
-    </InvalidReturnStatement>
-    <InvalidReturnType occurrences="1">
-      <code>getReflectionClass</code>
-    </InvalidReturnType>
     <LessSpecificReturnStatement occurrences="4">
       <code>$cache</code>
       <code>$className</code>
@@ -986,10 +975,6 @@
     </MissingParamType>
   </file>
   <file src="lib/Doctrine/ORM/Mapping/MappingException.php">
-    <ArgumentTypeCoercion occurrences="2">
-      <code>$className</code>
-      <code>$entityName</code>
-    </ArgumentTypeCoercion>
     <MissingParamType occurrences="4">
       <code>$className</code>
       <code>$className</code>
@@ -2498,8 +2483,7 @@
     </RedundantConditionGivenDocblockType>
   </file>
   <file src="lib/Doctrine/ORM/Repository/DefaultRepositoryFactory.php">
-    <InvalidReturnStatement occurrences="2">
-      <code>$this-&gt;repositoryList[$repositoryHash]</code>
+    <InvalidReturnStatement occurrences="1">
       <code>$this-&gt;repositoryList[$repositoryHash] = $this-&gt;createRepository($entityManager, $entityName)</code>
     </InvalidReturnStatement>
     <InvalidReturnType occurrences="1">
@@ -2692,10 +2676,6 @@
     </MissingReturnType>
   </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>
@@ -2998,9 +2978,6 @@
     <InvalidArgument occurrences="1">
       <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>
@@ -3010,13 +2987,10 @@
       <code>$prevManagedCopy</code>
       <code>$previousManagedCopy</code>
     </MissingParamType>
-    <NullableReturnStatement occurrences="1">
-      <code>$this-&gt;identityMap[$rootClassName][$idHash]</code>
-    </NullableReturnStatement>
     <PossiblyInvalidArrayOffset occurrences="1">
       <code>$this-&gt;identityMap[$rootClassName]</code>
     </PossiblyInvalidArrayOffset>
-    <PossiblyNullArgument occurrences="12">
+    <PossiblyNullArgument occurrences="10">
       <code>$assoc</code>
       <code>$assoc</code>
       <code>$assoc</code>
@@ -3026,8 +3000,6 @@
       <code>$collection-&gt;getOwner()</code>
       <code>$collection-&gt;getOwner()</code>
       <code>$collectionToDelete-&gt;getMapping()</code>
-      <code>$entity</code>
-      <code>$entity</code>
       <code>$owner</code>
     </PossiblyNullArgument>
     <PossiblyNullArrayAccess occurrences="2">