Use UnitOfWork::registerManaged instead of updating ::$identityMap di…

…rectly This way, only one place in the code writes to ::$identityMap 👍
doctrine · Jun 23, 2023 · c453b74 · c453b74
1 parent aa3dd24
commit c453b74
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 65 deletions.
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -2796,25 +2796,20 @@ public function createEntity($className, array $data, &$hints = [])
             }
 
             $this->originalEntityData[$oid] = $data;
+
+            if ($entity instanceof NotifyPropertyChanged) {
+                $entity->addPropertyChangedListener($this);
+            }
         } else {
             $entity = $this->newInstance($class);
             $oid    = spl_object_id($entity);
-
-            $this->entityIdentifiers[$oid]  = $id;
-            $this->entityStates[$oid]       = self::STATE_MANAGED;
-            $this->originalEntityData[$oid] = $data;
-
-            $this->identityMap[$class->rootEntityName][$idHash] = $entity;
+            $this->registerManaged($entity, $id, $data);
 
             if (isset($hints[Query::HINT_READ_ONLY])) {
                 $this->readOnlyObjects[$oid] = true;
             }
         }
 
-        if ($entity instanceof NotifyPropertyChanged) {
-            $entity->addPropertyChangedListener($this);
-        }
-
         foreach ($data as $field => $value) {
             if (isset($class->fieldMappings[$field])) {
                 $class->reflFields[$field]->setValue($entity, $value);

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2785Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2785Test.php
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7869Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7869Test.php
@@ -55,7 +55,7 @@ public function getClassMetadata($className): ClassMetadata
         $uow->clear();
         $uow->triggerEagerLoads();
 
-        self::assertSame(3, $em->getClassMetadataCalls);
+        self::assertSame(4, $em->getClassMetadataCalls);
     }
 }